Use typeurl.Any instead of github.com/gogo/protobuf/types.Any#6706
Merged
estesp merged 1 commit intocontainerd:mainfrom Mar 25, 2022
Merged
Use typeurl.Any instead of github.com/gogo/protobuf/types.Any#6706estesp merged 1 commit intocontainerd:mainfrom
estesp merged 1 commit intocontainerd:mainfrom
Conversation
|
Skipping CI for Draft Pull Request. |
Member
Author
|
@mxpv @dmcgowan Regarding exported methods that take Any, like https://github.com/containerd/typeurl/blob/fc3423ac466f5ea0956f96572993fbac5afa3233/types.go#L146-L160, does it make sense to take Any as an interface? All we need is TypeURL and Value. gogo/protobuf and google.golang.org/protobuf can agree about the signature.
The Get prefix and casing (Url instead of URL) are less Go-idiomatic though. |
|
Build succeeded.
|
Member
|
@kzys yeah, that is a good idea |
Member
|
Much simpler containerd/typeurl#32 |
kzys
force-pushed
the
typeurl-upgrade
branch
4 times, most recently
from
db2b205 to
18212ad
Compare
|
Build succeeded.
|
|
Build succeeded.
|
|
Build succeeded.
|
Member
Author
|
Build succeeded.
|
|
Build succeeded.
|
kzys
force-pushed
the
typeurl-upgrade
branch
3 times, most recently
from
36512bc to
8a586e4
Compare
|
Build succeeded.
|
|
Build succeeded.
|
kzys
force-pushed
the
typeurl-upgrade
branch
2 times, most recently
from
c285162 to
cf17c36
Compare
kzys
commented
Mar 22, 2022
Comment on lines
47
to
50
| // typeurl.MarshalAny currently returns &types.Any, but it will | ||
| // return typeurl.Any soon. | ||
| pbany := &types.Any{ | ||
| TypeUrl: any.GetTypeUrl(), | ||
| Value: any.GetValue(), | ||
| } | ||
|
|
||
| for _, id := range imgcrypt.PayloadToolIDs { | ||
| c.ProcessorPayloads[id] = any | ||
| c.ProcessorPayloads[id] = pbany | ||
| } |
Member
Author
There was a problem hiding this comment.
This is the local change I made. If that looks okay, I'm going to open a PR against imgcrypt.
kzys
commented
Mar 22, 2022
| return nil, err | ||
| } | ||
| request.Options = any | ||
| request.Options = protobuf.FromAny(any) |
Member
Author
There was a problem hiding this comment.
request (CreateTaskRequest) is generated from a proto. So we have to call FromAny() here.
kzys
force-pushed
the
typeurl-upgrade
branch
2 times, most recently
from
3089cc6 to
c9a0904
Compare
|
Build succeeded.
|
kzys
force-pushed
the
typeurl-upgrade
branch
3 times, most recently
from
7cae71d to
231128c
Compare
|
Build succeeded.
|
|
Build succeeded.
|
|
Build succeeded.
|
|
Build succeeded.
|
|
Build succeeded.
|
|
Build succeeded.
|
Member
Author
|
This is finally ready for review! While there are still gogo/protobuf's Any here and there, I don't want to increase the size of this PR anymore. |
|
Build succeeded.
|
kzys
commented
Mar 24, 2022
|
Build succeeded.
|
|
Build succeeded.
|
This commit upgrades github.com/containerd/typeurl to use typeurl.Any. The interface hides gogo/protobuf/types.Any from containerd's Go client. Signed-off-by: Kazuyoshi Kato <[email protected]>
|
Build succeeded.
|
dmcgowan
approved these changes
Mar 24, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit upgrades github.com/containerd/typeurl to use typeurl.Any.
The interface hides gogo/protobuf/types.Any from containerd's Go client.
Signed-off-by: Kazuyoshi Kato [email protected]