Remove containerizedengine package dependency from docker/cli/command… #1361
Conversation
This file contains 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
vdemeester
requested review from
dnephin,
thaJeztah,
dhiltgen and
silvin-lubecki
vdemeester
force-pushed
the
contains-containerized
branch
from
016decd to
0d84fea
Compare
Codecov Report
@@ Coverage Diff @@
## master #1361 +/- ##
=========================================
Coverage ? 54.62%
=========================================
Files ? 293
Lines ? 19371
Branches ? 0
=========================================
Hits ? 10581
Misses ? 8130
Partials ? 660 |
vdemeester
commented
Sep 11, 2018
cli/command/containerized.go
Outdated
| @@ -0,0 +1,73 @@ | |||
| package command | |||
There was a problem hiding this comment.
This probably should go elsewhere, something like cli/types or something, not sure though…
vdemeester
force-pushed
the
contains-containerized
branch
3 times, most recently
from
5ff978a to
a5d66c8
Compare
vdemeester
commented
Sep 11, 2018
cli/command/cli.go
Outdated
| @@ -252,8 +252,8 @@ type ClientInfo struct { | |||
| } | |||
|
|
|||
| // NewDockerCli returns a DockerCli instance with IO output and error streams set by in, out and err. | |||
| func NewDockerCli(in io.ReadCloser, out, err io.Writer, isTrusted bool) *DockerCli { | |||
| return &DockerCli{in: NewInStream(in), out: NewOutStream(out), err: err, contentTrust: isTrusted} | |||
| func NewDockerCli(in io.ReadCloser, out, err io.Writer, isTrusted bool, containerizedFn func(string) (ContainerizedClient, error)) *DockerCli { | |||
There was a problem hiding this comment.
This should probably be refactor with a config and some functionnal argument too
thaJeztah
approved these changes
Sep 11, 2018
cli/command/engine/rm_test.go
Outdated
| @@ -4,13 +4,14 @@ import ( | |||
| "fmt" | |||
| "testing" | |||
|
|
|||
| "github.com/docker/cli/internal/containerizedengine" | |||
| "github.com/docker/cli/cli/command" | |||
|
|
|||
| @@ -26,7 +26,7 @@ func TestClientDebugEnabled(t *testing.T) { | |||
|
|
|||
| func TestExitStatusForInvalidSubcommandWithHelpFlag(t *testing.T) { | |||
| discard := ioutil.Discard | |||
| cmd := newDockerCommand(command.NewDockerCli(os.Stdin, discard, discard, false)) | |||
| cmd := newDockerCommand(command.NewDockerCli(os.Stdin, discard, discard, false, nil)) | |||
There was a problem hiding this comment.
Yup, we definitely need a struct or functional arguments 😄
vdemeester
force-pushed
the
contains-containerized
branch
2 times, most recently
from
c2c3e8c to
68e0c6b
Compare
… this removes a whole lot of dependencies from people depending on docker/cli… Signed-off-by: Vincent Demeester <[email protected]>
vdemeester
force-pushed
the
contains-containerized
branch
from
68e0c6b to
2d344b2
Compare
| serverInfo ServerInfo | ||
| clientInfo ClientInfo | ||
| contentTrust bool | ||
| newContainerizeClient func(string) (clitypes.ContainerizedClient, error) |
There was a problem hiding this comment.
Not a fan of this trick...
silvin-lubecki
approved these changes
Sep 11, 2018
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.
… this removes a whole lot of dependencies from people depending on docker/cli…
We should not leak
internal/containerizedcontainer(and its dependencies) for users/projects that depend ondocker/cli.PS: I really think it should be backported to 18.03 too 👼
Signed-off-by: Vincent Demeester [email protected]