Use the same ExporterResponse type for cache exporter responses

Signed-off-by: a-palchikov <[email protected]>
moby · Jan 20, 2025 · 656b893 · 656b893
1 parent 8305d6e
commit 656b893
Show file tree

Hide file tree

Showing 6 changed files with 436 additions and 1,039 deletions.
diff --git a/api/services/control/control.pb.go b/api/services/control/control.pb.go
diff --git a/api/services/control/control.proto b/api/services/control/control.proto
@@ -111,7 +111,7 @@ message SolveResponse {
 	// populated as long as it is supported.
 	map<string, string> ExporterResponseDeprecated = 1;
 	repeated ExporterResponse exporterResponses = 2;
-	repeated CacheExporterResponse cacheExporterResponses = 3;
+	repeated ExporterResponse cacheExporterResponses = 3;
 }
 
 message StatusRequest {
@@ -268,18 +268,6 @@ message ExporterResponse {
 message ExporterMetadata {
 	// ID identifies the exporter
 	string ID = 1;
-}
-
-// CacheExporterResponse describes the output of an exporter
-message CacheExporterResponse {
-	// Metadata describes the exporter
-	CacheExporterMetadata metadata = 1;
-	// Data is the exporter's output
-	map<string, string> data = 2;
-}
-
-// CacheExporterMetadata describes the cache exporter
-message CacheExporterMetadata {
-	// Name uniquely identifies the exporter
-	string name = 1;
+	// Type identifies the exporter type
+	string type = 2;
 }