Move config => api/config

gtardif · gtardif · commit 2a8c24e4ff6f · 2021-01-15T16:55:10.000+01:00
Signed-off-by: Guillaume Tardif &lt;guillaume.tardif@gmail.com&gt;
diff --git a/api/config/config.go b/api/config/config.go
diff --git a/api/config/config_test.go b/api/config/config_test.go
diff --git a/api/config/keys.go b/api/config/keys.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ import (`
`22`	`22`
`23`	`23`	`"github.com/spf13/cobra"`
`24`	`24`
	`25`	`+ "github.com/docker/compose-cli/api/config"`
`25`	`26`	`"github.com/docker/compose-cli/api/context/store"`
`26`		`- "github.com/docker/compose-cli/config"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`func useCommand() *cobra.Command {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`"github.com/spf13/pflag"`
`24`	`24`
`25`		`- "github.com/docker/compose-cli/config"`
	`25`	`+ "github.com/docker/compose-cli/api/config"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// ConfigFlags are the global CLI flags`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ import (`
`28`	`28`	`"gotest.tools/v3/assert"`
`29`	`29`	`"gotest.tools/v3/assert/cmp"`
`30`	`30`
	`31`	`+ "github.com/docker/compose-cli/api/config"`
`31`	`32`	`apicontext "github.com/docker/compose-cli/api/context"`
`32`		`- "github.com/docker/compose-cli/config"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func testContext(t *testing.T) context.Context {`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ package proxy`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`	`21`
	`22`	`+ "github.com/docker/compose-cli/api/config"`
`22`	`23`	`"github.com/docker/compose-cli/api/context/store"`
`23`	`24`	`contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1"`
`24`		`- "github.com/docker/compose-cli/config"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`type contextsProxy struct {`