diff --git a/cli/command/container/create.go b/cli/command/container/create.go index 825b7110d3..21ae31cd0a 100644 --- a/cli/command/container/create.go +++ b/cli/command/container/create.go @@ -19,9 +19,9 @@ import ( "github.com/docker/cli/cli/command/image" "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/jsonstream" "github.com/docker/cli/cli/streams" "github.com/docker/cli/cli/trust" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/cli/opts" "github.com/docker/docker/api/types/container" imagetypes "github.com/docker/docker/api/types/image" diff --git a/cli/command/image/build.go b/cli/command/image/build.go index 10f4f83dfe..4f081c4cce 100644 --- a/cli/command/image/build.go +++ b/cli/command/image/build.go @@ -19,9 +19,9 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion" "github.com/docker/cli/cli/command/image/build" - "github.com/docker/cli/cli/internal/jsonstream" "github.com/docker/cli/cli/streams" "github.com/docker/cli/cli/trust" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/cli/internal/lazyregexp" "github.com/docker/cli/opts" "github.com/docker/docker/api" diff --git a/cli/command/image/import.go b/cli/command/image/import.go index 50206a3ec5..a55ea4ab5b 100644 --- a/cli/command/image/import.go +++ b/cli/command/image/import.go @@ -8,7 +8,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/internal/jsonstream" + "github.com/docker/cli/internal/jsonstream" dockeropts "github.com/docker/cli/opts" "github.com/docker/docker/api/types/image" "github.com/spf13/cobra" diff --git a/cli/command/image/load.go b/cli/command/image/load.go index 2aeb13c09d..8d3d3906d0 100644 --- a/cli/command/image/load.go +++ b/cli/command/image/load.go @@ -8,7 +8,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/internal/jsonstream" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/docker/client" "github.com/moby/sys/sequential" "github.com/pkg/errors" diff --git a/cli/command/image/push.go b/cli/command/image/push.go index 71f8f110b3..e91189d92d 100644 --- a/cli/command/image/push.go +++ b/cli/command/image/push.go @@ -14,8 +14,8 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion" - "github.com/docker/cli/cli/internal/jsonstream" "github.com/docker/cli/cli/streams" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/cli/internal/tui" "github.com/docker/docker/api/types/auxprogress" "github.com/docker/docker/api/types/image" diff --git a/cli/command/image/trust.go b/cli/command/image/trust.go index 2c088c2088..e224077a56 100644 --- a/cli/command/image/trust.go +++ b/cli/command/image/trust.go @@ -8,9 +8,9 @@ import ( "github.com/distribution/reference" "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/internal/jsonstream" "github.com/docker/cli/cli/streams" "github.com/docker/cli/cli/trust" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/docker/api/types/image" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/registry" diff --git a/cli/command/plugin/install.go b/cli/command/plugin/install.go index 9a7fe3ce57..f2004413b0 100644 --- a/cli/command/plugin/install.go +++ b/cli/command/plugin/install.go @@ -9,7 +9,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/image" - "github.com/docker/cli/cli/internal/jsonstream" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/cli/internal/prompt" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" diff --git a/cli/command/plugin/push.go b/cli/command/plugin/push.go index 85bbd4b496..4020680347 100644 --- a/cli/command/plugin/push.go +++ b/cli/command/plugin/push.go @@ -6,8 +6,8 @@ import ( "github.com/distribution/reference" "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/internal/jsonstream" "github.com/docker/cli/cli/trust" + "github.com/docker/cli/internal/jsonstream" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/registry" "github.com/pkg/errors" diff --git a/cli/command/plugin/upgrade.go b/cli/command/plugin/upgrade.go index d7b14988ad..494cbdc6a0 100644 --- a/cli/command/plugin/upgrade.go +++ b/cli/command/plugin/upgrade.go @@ -8,7 +8,7 @@ import ( "github.com/distribution/reference" "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/internal/jsonstream" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/cli/internal/prompt" "github.com/docker/docker/errdefs" "github.com/pkg/errors" diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index c33de68b5f..771cc3270a 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -13,7 +13,7 @@ import ( "github.com/docker/cli/cli/command/completion" "github.com/docker/cli/cli/config/configfile" configtypes "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/oauth/manager" + "github.com/docker/cli/internal/oauth/manager" "github.com/docker/cli/internal/tui" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" diff --git a/cli/command/registry/logout.go b/cli/command/registry/logout.go index 6b5355335a..6dc75dc585 100644 --- a/cli/command/registry/logout.go +++ b/cli/command/registry/logout.go @@ -7,7 +7,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/internal/oauth/manager" + "github.com/docker/cli/internal/oauth/manager" "github.com/docker/docker/registry" "github.com/spf13/cobra" ) diff --git a/cli/command/service/helpers.go b/cli/command/service/helpers.go index 3e752a36e1..2abe4ae7d2 100644 --- a/cli/command/service/helpers.go +++ b/cli/command/service/helpers.go @@ -6,7 +6,7 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/service/progress" - "github.com/docker/cli/cli/internal/jsonstream" + "github.com/docker/cli/internal/jsonstream" ) // WaitOnService waits for the service to converge. It outputs a progress bar, diff --git a/cli/command/service/logs.go b/cli/command/service/logs.go index 2511a5a3bd..8cad7a575a 100644 --- a/cli/command/service/logs.go +++ b/cli/command/service/logs.go @@ -13,7 +13,7 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion" "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/cli/cli/internal/logdetails" + "github.com/docker/cli/internal/logdetails" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" diff --git a/cli/command/swarm/ca.go b/cli/command/swarm/ca.go index 59974ac644..36b1dc9128 100644 --- a/cli/command/swarm/ca.go +++ b/cli/command/swarm/ca.go @@ -10,7 +10,7 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion" "github.com/docker/cli/cli/command/swarm/progress" - "github.com/docker/cli/cli/internal/jsonstream" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/trust/trust_push.go b/cli/trust/trust_push.go index 63fbdf932d..1a8c5e4b72 100644 --- a/cli/trust/trust_push.go +++ b/cli/trust/trust_push.go @@ -9,8 +9,8 @@ import ( "sort" "github.com/distribution/reference" - "github.com/docker/cli/cli/internal/jsonstream" "github.com/docker/cli/cli/streams" + "github.com/docker/cli/internal/jsonstream" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/registry" diff --git a/cli/internal/jsonstream/display.go b/internal/jsonstream/display.go similarity index 100% rename from cli/internal/jsonstream/display.go rename to internal/jsonstream/display.go diff --git a/cli/internal/jsonstream/display_test.go b/internal/jsonstream/display_test.go similarity index 100% rename from cli/internal/jsonstream/display_test.go rename to internal/jsonstream/display_test.go diff --git a/cli/internal/logdetails/parse_logs.go b/internal/logdetails/parse_logs.go similarity index 100% rename from cli/internal/logdetails/parse_logs.go rename to internal/logdetails/parse_logs.go diff --git a/cli/internal/logdetails/parse_logs_test.go b/internal/logdetails/parse_logs_test.go similarity index 100% rename from cli/internal/logdetails/parse_logs_test.go rename to internal/logdetails/parse_logs_test.go diff --git a/cli/internal/oauth/api/api.go b/internal/oauth/api/api.go similarity index 100% rename from cli/internal/oauth/api/api.go rename to internal/oauth/api/api.go diff --git a/cli/internal/oauth/api/api_test.go b/internal/oauth/api/api_test.go similarity index 100% rename from cli/internal/oauth/api/api_test.go rename to internal/oauth/api/api_test.go diff --git a/cli/internal/oauth/api/state.go b/internal/oauth/api/state.go similarity index 100% rename from cli/internal/oauth/api/state.go rename to internal/oauth/api/state.go diff --git a/cli/internal/oauth/jwt.go b/internal/oauth/jwt.go similarity index 100% rename from cli/internal/oauth/jwt.go rename to internal/oauth/jwt.go diff --git a/cli/internal/oauth/manager/manager.go b/internal/oauth/manager/manager.go similarity index 98% rename from cli/internal/oauth/manager/manager.go rename to internal/oauth/manager/manager.go index 80d4a039a3..1150064364 100644 --- a/cli/internal/oauth/manager/manager.go +++ b/internal/oauth/manager/manager.go @@ -11,9 +11,9 @@ import ( "github.com/docker/cli/cli/config/credentials" "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/oauth" - "github.com/docker/cli/cli/internal/oauth/api" "github.com/docker/cli/cli/streams" + "github.com/docker/cli/internal/oauth" + "github.com/docker/cli/internal/oauth/api" "github.com/docker/cli/internal/tui" "github.com/docker/docker/registry" "github.com/morikuni/aec" diff --git a/cli/internal/oauth/manager/manager_test.go b/internal/oauth/manager/manager_test.go similarity index 99% rename from cli/internal/oauth/manager/manager_test.go rename to internal/oauth/manager/manager_test.go index 37fae3f918..44a744999b 100644 --- a/cli/internal/oauth/manager/manager_test.go +++ b/internal/oauth/manager/manager_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/cli/cli/config/credentials" "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/oauth/api" + "github.com/docker/cli/internal/oauth/api" "gotest.tools/v3/assert" ) diff --git a/cli/internal/oauth/manager/util.go b/internal/oauth/manager/util.go similarity index 100% rename from cli/internal/oauth/manager/util.go rename to internal/oauth/manager/util.go