Merge pull request #2054 from ndeloof/compose.v2

remove all references to cli from compose.v2 cmd package

Author: ndeloof

aci/login/client.go

@@ -34,6 +34,9 @@ import (
 	"github.com/docker/compose-cli/pkg/api"
 )
 
+// UserAgentName is the default user agent used by the cli
+const UserAgentName = "docker-cli"
+
 // NewContainerGroupsClient get client toi manipulate containerGrouos
 func NewContainerGroupsClient(subscriptionID string) (containerinstance.ContainerGroupsClient, error) {
 	authorizer, mgmtURL, err := getClientSetupData()
@@ -52,7 +55,7 @@ func NewContainerGroupsClient(subscriptionID string) (containerinstance.Containe
 }
 
 func setupClient(aciClient *autorest.Client, auth autorest.Authorizer) {
-	aciClient.UserAgent = internal.UserAgentName + "/" + internal.Version
+	aciClient.UserAgent = UserAgentName + "/" + internal.Version
 	aciClient.Authorizer = auth
 }
 

cli/cmd/context/ls.go

@@ -23,12 +23,13 @@ import (
 	"sort"
 	"strings"
 
+	formatter2 "github.com/docker/compose-cli/cmd/formatter"
+
 	"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/formatter"
 	"github.com/docker/compose-cli/cli/mobycli"
 )
 
@@ -68,7 +69,7 @@ func runList(cmd *cobra.Command, opts lsOpts) error {
 		return err
 	}
 	format := strings.ToLower(strings.ReplaceAll(opts.format, " ", ""))
-	if format != "" && format != formatter.JSON && format != formatter.PRETTY && format != formatter.TemplateLegacyJSON {
+	if format != "" && format != formatter2.JSON && format != formatter2.PRETTY && format != formatter2.TemplateLegacyJSON {
 		mobycli.Exec(cmd.Root())
 		return nil
 	}
@@ -91,15 +92,15 @@ func runList(cmd *cobra.Command, opts lsOpts) error {
 		return nil
 	}
 
-	if opts.json || format == formatter.JSON {
-		opts.format = formatter.JSON
+	if opts.json || format == formatter2.JSON {
+		opts.format = formatter2.JSON
 	}
-	if format == formatter.TemplateLegacyJSON {
-		opts.format = formatter.TemplateLegacyJSON
+	if format == formatter2.TemplateLegacyJSON {
+		opts.format = formatter2.TemplateLegacyJSON
 	}
 
 	view := viewFromContextList(contexts, currentContext)
-	return formatter.Print(view, opts.format, os.Stdout,
+	return formatter2.Print(view, opts.format, os.Stdout,
 		func(w io.Writer) {
 			for _, c := range view {
 				contextName := c.Name

cli/cmd/context/rm.go

@@ -20,12 +20,13 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"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"
 )
 
 type removeOpts struct {

cli/cmd/inspect.go

@@ -20,14 +20,15 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/compose-spec/compose-go/types"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/containers"
-	"github.com/docker/compose-cli/cli/formatter"
 )
 
 // InspectCommand inspects into containers

cli/cmd/kill.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
-	"github.com/docker/compose-cli/cli/formatter"
 	"github.com/docker/compose-cli/pkg/api"
 )
 

cli/cmd/ps.go

@@ -23,12 +23,13 @@ import (
 	"os"
 	"strings"
 
+	formatter3 "github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/containers"
-	formatter2 "github.com/docker/compose-cli/cli/formatter"
 	"github.com/docker/compose-cli/utils/formatter"
 )
 
@@ -89,11 +90,11 @@ func runPs(ctx context.Context, opts psOpts) error {
 	}
 
 	if opts.json {
-		opts.format = formatter2.JSON
+		opts.format = formatter3.JSON
 	}
 
 	view := viewFromContainerList(containerList)
-	return formatter2.Print(view, opts.format, os.Stdout, func(w io.Writer) {
+	return formatter3.Print(view, opts.format, os.Stdout, func(w io.Writer) {
 		for _, c := range view {
 			_, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", c.ID, c.Image, c.Command, c.Status,
 				strings.Join(c.Ports, ", "))

cli/cmd/rm.go

@@ -20,13 +20,14 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/containers"
-	"github.com/docker/compose-cli/cli/formatter"
 	"github.com/docker/compose-cli/pkg/api"
 )
 

cli/cmd/secrets.go

@@ -22,11 +22,12 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/secrets"
-	"github.com/docker/compose-cli/cli/formatter"
 )
 
 // SecretCommand manage secrets

cli/cmd/start.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
-	"github.com/docker/compose-cli/cli/formatter"
 	"github.com/docker/compose-cli/pkg/api"
 )
 

cli/cmd/stop.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/compose-cli/cmd/formatter"
+
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
-	"github.com/docker/compose-cli/cli/formatter"
 	"github.com/docker/compose-cli/pkg/api"
 )