Add missing annotations map to Descriptor for gRPC transfer

stefanberger · Jared Cordasco · commit 9844ce442429 · 2019-05-03T21:31:39.000-05:00
Add the annotations map to the gRPC Descriptor message. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Brandon Lum <lumjjb@gmail.com> Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com> (cherry picked from commit c6703d4) Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
diff --git a/api/next.pb.txt b/api/next.pb.txt
@@ -1764,6 +1764,34 @@ file {
       type: TYPE_INT64
       json_name: "size"
     }
+    field {
+      name: "annotations"
+      number: 5
+      label: LABEL_REPEATED
+      type: TYPE_MESSAGE
+      type_name: ".containerd.types.Descriptor.AnnotationsEntry"
+      json_name: "annotations"
+    }
+    nested_type {
+      name: "AnnotationsEntry"
+      field {
+        name: "key"
+        number: 1
+        label: LABEL_OPTIONAL
+        type: TYPE_STRING
+        json_name: "key"
+      }
+      field {
+        name: "value"
+        number: 2
+        label: LABEL_OPTIONAL
+        type: TYPE_STRING
+        json_name: "value"
+      }
+      options {
+        map_entry: true
+      }
+    }
   }
   options {
     go_package: "github.com/containerd/containerd/api/types;types"
diff --git a/api/types/descriptor.pb.go b/api/types/descriptor.pb.go
diff --git a/api/types/descriptor.proto b/api/types/descriptor.proto
@@ -15,4 +15,5 @@ message Descriptor {
 	string media_type = 1;
 	string digest = 2 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];
 	int64 size = 3;
+	map<string, string> annotations = 5;
 }

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ message Descriptor {`
`15`	`15`	`string media_type = 1;`
`16`	`16`	`string digest = 2 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];`
`17`	`17`	`int64 size = 3;`
	`18`	`+ map<string, string> annotations = 5;`
`18`	`19`	`}`