From 3bf6a00a61cda8700b63430d06f170321b77322c Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 17 Sep 2020 10:58:01 +0200 Subject: [PATCH] goimports Signed-off-by: Guillaume Tardif --- aci/convert/container.go | 1 + cli/main.go | 7 ++++--- ecs/backend.go | 1 + ecs/local/backend.go | 3 ++- server/metrics_test.go | 3 +-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aci/convert/container.go b/aci/convert/container.go index 131994cac..3cff17c42 100644 --- a/aci/convert/container.go +++ b/aci/convert/container.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/compose-spec/compose-go/types" + "github.com/docker/compose-cli/api/containers" ) diff --git a/cli/main.go b/cli/main.go index a4eadd1bb..a495d53e5 100644 --- a/cli/main.go +++ b/cli/main.go @@ -27,13 +27,14 @@ import ( "syscall" "time" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + "github.com/docker/compose-cli/cli/cmd/compose" "github.com/docker/compose-cli/cli/cmd/logout" volume "github.com/docker/compose-cli/cli/cmd/volume" "github.com/docker/compose-cli/errdefs" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - "github.com/spf13/cobra" // Backend registrations _ "github.com/docker/compose-cli/aci" diff --git a/ecs/backend.go b/ecs/backend.go index 8cc0a392c..7f7f269fb 100644 --- a/ecs/backend.go +++ b/ecs/backend.go @@ -21,6 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" + "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/secrets" diff --git a/ecs/local/backend.go b/ecs/local/backend.go index c62ed640c..2f7935882 100644 --- a/ecs/local/backend.go +++ b/ecs/local/backend.go @@ -19,6 +19,8 @@ package local import ( "context" + "github.com/docker/docker/client" + "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/secrets" @@ -26,7 +28,6 @@ import ( "github.com/docker/compose-cli/backend" "github.com/docker/compose-cli/context/cloud" "github.com/docker/compose-cli/context/store" - "github.com/docker/docker/client" ) const backendType = store.EcsLocalSimulationContextType diff --git a/server/metrics_test.go b/server/metrics_test.go index 2a7ffdc3f..0eb725e2a 100644 --- a/server/metrics_test.go +++ b/server/metrics_test.go @@ -21,9 +21,8 @@ import ( "strings" "testing" - "gotest.tools/v3/assert" - "google.golang.org/grpc" + "gotest.tools/v3/assert" containersv1 "github.com/docker/compose-cli/protos/containers/v1" contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"