Skip to content

Commit

Permalink
Remove gogoproto.customtype
Browse files Browse the repository at this point in the history
gogoproto.customtype is used to have go-digest.Digest instead of string.
While it is convinient, protoc-gen-go doesn't support the extension
and blocks containerd#6564.

Signed-off-by: Kazuyoshi Kato <[email protected]>
  • Loading branch information
kzys committed Mar 18, 2022
1 parent 0c70165 commit e35723e
Show file tree
Hide file tree
Showing 22 changed files with 296 additions and 335 deletions.
28 changes: 13 additions & 15 deletions api/events/content.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/events/content.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
40 changes: 0 additions & 40 deletions api/next.pb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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"
}
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit e35723e

Please sign in to comment.