Merge pull request #6699 from kzys/remove-customtype

Remove gogoproto.customtype Containerd-test-commit: 65bbd36
akhilerm · Mar 21, 2022 · d307dc4 · d307dc4
2 parents 2d989ba + 5a91004
commit d307dc4
Show file tree

Hide file tree

Showing 9 changed files with 236 additions and 287 deletions.
diff --git a/api/events/content.pb.go b/api/events/content.pb.go
diff --git a/api/events/content.proto b/api/events/content.proto
@@ -25,5 +25,5 @@ option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;
 
 message ContentDelete {
-	string digest = 1 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];
+	string digest = 1;
 }
diff --git a/api/next.pb.txt b/api/next.pb.txt
@@ -178,10 +178,6 @@ file {
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
   }
@@ -1178,10 +1174,6 @@ file {
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
     field {
@@ -1251,10 +1243,6 @@ file {
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
   }
@@ -1339,10 +1327,6 @@ file {
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
   }
@@ -1353,10 +1337,6 @@ file {
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
     field {
@@ -1443,10 +1423,6 @@ file {
       number: 6
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "expected"
     }
   }
@@ -1524,10 +1500,6 @@ file {
       number: 4
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "expected"
     }
     field {
@@ -1626,10 +1598,6 @@ file {
       number: 6
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
   }
@@ -1746,10 +1714,6 @@ file {
       number: 2
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "digest"
     }
     field {
@@ -4157,10 +4121,6 @@ file {
       number: 2
       label: LABEL_OPTIONAL
       type: TYPE_STRING
-      options {
-        65003: "github.com/opencontainers/go-digest.Digest"
-        65001: 0
-      }
       json_name: "parentCheckpoint"
     }
     field {