Pass through program.Group where needed

Author: mortenmj

cmd/bb_remote_asset/main.go

@@ -43,17 +43,17 @@ func main() {
 		if err := util.UnmarshalConfigurationFromFile(os.Args[1], &config); err != nil {
 			return util.StatusWrapf(err, "Failed to read configuration from %s", os.Args[1])
 		}
-		lifecycleState, grpcClientFactory, err := global.ApplyConfiguration(config.Global)
+		lifecycleState, grpcClientFactory, err := global.ApplyConfiguration(config.Global, dependenciesGroup)
 		if err != nil {
 			return util.StatusWrap(err, "Failed to apply global configuration options")
 		}
 
-		fetchAuthorizer, err := auth_configuration.DefaultAuthorizerFactory.NewAuthorizerFromConfiguration(config.FetchAuthorizer, grpcClientFactory)
+		fetchAuthorizer, err := auth_configuration.DefaultAuthorizerFactory.NewAuthorizerFromConfiguration(config.FetchAuthorizer, dependenciesGroup, grpcClientFactory)
 		if err != nil {
 			return util.StatusWrap(err, "Failed to create Fetch Authorizer from Configuration")
 		}
 
-		pushAuthorizer, err := auth_configuration.DefaultAuthorizerFactory.NewAuthorizerFromConfiguration(config.PushAuthorizer, grpcClientFactory)
+		pushAuthorizer, err := auth_configuration.DefaultAuthorizerFactory.NewAuthorizerFromConfiguration(config.PushAuthorizer, dependenciesGroup, grpcClientFactory)
 		if err != nil {
 			return util.StatusWrap(err, "Failed to create Push Authorizer from Configuration")
 		}
@@ -100,6 +100,7 @@ func main() {
 			assetStore,
 			contentAddressableStorageInfo.BlobAccess,
 			grpcClientFactory,
+			dependenciesGroup,
 			int(config.MaximumMessageSizeBytes),
 			fetchAuthorizer,
 		)

pkg/configuration/new_asset_store.go

@@ -27,7 +27,11 @@ func NewAssetStoreFromConfiguration(
 	var assetStore storage.AssetStore
 	switch backend := configuration.Backend.(type) {
 	case *pb.AssetCacheConfiguration_BlobAccess:
-		assetBlobAccessCreator := asset_configuration.NewAssetBlobAccessCreator(grpcClientFactory, maximumMessageSizeBytes)
+		assetBlobAccessCreator := asset_configuration.NewAssetBlobAccessCreator(
+			dependenciesGroup,
+			grpcClientFactory,
+		    maximumMessageSizeBytes,
+		)
 
 		assetBlobAccess, err := blobstore_configuration.NewBlobAccessFromConfiguration(
 			dependenciesGroup,

pkg/configuration/new_fetcher.go

@@ -10,6 +10,7 @@ import (
 	"github.com/buildbarn/bb-storage/pkg/blobstore"
 	"github.com/buildbarn/bb-storage/pkg/clock"
 	"github.com/buildbarn/bb-storage/pkg/grpc"
+	"github.com/buildbarn/bb-storage/pkg/program"
 	bb_http "github.com/buildbarn/bb-storage/pkg/http"
 
 	"google.golang.org/grpc/codes"
@@ -22,6 +23,7 @@ func NewFetcherFromConfiguration(configuration *pb.FetcherConfiguration,
 	assetStore storage.AssetStore,
 	contentAddressableStorage blobstore.BlobAccess,
 	grpcClientFactory grpc.ClientFactory,
+	dependenciesGroup program.Group,
 	maximumMessageSizeBytes int,
 	authorizer auth.Authorizer,
 ) (fetch.Fetcher, error) {
@@ -41,7 +43,10 @@ func NewFetcherFromConfiguration(configuration *pb.FetcherConfiguration,
 		case *pb.FetcherConfiguration_Error:
 			fetcher = fetch.NewErrorFetcher(backend.Error)
 		case *pb.FetcherConfiguration_RemoteExecution:
-			client, err := grpcClientFactory.NewClientFromConfiguration(backend.RemoteExecution.ExecutionClient)
+			client, err := grpcClientFactory.NewClientFromConfiguration(
+				backend.RemoteExecution.ExecutionClient,
+				dependenciesGroup,
+			)
 			if err != nil {
 				return nil, err
 			}

pkg/storage/blobstore/BUILD.bazel

@@ -20,6 +20,7 @@ go_library(
         "@com_github_buildbarn_bb_storage//pkg/capabilities",
         "@com_github_buildbarn_bb_storage//pkg/digest",
         "@com_github_buildbarn_bb_storage//pkg/grpc",
+        "@com_github_buildbarn_bb_storage//pkg/program",
         "@com_github_buildbarn_bb_storage//pkg/proto/configuration/blobstore",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//status",

pkg/storage/blobstore/asset_blob_access_creator.go

@@ -10,6 +10,7 @@ import (
 	"github.com/buildbarn/bb-storage/pkg/capabilities"
 	"github.com/buildbarn/bb-storage/pkg/digest"
 	"github.com/buildbarn/bb-storage/pkg/grpc"
+	"github.com/buildbarn/bb-storage/pkg/program"
 	pb "github.com/buildbarn/bb-storage/pkg/proto/configuration/blobstore"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -24,7 +25,7 @@ type assetBlobAccessCreator struct {
 
 // NewAssetBlobAccessCreator creates a new BlobAccessCreator suitable for creating BlobAccesses
 // used for storage of Assets.
-func NewAssetBlobAccessCreator(grpcClientFactory grpc.ClientFactory, maximumMessageSizeBytes int) configuration.BlobAccessCreator {
+func NewAssetBlobAccessCreator(terminationGroup program.Group, grpcClientFactory grpc.ClientFactory, maximumMessageSizeBytes int) configuration.BlobAccessCreator {
 	return &assetBlobAccessCreator{
 		grpcClientFactory:       grpcClientFactory,
 		maximumMessageSizeBytes: maximumMessageSizeBytes,
@@ -43,7 +44,7 @@ func (bac *assetBlobAccessCreator) GetStorageTypeName() string {
 	return "asset"
 }
 
-func (bac *assetBlobAccessCreator) NewCustomBlobAccess(config *pb.BlobAccessConfiguration, creator configuration.NestedBlobAccessCreator) (configuration.BlobAccessInfo, string, error) {
+func (bac *assetBlobAccessCreator) NewCustomBlobAccess(terminationGroup program.Group, config *pb.BlobAccessConfiguration, creator configuration.NestedBlobAccessCreator) (configuration.BlobAccessInfo, string, error) {
 	return configuration.BlobAccessInfo{}, "", status.Error(codes.InvalidArgument, "Configuration did not contain a supported storage backend")
 }
 

pkg/storage/blobstore/asset_blob_access_replicator.go

@@ -5,6 +5,7 @@ import (
 	"github.com/buildbarn/bb-storage/pkg/blobstore/configuration"
 	"github.com/buildbarn/bb-storage/pkg/blobstore/replication"
 	"github.com/buildbarn/bb-storage/pkg/digest"
+	"github.com/buildbarn/bb-storage/pkg/program"
 	pb "github.com/buildbarn/bb-storage/pkg/proto/configuration/blobstore"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -16,7 +17,7 @@ func (brc assetBlobReplicatorCreator) GetDigestKeyFormat() digest.KeyFormat {
 	return digest.KeyWithInstance
 }
 
-func (brc assetBlobReplicatorCreator) NewCustomBlobReplicator(configuration *pb.BlobReplicatorConfiguration, source blobstore.BlobAccess, sink configuration.BlobAccessInfo) (replication.BlobReplicator, error) {
+func (brc assetBlobReplicatorCreator) NewCustomBlobReplicator(terminationGroup program.Group, configuration *pb.BlobReplicatorConfiguration, source blobstore.BlobAccess, sink configuration.BlobAccessInfo) (replication.BlobReplicator, error) {
 	return nil, status.Error(codes.InvalidArgument, "Configuration did not contain a supported replicator")
 }