move cli/internal/ packages to top-level internal/#6054
Merged
thaJeztah merged 3 commits intodocker:masterfrom May 12, 2025
Merged
move cli/internal/ packages to top-level internal/#6054thaJeztah merged 3 commits intodocker:masterfrom
thaJeztah merged 3 commits intodocker:masterfrom
Conversation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6054 +/- ##
=======================================
Coverage 58.99% 58.99%
=======================================
Files 358 358
Lines 30004 30004
=======================================
Hits 17700 17700
Misses 11323 11323
Partials 981 981 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR consolidates multiple internal packages by moving them from a nested cli/internal/ location to a single top-level internal/ package.
- Updated import paths for jsonstream and oauth/manager (among others) in various CLI commands.
- Simplified package structure by collapsing redundant internal package hierarchies.
Reviewed Changes
Copilot reviewed 26 out of 26 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| cli/trust/trust_push.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/swarm/ca.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/service/logs.go | Updated the logdetails import to the new top-level internal path. |
| cli/command/service/helpers.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/registry/logout.go | Updated the oauth/manager import to the new top-level internal path. |
| cli/command/registry/login.go | Updated the oauth/manager import to the new top-level internal path. |
| cli/command/plugin/upgrade.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/plugin/push.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/plugin/install.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/image/trust.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/image/push.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/image/load.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/image/import.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/image/build.go | Updated the jsonstream import to the new top-level internal path. |
| cli/command/container/create.go | Updated the jsonstream import to the new top-level internal path. |
Member
Author
|
Thx! I was going back and forth a bit "should we keep separation?" but I think the current decision "which internal one?" was blurry enough to consider; let's just use a single one, until we have a strong reason to split ❤️ |
Benehiko
approved these changes
May 12, 2025
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.
We were using 2 separate
internal/packages; while it could make sense to scope these packages to a specific sub-package, our currently distinction between the top-levelinternal/andcli/internal/was a bit blurry.Let's simplify for now, and use a single, top-level
internal/package. We can always change this in future if there's a need.- Human readable description for the release notes
- A picture of a cute animal (not mandatory but encouraged)