diff --git a/aci/aci.go b/aci/aci.go index 58998d577..fee06459f 100644 --- a/aci/aci.go +++ b/aci/aci.go @@ -38,8 +38,8 @@ import ( "github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/containers" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" ) diff --git a/aci/backend.go b/aci/backend.go index 73fa1d44b..373326362 100644 --- a/aci/backend.go +++ b/aci/backend.go @@ -34,8 +34,8 @@ import ( "github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/cloud" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" ) const ( diff --git a/aci/compose.go b/aci/compose.go index 2820e192f..d72fb56e9 100644 --- a/aci/compose.go +++ b/aci/compose.go @@ -27,7 +27,7 @@ import ( "github.com/docker/compose-cli/aci/convert" "github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/utils/formatter" ) diff --git a/aci/containers.go b/aci/containers.go index 1b8a926db..8c77f83bb 100644 --- a/aci/containers.go +++ b/aci/containers.go @@ -32,7 +32,7 @@ import ( "github.com/docker/compose-cli/aci/convert" "github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/api/containers" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/errdefs" ) diff --git a/aci/context.go b/aci/context.go index 7ef34a2ac..3c8720368 100644 --- a/aci/context.go +++ b/aci/context.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/go-uuid" "github.com/pkg/errors" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/prompt" ) diff --git a/aci/context_test.go b/aci/context_test.go index e834498a2..88d726566 100644 --- a/aci/context_test.go +++ b/aci/context_test.go @@ -28,7 +28,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" ) type contextMocks struct { diff --git a/aci/convert/convert.go b/aci/convert/convert.go index 9dbcee3f9..0032a4b95 100644 --- a/aci/convert/convert.go +++ b/aci/convert/convert.go @@ -33,7 +33,7 @@ import ( "github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/utils/formatter" ) diff --git a/aci/convert/convert_test.go b/aci/convert/convert_test.go index be7a72e56..ee3bcc2c5 100644 --- a/aci/convert/convert_test.go +++ b/aci/convert/convert_test.go @@ -30,7 +30,7 @@ import ( "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" ) var ( diff --git a/aci/login/storagelogin.go b/aci/login/storagelogin.go index 8ec65b06e..fbaefb064 100644 --- a/aci/login/storagelogin.go +++ b/aci/login/storagelogin.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" ) // StorageLogin helper for Azure Storage Login diff --git a/aci/resources.go b/aci/resources.go index 8732dbc65..c483de1b1 100644 --- a/aci/resources.go +++ b/aci/resources.go @@ -23,8 +23,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/docker/compose-cli/aci/convert" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/resources" - "github.com/docker/compose-cli/context/store" ) type aciResourceService struct { diff --git a/aci/volumes.go b/aci/volumes.go index 5f25d0614..3eebfb287 100644 --- a/aci/volumes.go +++ b/aci/volumes.go @@ -29,9 +29,9 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/docker/compose-cli/aci/login" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" "github.com/docker/compose-cli/api/volumes" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" ) diff --git a/api/client/client.go b/api/client/client.go index 44e72c7f7..bbcd759a4 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -23,11 +23,11 @@ import ( "github.com/docker/compose-cli/api/cloud" "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/resources" "github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/volumes" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" ) // New returns a backend client associated with current context diff --git a/context/context.go b/api/context/context.go similarity index 100% rename from context/context.go rename to api/context/context.go diff --git a/context/flags.go b/api/context/flags.go similarity index 100% rename from context/flags.go rename to api/context/flags.go diff --git a/context/store/contextmetadata.go b/api/context/store/contextmetadata.go similarity index 100% rename from context/store/contextmetadata.go rename to api/context/store/contextmetadata.go diff --git a/context/store/contextmetadata_test.go b/api/context/store/contextmetadata_test.go similarity index 100% rename from context/store/contextmetadata_test.go rename to api/context/store/contextmetadata_test.go diff --git a/context/store/store.go b/api/context/store/store.go similarity index 100% rename from context/store/store.go rename to api/context/store/store.go diff --git a/context/store/store_test.go b/api/context/store/store_test.go similarity index 100% rename from context/store/store_test.go rename to api/context/store/store_test.go diff --git a/context/store/storedefault.go b/api/context/store/storedefault.go similarity index 100% rename from context/store/storedefault.go rename to api/context/store/storedefault.go diff --git a/cli/cmd/compose/compose.go b/cli/cmd/compose/compose.go index ddd043857..87f4ed0bd 100644 --- a/cli/cmd/compose/compose.go +++ b/cli/cmd/compose/compose.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" ) type composeOptions struct { diff --git a/cli/cmd/compose/up.go b/cli/cmd/compose/up.go index 3533a2c02..c02109171 100644 --- a/cli/cmd/compose/up.go +++ b/cli/cmd/compose/up.go @@ -24,8 +24,8 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/compose" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/formatter" "github.com/compose-spec/compose-go/cli" diff --git a/cli/cmd/context/create.go b/cli/cmd/context/create.go index 941527f9c..65354da8a 100644 --- a/cli/cmd/context/create.go +++ b/cli/cmd/context/create.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/mobycli" - "github.com/docker/compose-cli/context/store" ) type descriptionCreateOpts struct { diff --git a/cli/cmd/context/create_aci.go b/cli/cmd/context/create_aci.go index c66787df8..d30659302 100644 --- a/cli/cmd/context/create_aci.go +++ b/cli/cmd/context/create_aci.go @@ -24,7 +24,7 @@ import ( "github.com/docker/compose-cli/aci" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/errdefs" ) diff --git a/cli/cmd/context/create_ecs.go b/cli/cmd/context/create_ecs.go index 59ce01251..419ce7816 100644 --- a/cli/cmd/context/create_ecs.go +++ b/cli/cmd/context/create_ecs.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/ecs" "github.com/docker/compose-cli/errdefs" ) diff --git a/cli/cmd/context/ls.go b/cli/cmd/context/ls.go index b51193283..1f678f389 100644 --- a/cli/cmd/context/ls.go +++ b/cli/cmd/context/ls.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/mobycli" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/formatter" ) diff --git a/cli/cmd/context/rm.go b/cli/cmd/context/rm.go index 5ad9f0601..473b13e6e 100644 --- a/cli/cmd/context/rm.go +++ b/cli/cmd/context/rm.go @@ -24,9 +24,9 @@ import ( "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/formatter" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" ) type removeOpts struct { diff --git a/cli/cmd/context/show.go b/cli/cmd/context/show.go index 5b6c21298..69dc91da1 100644 --- a/cli/cmd/context/show.go +++ b/cli/cmd/context/show.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" ) func showCommand() *cobra.Command { diff --git a/cli/cmd/context/update.go b/cli/cmd/context/update.go index dcc4a3b4d..7b54bff9f 100644 --- a/cli/cmd/context/update.go +++ b/cli/cmd/context/update.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/mobycli" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" ) diff --git a/cli/cmd/context/use.go b/cli/cmd/context/use.go index d58c2d99d..038137513 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/context/store" "github.com/docker/compose-cli/config" - "github.com/docker/compose-cli/context/store" ) func useCommand() *cobra.Command { diff --git a/cli/cmd/run/run.go b/cli/cmd/run/run.go index 5219555af..62ea4be89 100644 --- a/cli/cmd/run/run.go +++ b/cli/cmd/run/run.go @@ -28,9 +28,9 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/containers" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" "github.com/docker/compose-cli/cli/options/run" - "github.com/docker/compose-cli/context/store" ) // Command runs a container diff --git a/cli/cmd/volume/command.go b/cli/cmd/volume/command.go index ba692cefd..1136129a6 100644 --- a/cli/cmd/volume/command.go +++ b/cli/cmd/volume/command.go @@ -22,9 +22,9 @@ import ( "github.com/docker/compose-cli/aci" "github.com/docker/compose-cli/api/client" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" "github.com/docker/compose-cli/cli/formatter" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/ecs" formatter2 "github.com/docker/compose-cli/formatter" diff --git a/cli/main.go b/cli/main.go index c99483103..1533d5e8b 100644 --- a/cli/main.go +++ b/cli/main.go @@ -32,6 +32,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/cmd" "github.com/docker/compose-cli/cli/cmd/compose" contextcmd "github.com/docker/compose-cli/cli/cmd/context" @@ -43,8 +45,6 @@ import ( "github.com/docker/compose-cli/cli/mobycli" cliopts "github.com/docker/compose-cli/cli/options" "github.com/docker/compose-cli/config" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" // Backend registrations diff --git a/cli/mobycli/exec.go b/cli/mobycli/exec.go index 651a923f2..e264e2cd9 100644 --- a/cli/mobycli/exec.go +++ b/cli/mobycli/exec.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/mobycli/resolvepath" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" ) var delegatedContextTypes = []string{store.DefaultContextType} diff --git a/cli/mobycli/exec_test.go b/cli/mobycli/exec_test.go index 20bd71faf..7138464f8 100644 --- a/cli/mobycli/exec_test.go +++ b/cli/mobycli/exec_test.go @@ -21,7 +21,7 @@ import ( "gotest.tools/v3/assert" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" ) func TestDelegateContextTypeToMoby(t *testing.T) { diff --git a/cli/options/options.go b/cli/options/options.go index f75754383..0d4aac187 100644 --- a/cli/options/options.go +++ b/cli/options/options.go @@ -17,8 +17,8 @@ package options import ( + apicontext "github.com/docker/compose-cli/api/context" cliconfig "github.com/docker/compose-cli/cli/config" - apicontext "github.com/docker/compose-cli/context" ) // GlobalOpts contains the global CLI options diff --git a/cli/server/interceptor.go b/cli/server/interceptor.go index 4cbcec642..211a54b56 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" + 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" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" ) // 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 88fa1ae28..c2e655338 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" + apicontext "github.com/docker/compose-cli/api/context" "github.com/docker/compose-cli/config" - apicontext "github.com/docker/compose-cli/context" ) func testContext(t *testing.T) context.Context { diff --git a/cli/server/proxy/contexts.go b/cli/server/proxy/contexts.go index 5d2d96e9c..3451b59b5 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/context/store" contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1" "github.com/docker/compose-cli/config" - "github.com/docker/compose-cli/context/store" ) type contextsProxy struct { diff --git a/cli/server/proxy/contexts_test.go b/cli/server/proxy/contexts_test.go index cacb06e1f..c05422936 100644 --- a/cli/server/proxy/contexts_test.go +++ b/cli/server/proxy/contexts_test.go @@ -23,8 +23,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" + "github.com/docker/compose-cli/api/context/store" contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1" - "github.com/docker/compose-cli/context/store" ) func TestConvertContext(t *testing.T) { diff --git a/config/config.go b/config/config.go index 1ea0e43b5..b771ded89 100644 --- a/config/config.go +++ b/config/config.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" ) type dirKey struct{} diff --git a/docs/architecture.md b/docs/architecture.md index e6910be14..e21bb3d6c 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -23,6 +23,6 @@ What follows is a list of useful links to help navigate the code: * An example backend can be found in [`example/`](../example) * The API is defined by protobufs that can be found in [`protos/`](../protos) * The API server is in [`server/`](../server) -* The context management and interface can be found in [`context/`](../context) +* The context management and interface can be found in [`context/`](../api/context) * The Node SDK is autogenerated (except for default endpoints managed by Docker Desktop), and can be found in [`docker/node-sdk`](https://github.com/docker/node-sdk) \ No newline at end of file diff --git a/ecs/backend.go b/ecs/backend.go index a9bbffb1a..cd6dc06d5 100644 --- a/ecs/backend.go +++ b/ecs/backend.go @@ -25,11 +25,11 @@ import ( "github.com/docker/compose-cli/api/cloud" "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/resources" "github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/volumes" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" "github.com/aws/aws-sdk-go/aws" diff --git a/ecs/context.go b/ecs/context.go index 8c76635cd..ad0e44a32 100644 --- a/ecs/context.go +++ b/ecs/context.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/prompt" diff --git a/ecs/context_test.go b/ecs/context_test.go index a69385e75..da8a0b365 100644 --- a/ecs/context_test.go +++ b/ecs/context_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/prompt" "github.com/golang/mock/gomock" diff --git a/ecs/local/backend.go b/ecs/local/backend.go index ce9876db4..7d80380de 100644 --- a/ecs/local/backend.go +++ b/ecs/local/backend.go @@ -27,10 +27,10 @@ import ( "github.com/docker/compose-cli/api/cloud" "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/containers" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/resources" "github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/volumes" - "github.com/docker/compose-cli/context/store" ) const backendType = store.EcsLocalSimulationContextType diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index 3bcdea555..464be0e2a 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -51,8 +51,8 @@ import ( "github.com/docker/compose-cli/aci/convert" "github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/api/containers" + "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/cmd" - "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" . "github.com/docker/compose-cli/tests/framework" ) diff --git a/tests/framework/unit.go b/tests/framework/unit.go index d2c8dc140..2e6cff58f 100644 --- a/tests/framework/unit.go +++ b/tests/framework/unit.go @@ -25,8 +25,8 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - apicontext "github.com/docker/compose-cli/context" - "github.com/docker/compose-cli/context/store" + apicontext "github.com/docker/compose-cli/api/context" + "github.com/docker/compose-cli/api/context/store" ) // TestCLI is a helper struct for CLI tests.