LogDog: Add signed GS URL fetching.

logdog/appengine/coordinator/coordinatorTest/service.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package coordinatorTest
 
 import (
         luciConfig "github.com/luci/luci-go/common/config"
-        "github.com/luci/luci-go/common/gcloud/gs"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/appengine/coordinator"
         "github.com/luci/luci-go/logdog/appengine/coordinator/config"
-        "github.com/luci/luci-go/logdog/common/storage"
-        "github.com/luci/luci-go/logdog/common/storage/caching"
+
         "golang.org/x/net/context"
 )
 
 // Services is a testing stub for a coordinator.Services instance that allows
 // the user to configure the various services that are returned.
 type Services struct {
         // C, if not nil, will be used to get the return values for Config, overriding
         // local static members.
         C func() (*config.Config, error)
 
         // PC, if not nil, will be used to get the return values for ProjectConfig,
         // overriding local static members.
         PC func() (*svcconfig.ProjectConfig, error)
 
         // Storage returns an intermediate storage instance for use by this service.
         //
         // The caller must close the returned instance if successful.
-        IS func() (storage.Storage, error)
-
-        // GSClient instantiates a Google Storage client.
-        GS func() (gs.Client, error)
+        //
+        // By default, this will return a *BigTableStorage instance bound to the
+        // Environment's BigTable instance if the stream is not archived, and an
+        // *ArchivalStorage instance bound to this Environment's GSClient instance
+        // if the stream is archived.
+        ST func(*coordinator.LogStreamState) (coordinator.Storage, error)
 
         // ArchivalPublisher returns an ArchivalPublisher instance.
         AP func() (coordinator.ArchivalPublisher, error)
-
-        // SC returns a storage caching.Cache instance. If nil, a nil cache value
-        // will be returned.
-        SC func() caching.Cache
 }
 
 var _ coordinator.Services = (*Services)(nil)
 
 // Config implements coordinator.Services.
 func (s *Services) Config(c context.Context) (*config.Config, error) {
         if s.C != nil {
                 return s.C()
         }
         return config.Load(c)
 }
 
 // ProjectConfig implements coordinator.Services.
 func (s *Services) ProjectConfig(c context.Context, project luciConfig.ProjectName) (*svcconfig.ProjectConfig, error) {
         if s.PC != nil {
                 return s.PC()
         }
         return config.ProjectConfig(c, project)
 }
 
-// IntermediateStorage implements coordinator.Services.
-func (s *Services) IntermediateStorage(c context.Context) (storage.Storage, error) {
-        if s.IS != nil {
-                return s.IS()
+// StorageForStream implements coordinator.Services.
+func (s *Services) StorageForStream(c context.Context, lst *coordinator.LogStreamState) (coordinator.Storage, error) {
+        if s.ST != nil {
+                return s.ST(lst)
         }
         panic("not implemented")
 }
-
-// GSClient implements coordinator.Services.
-func (s *Services) GSClient(context.Context) (gs.Client, error) {
-        if s.GS != nil {
-                return s.GS()
-        }
-        panic("not implemented")
-}
 
 // ArchivalPublisher implements coordinator.Services.
 func (s *Services) ArchivalPublisher(context.Context) (coordinator.ArchivalPublisher, error) {
         if s.AP != nil {
                 return s.AP()
         }
         panic("not implemented")
 }
-
-// StorageCache implements coordinator.Services.
-func (s *Services) StorageCache() caching.Cache {
-        if s.SC != nil {
-                return s.SC()
-        }
-        return nil
-}