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

testutil: don't import "opts" package #42757

Merged
merged 1 commit into from
Aug 20, 2021
Merged

Conversation

thaJeztah
Copy link
Member

It was only used for two consts, which are unlikely to change, but the
"opts" package currently also imports libnetwork/ipamutils, which has
an init() function that does some heavy lifting, and not needed for
this utility's purpose.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Verified

This commit was signed with the committer’s verified signature.
xen0n WÁNG Xuěruì
It was only used for two consts, which are unlikely to change, but the
"opts" package currently also imports libnetwork/ipamutils, which has
an `init()` function that does some heavy lifting, and not needed for
this utility's purpose.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added status/2-code-review area/testing kind/refactor PR's that refactor, or clean-up code labels Aug 18, 2021
thaJeztah added a commit to thaJeztah/buildkit that referenced this pull request Aug 18, 2021
USING https://github.com/thaJeztah/docker/tree/TEMP_CLEANED_DOCKER branch,
which includes moby/moby#42755 and moby/moby#42757

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

imports libnetwork/ipamutils, which has an init() function that does some heavy lifting

FWIW; I recalled I had a patch for that in #42509, but it has other changes as well, perhaps I'll extract the sync.Once bit separately if that would make it a less risky change

thaJeztah added a commit to thaJeztah/buildkit that referenced this pull request Aug 20, 2021
USING https://github.com/thaJeztah/docker/tree/TEMP_CLEANED_DOCKER branch,
which includes moby/moby#42757

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tianon tianon merged commit 41568df into moby:master Aug 20, 2021
@thaJeztah thaJeztah deleted the testutil_no_ops branch August 20, 2021 16:45
@thaJeztah thaJeztah added this to the 21.xx milestone Oct 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/testing kind/refactor PR's that refactor, or clean-up code status/2-code-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants