Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make restTLSClientConfig in restConfig a public field #867

Merged
merged 1 commit into from
Mar 27, 2020

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Mar 26, 2020

imdario/mergo, despite its official documentation, does not merge public fields inside private fields as of v.0.3.9: darccio/mergo#139

Fixing that seems non-trivial.

Instead, make the restTLSClientConfig a public field of restConfig.

The restConfig type itself remains private, so this does not make anything actually public outside the subpackage. This way, the calls to mergo work as expected with both 0.3.8 and 0.3.9.

imdario/mergo, despite its official documentation, does not merge
public fields inside private fields as of v.0.3.9:
darccio/mergo#139

Fixing that seems non-trivial.

Instead, make the restTLSClientConfig a public field of restConfig.

The restConfig type itself remains private, so this does not make anything
actually public outside the subpackage. This way, the calls to mergo work
as expected with both 0.3.8 and 0.3.9.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Did you open an issue upstream? Looks like a regression.

@mtrmac
Copy link
Collaborator Author

mtrmac commented Mar 27, 2020

Yes, the commit description points at darccio/mergo#139 . So far, it’s not clear whether this is a regression or a bug fix.

@mtrmac mtrmac merged commit 69d6e9c into containers:master Mar 27, 2020
@mtrmac mtrmac deleted the merge branch March 27, 2020 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants