diff --git a/config/config.go b/api/config/config.go similarity index 100% rename from config/config.go rename to api/config/config.go diff --git a/config/config_test.go b/api/config/config_test.go similarity index 100% rename from config/config_test.go rename to api/config/config_test.go diff --git a/config/keys.go b/api/config/keys.go similarity index 100% rename from config/keys.go rename to api/config/keys.go diff --git a/cli/cmd/context/use.go b/cli/cmd/context/use.go index 038137513..8c4684c50 100644 --- a/cli/cmd/context/use.go +++ b/cli/cmd/context/use.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" + "github.com/docker/compose-cli/api/config" "github.com/docker/compose-cli/api/context/store" - "github.com/docker/compose-cli/config" ) func useCommand() *cobra.Command { diff --git a/cli/config/flags.go b/cli/config/flags.go index 2ba12e677..2a5265b27 100644 --- a/cli/config/flags.go +++ b/cli/config/flags.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - "github.com/docker/compose-cli/config" + "github.com/docker/compose-cli/api/config" ) // ConfigFlags are the global CLI flags diff --git a/cli/main.go b/cli/main.go index 35e103cb1..5a7727636 100644 --- a/cli/main.go +++ b/cli/main.go @@ -32,6 +32,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "github.com/docker/compose-cli/api/config" apicontext "github.com/docker/compose-cli/api/context" "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/errdefs" @@ -45,7 +46,6 @@ import ( "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/mobycli" cliopts "github.com/docker/compose-cli/cli/options" - "github.com/docker/compose-cli/config" // Backend registrations _ "github.com/docker/compose-cli/aci" diff --git a/cli/main_test.go b/cli/main_test.go index 20426de3e..bb62ee04a 100644 --- a/cli/main_test.go +++ b/cli/main_test.go @@ -24,11 +24,11 @@ import ( "gotest.tools/v3/assert" + "github.com/docker/compose-cli/api/config" "github.com/docker/compose-cli/cli/cmd" "github.com/docker/compose-cli/cli/cmd/context" "github.com/docker/compose-cli/cli/cmd/login" "github.com/docker/compose-cli/cli/cmd/run" - "github.com/docker/compose-cli/config" ) var contextSetConfig = []byte(`{ diff --git a/cli/server/interceptor.go b/cli/server/interceptor.go index 211a54b56..7528a513d 100644 --- a/cli/server/interceptor.go +++ b/cli/server/interceptor.go @@ -25,10 +25,10 @@ import ( "google.golang.org/grpc/metadata" "github.com/docker/compose-cli/api/client" + "github.com/docker/compose-cli/api/config" apicontext "github.com/docker/compose-cli/api/context" "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/server/proxy" - "github.com/docker/compose-cli/config" ) // key is the key where the current docker context is stored in the metadata diff --git a/cli/server/interceptor_test.go b/cli/server/interceptor_test.go index c2e655338..66dbf4a70 100644 --- a/cli/server/interceptor_test.go +++ b/cli/server/interceptor_test.go @@ -28,8 +28,8 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" + "github.com/docker/compose-cli/api/config" apicontext "github.com/docker/compose-cli/api/context" - "github.com/docker/compose-cli/config" ) func testContext(t *testing.T) context.Context { diff --git a/cli/server/proxy/contexts.go b/cli/server/proxy/contexts.go index 3451b59b5..dead69214 100644 --- a/cli/server/proxy/contexts.go +++ b/cli/server/proxy/contexts.go @@ -19,9 +19,9 @@ package proxy import ( "context" + "github.com/docker/compose-cli/api/config" "github.com/docker/compose-cli/api/context/store" contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1" - "github.com/docker/compose-cli/config" ) type contextsProxy struct { diff --git a/cli/server/proxy/proxy.go b/cli/server/proxy/proxy.go index 617aa4595..621b14f49 100644 --- a/cli/server/proxy/proxy.go +++ b/cli/server/proxy/proxy.go @@ -21,13 +21,13 @@ import ( "sync" "github.com/docker/compose-cli/api/client" + "github.com/docker/compose-cli/api/config" composev1 "github.com/docker/compose-cli/cli/server/protos/compose/v1" containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1" contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1" streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1" volumesv1 "github.com/docker/compose-cli/cli/server/protos/volumes/v1" "github.com/docker/compose-cli/cli/server/proxy/streams" - "github.com/docker/compose-cli/config" ) type clientKey struct{} diff --git a/ecs/cloudformation.go b/ecs/cloudformation.go index d8f6e12dc..afb503583 100644 --- a/ecs/cloudformation.go +++ b/ecs/cloudformation.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/config" + "github.com/docker/compose-cli/api/config" ecsapi "github.com/aws/aws-sdk-go/service/ecs" "github.com/aws/aws-sdk-go/service/elbv2" diff --git a/local/compose/pull.go b/local/compose/pull.go index e4beae823..caf75b08b 100644 --- a/local/compose/pull.go +++ b/local/compose/pull.go @@ -32,8 +32,8 @@ import ( "github.com/docker/docker/registry" "golang.org/x/sync/errgroup" + "github.com/docker/compose-cli/api/config" "github.com/docker/compose-cli/api/progress" - "github.com/docker/compose-cli/config" ) func (s *composeService) Pull(ctx context.Context, project *types.Project) error { diff --git a/local/compose/push.go b/local/compose/push.go index bb52a8dab..934b2e9e1 100644 --- a/local/compose/push.go +++ b/local/compose/push.go @@ -25,8 +25,8 @@ import ( "github.com/docker/buildx/driver" + "github.com/docker/compose-cli/api/config" "github.com/docker/compose-cli/api/progress" - "github.com/docker/compose-cli/config" "github.com/compose-spec/compose-go/types" cliconfig "github.com/docker/cli/cli/config"