Simplify CachingFetcher proto configuration

Qinusty · Aug 13, 2020 · f67fecc · f67fecc
1 parent 01b36da
commit f67fecc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkg/configuration/new_fetcher.go b/pkg/configuration/new_fetcher.go
@@ -24,7 +24,9 @@ func NewFetcherFromConfiguration(configuration *pb.FetcherConfiguration,
 	var fetcher remoteasset.FetchServer
 	switch backend := configuration.Backend.(type) {
 	case *pb.FetcherConfiguration_Caching:
-		innerFetcher, err := NewFetcherFromConfiguration(backend.Caching.Fetcher, assetStore, casBlobAccessCreator)
+		innerFetcher, err := NewFetcherFromConfiguration(
+			backend.Caching, assetStore,
+			casBlobAccessCreator)
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/proto/configuration/bb_asset_hub/fetch/fetcher.proto b/pkg/proto/configuration/bb_asset_hub/fetch/fetcher.proto
@@ -10,7 +10,7 @@ option go_package = "github.com/buildbarn/bb-asset-hub/pkg/proto/configuration/b
 message FetcherConfiguration {
   oneof backend {
     // Reads and writes to the AssetStore to return cached responses
-    CachingFetcherConfiguration caching = 1;
+    FetcherConfiguration caching = 1;
 
     // Downloads blobs over HTTP and place them into a CAS for retrieval over
     // REv2 ReadBlobs requests.
@@ -24,11 +24,6 @@ message FetcherConfiguration {
     google.rpc.Status error = 3;
   }
 
-  message CachingFetcherConfiguration {
-    // Fetcher to wrap and cache results from
-    FetcherConfiguration fetcher = 1;
-  }
-
   message HttpFetcherConfiguration {
     // Configuration for blob storage.
     buildbarn.configuration.blobstore.BlobAccessConfiguration