Use reflect to support diff.ApplyConfig with/without gogo's types.Any#75
Merged
dmcgowan merged 1 commit intocontainerd:masterfrom Apr 21, 2022
Merged
Use reflect to support diff.ApplyConfig with/without gogo's types.Any#75dmcgowan merged 1 commit intocontainerd:masterfrom
dmcgowan merged 1 commit intocontainerd:masterfrom
Conversation
16b799b to
bfb1fb8
Compare
lumjjb
approved these changes
Apr 20, 2022
| ) | ||
|
|
||
| func TestInit(t *testing.T) { | ||
| if !processorPayloadsUseGogo { |
Collaborator
There was a problem hiding this comment.
should this be testing against if it is set - only if the precondition is met? I’m not too familiar with the new any types
Member
Author
There was a problem hiding this comment.
Right now, because go.mod locks our dependencies and our containerd is 1.6, processorPayloadsUseGogo is always true.
Member
Author
There was a problem hiding this comment.
containerd/containerd#6832 is running processorPayloadsUseGogo=false case.
containerd is migrating off from github.com/gogo/protobuf (see containerd/containerd#6564). However imgcrypt depends containerd and containerd also depends imgcrypt, which makes changing this signature complicated. This change workarounds the issue by using Go's reflect package. Signed-off-by: Kazuyoshi Kato <[email protected]>
dmcgowan
approved these changes
Apr 21, 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
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.
containerd is migrating off from github.com/gogo/protobuf
(see containerd/containerd#6564).
However imgcrypt depends containerd and containerd also depends
imgcrypt, which makes changing this signature complicated.
This change workarounds the issue by using Go's reflect package.