From 4dee783aba9920c969f3c3661f87f801cc520e31 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 15 Jan 2021 15:57:24 +0100 Subject: [PATCH] Move progress => api Signed-off-by: Guillaume Tardif --- aci/aci.go | 2 +- aci/volumes.go | 2 +- {progress => api/progress}/event.go | 0 {progress => api/progress}/noop.go | 0 {progress => api/progress}/plain.go | 0 {progress => api/progress}/spinner.go | 0 {progress => api/progress}/tty.go | 0 {progress => api/progress}/tty_test.go | 0 {progress => api/progress}/writer.go | 0 {progress => api/progress}/writer_test.go | 0 cli/cmd/compose/build.go | 2 +- cli/cmd/compose/down.go | 2 +- cli/cmd/compose/pull.go | 2 +- cli/cmd/compose/push.go | 2 +- cli/cmd/compose/run.go | 2 +- cli/cmd/compose/up.go | 2 +- cli/cmd/run/run.go | 2 +- cli/cmd/volume/command.go | 2 +- ecs/down.go | 2 +- ecs/wait.go | 2 +- local/compose/convergence.go | 2 +- local/compose/create.go | 2 +- local/compose/down.go | 2 +- local/compose/pull.go | 2 +- local/compose/push.go | 2 +- 25 files changed, 17 insertions(+), 17 deletions(-) rename {progress => api/progress}/event.go (100%) rename {progress => api/progress}/noop.go (100%) rename {progress => api/progress}/plain.go (100%) rename {progress => api/progress}/spinner.go (100%) rename {progress => api/progress}/tty.go (100%) rename {progress => api/progress}/tty_test.go (100%) rename {progress => api/progress}/writer.go (100%) rename {progress => api/progress}/writer_test.go (100%) diff --git a/aci/aci.go b/aci/aci.go index d576d224..13f94111 100644 --- a/aci/aci.go +++ b/aci/aci.go @@ -40,7 +40,7 @@ import ( "github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { diff --git a/aci/volumes.go b/aci/volumes.go index 2c012b53..d6c7b972 100644 --- a/aci/volumes.go +++ b/aci/volumes.go @@ -32,7 +32,7 @@ import ( "github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) type aciVolumeService struct { diff --git a/progress/event.go b/api/progress/event.go similarity index 100% rename from progress/event.go rename to api/progress/event.go diff --git a/progress/noop.go b/api/progress/noop.go similarity index 100% rename from progress/noop.go rename to api/progress/noop.go diff --git a/progress/plain.go b/api/progress/plain.go similarity index 100% rename from progress/plain.go rename to api/progress/plain.go diff --git a/progress/spinner.go b/api/progress/spinner.go similarity index 100% rename from progress/spinner.go rename to api/progress/spinner.go diff --git a/progress/tty.go b/api/progress/tty.go similarity index 100% rename from progress/tty.go rename to api/progress/tty.go diff --git a/progress/tty_test.go b/api/progress/tty_test.go similarity index 100% rename from progress/tty_test.go rename to api/progress/tty_test.go diff --git a/progress/writer.go b/api/progress/writer.go similarity index 100% rename from progress/writer.go rename to api/progress/writer.go diff --git a/progress/writer_test.go b/api/progress/writer_test.go similarity index 100% rename from progress/writer_test.go rename to api/progress/writer_test.go diff --git a/cli/cmd/compose/build.go b/cli/cmd/compose/build.go index 6caf7474..f2a82575 100644 --- a/cli/cmd/compose/build.go +++ b/cli/cmd/compose/build.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) type buildOptions struct { diff --git a/cli/cmd/compose/down.go b/cli/cmd/compose/down.go index ac1b9355..cfa3c43e 100644 --- a/cli/cmd/compose/down.go +++ b/cli/cmd/compose/down.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) func downCommand() *cobra.Command { diff --git a/cli/cmd/compose/pull.go b/cli/cmd/compose/pull.go index 03ce586a..02243c34 100644 --- a/cli/cmd/compose/pull.go +++ b/cli/cmd/compose/pull.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) type pullOptions struct { diff --git a/cli/cmd/compose/push.go b/cli/cmd/compose/push.go index 2c95ceea..86f92e8c 100644 --- a/cli/cmd/compose/push.go +++ b/cli/cmd/compose/push.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) type pushOptions struct { diff --git a/cli/cmd/compose/run.go b/cli/cmd/compose/run.go index 3c019cb1..b97574d1 100644 --- a/cli/cmd/compose/run.go +++ b/cli/cmd/compose/run.go @@ -25,7 +25,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) type runOptions struct { diff --git a/cli/cmd/compose/up.go b/cli/cmd/compose/up.go index c84b9dd5..2aabd1fc 100644 --- a/cli/cmd/compose/up.go +++ b/cli/cmd/compose/up.go @@ -26,7 +26,7 @@ import ( "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/formatter" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" "github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/types" diff --git a/cli/cmd/run/run.go b/cli/cmd/run/run.go index c08008bc..aa8e7aa5 100644 --- a/cli/cmd/run/run.go +++ b/cli/cmd/run/run.go @@ -30,7 +30,7 @@ import ( "github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/cli/options/run" "github.com/docker/compose-cli/context/store" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) // Command runs a container diff --git a/cli/cmd/volume/command.go b/cli/cmd/volume/command.go index 852a43d4..78312d0a 100644 --- a/cli/cmd/volume/command.go +++ b/cli/cmd/volume/command.go @@ -26,7 +26,7 @@ import ( "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/ecs" formatter2 "github.com/docker/compose-cli/formatter" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" diff --git a/ecs/down.go b/ecs/down.go index 047613ad..95982989 100644 --- a/ecs/down.go +++ b/ecs/down.go @@ -21,7 +21,7 @@ import ( "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) func (b *ecsAPIService) Down(ctx context.Context, projectName string, options compose.DownOptions) error { diff --git a/ecs/wait.go b/ecs/wait.go index 183c5954..3d3e7069 100644 --- a/ecs/wait.go +++ b/ecs/wait.go @@ -26,7 +26,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/iancoleman/strcase" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) func (b *ecsAPIService) WaitStackCompletion(ctx context.Context, name string, operation int, ignored ...string) error { //nolint:gocyclo diff --git a/local/compose/convergence.go b/local/compose/convergence.go index 0402cc5f..3bed77a3 100644 --- a/local/compose/convergence.go +++ b/local/compose/convergence.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sync/errgroup" status "github.com/docker/compose-cli/local/moby" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) const ( diff --git a/local/compose/create.go b/local/compose/create.go index 575c18ca..221d515e 100644 --- a/local/compose/create.go +++ b/local/compose/create.go @@ -39,7 +39,7 @@ import ( "github.com/docker/compose-cli/api/compose" convert "github.com/docker/compose-cli/local/moby" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) func (s *composeService) Create(ctx context.Context, project *types.Project, opts compose.CreateOptions) error { diff --git a/local/compose/down.go b/local/compose/down.go index bd699ae6..b104194c 100644 --- a/local/compose/down.go +++ b/local/compose/down.go @@ -23,7 +23,7 @@ import ( "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" "github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/types" diff --git a/local/compose/pull.go b/local/compose/pull.go index 133056cd..c1e7591a 100644 --- a/local/compose/pull.go +++ b/local/compose/pull.go @@ -33,7 +33,7 @@ import ( "golang.org/x/sync/errgroup" "github.com/docker/compose-cli/config" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" ) func (s *composeService) Pull(ctx context.Context, project *types.Project) error { diff --git a/local/compose/push.go b/local/compose/push.go index 351c1c01..6a3cd2f7 100644 --- a/local/compose/push.go +++ b/local/compose/push.go @@ -26,7 +26,7 @@ import ( "github.com/docker/buildx/driver" "github.com/docker/compose-cli/config" - "github.com/docker/compose-cli/progress" + "github.com/docker/compose-cli/api/progress" "github.com/compose-spec/compose-go/types" cliconfig "github.com/docker/cli/cli/config"