Move server => cli

Signed-off-by: Guillaume Tardif <[email protected]>

cli/cmd/serve.go

@@ -23,13 +23,13 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	"github.com/docker/compose-cli/cli/server"
+	"github.com/docker/compose-cli/cli/server/proxy"
 	composev1 "github.com/docker/compose-cli/protos/compose/v1"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
 	contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"
 	streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
 	volumesv1 "github.com/docker/compose-cli/protos/volumes/v1"
-	"github.com/docker/compose-cli/server"
-	"github.com/docker/compose-cli/server/proxy"
 )
 
 type serveOpts struct {

server/interceptor.go → 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/cli/server/proxy"
 	"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/server/proxy"
 )
 
 // key is the key where the current docker context is stored in the metadata

server/metrics.go → cli/server/metrics.go

@@ -22,7 +22,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/docker/compose-cli/cli/metrics"
-	"github.com/docker/compose-cli/server/proxy"
+	"github.com/docker/compose-cli/cli/server/proxy"
 )
 
 var (

server/metrics_test.go → cli/server/metrics_test.go

@@ -34,13 +34,13 @@ import (
 	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/api/volumes"
 	"github.com/docker/compose-cli/cli/metrics"
+	"github.com/docker/compose-cli/cli/server/proxy"
 	"github.com/docker/compose-cli/errdefs"
 	composev1 "github.com/docker/compose-cli/protos/compose/v1"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
 	contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"
 	streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
 	volumesv1 "github.com/docker/compose-cli/protos/volumes/v1"
-	"github.com/docker/compose-cli/server/proxy"
 )
 
 func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) {

server/proxy/containers.go → cli/server/proxy/containers.go

@@ -25,9 +25,9 @@ import (
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 
 	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/cli/server/proxy/streams"
 	"github.com/docker/compose-cli/formatter"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
-	"github.com/docker/compose-cli/server/proxy/streams"
 )
 
 func portsToGrpc(ports []containers.Port) []*containersv1.Port {

server/proxy/proxy.go → cli/server/proxy/proxy.go

@@ -21,13 +21,13 @@ import (
 	"sync"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/cli/server/proxy/streams"
 	"github.com/docker/compose-cli/config"
 	composev1 "github.com/docker/compose-cli/protos/compose/v1"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
 	contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"
 	streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
 	volumesv1 "github.com/docker/compose-cli/protos/volumes/v1"
-	"github.com/docker/compose-cli/server/proxy/streams"
 )
 
 type clientKey struct{}

server/proxy/streams.go → cli/server/proxy/streams.go

@@ -21,8 +21,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/metadata"
 
+	"github.com/docker/compose-cli/cli/server/proxy/streams"
 	streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
-	"github.com/docker/compose-cli/server/proxy/streams"
 )
 
 func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error {

import-restrictions.yaml

@@ -5,29 +5,21 @@
     - github.com/docker/compose-cli/ecs
     - github.com/docker/compose-cli/example
     - github.com/docker/compose-cli/local
-    - github.com/docker/compose-cli/metrics
-    - github.com/docker/compose-cli/server
 - path: ./ecs
   forbiddenImports:
     - github.com/docker/compose-cli/aci
     - github.com/docker/compose-cli/cli
     - github.com/docker/compose-cli/example
     - github.com/docker/compose-cli/local
-    - github.com/docker/compose-cli/metrics
-    - github.com/docker/compose-cli/server
 - path: ./example
   forbiddenImports:
     - github.com/docker/compose-cli/aci
     - github.com/docker/compose-cli/cli
     - github.com/docker/compose-cli/ecs
     - github.com/docker/compose-cli/local
-    - github.com/docker/compose-cli/metrics
-    - github.com/docker/compose-cli/server
 - path: ./local
   forbiddenImports:
     - github.com/docker/compose-cli/aci
     - github.com/docker/compose-cli/cli
     - github.com/docker/compose-cli/ecs
     - github.com/docker/compose-cli/example
-    - github.com/docker/compose-cli/metrics
-    - github.com/docker/compose-cli/server