Merge pull request #590 from docker/api_folder

.github/labeler.yml

@@ -8,11 +8,7 @@ cli:
   - cli/**/*
 
 api:
-  - containers/**/*
-  - compose/**/*
-  - secrets/**/*
-  - server/**/*
-  - protos/**/*
+  - api/**/*
 
 ci:
   - .github/**/*

aci/aci.go

@@ -35,7 +35,7 @@ import (
 
 	"github.com/docker/compose-cli/aci/convert"
 	"github.com/docker/compose-cli/aci/login"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/errdefs"
 	"github.com/docker/compose-cli/progress"

aci/backend.go

@@ -33,14 +33,14 @@ 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/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/backend"
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
 	apicontext "github.com/docker/compose-cli/context"
 	"github.com/docker/compose-cli/context/cloud"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/errdefs"
-	"github.com/docker/compose-cli/secrets"
 )
 
 const (

aci/backend_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"gotest.tools/v3/assert"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 func TestGetContainerName(t *testing.T) {

aci/convert/container.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/compose-spec/compose-go/types"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 // ContainerToComposeProject convert container config to compose project

aci/convert/container_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/compose-spec/compose-go/types"
 	"gotest.tools/v3/assert"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 func TestConvertContainerEnvironment(t *testing.T) {

aci/convert/convert.go

@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/utils/formatter"
 
 	"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance"
@@ -35,7 +35,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/docker/compose-cli/aci/login"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/context/store"
 )
 

aci/convert/convert_test.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 
 	"github.com/Azure/azure-sdk-for-go/profiles/latest/containerinstance/mgmt/containerinstance"
 	"github.com/Azure/go-autorest/autorest/to"
@@ -29,7 +29,7 @@ import (
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/context/store"
 )
 

aci/convert/ports.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 // ToPorts converts Azure container ports to api ports

aci/convert/ports_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 	"gotest.tools/v3/assert"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 func TestPortConvert(t *testing.T) {

client/client.go → api/client/client.go

@@ -19,13 +19,13 @@ package client
 import (
 	"context"
 
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/backend"
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
 	apicontext "github.com/docker/compose-cli/context"
 	"github.com/docker/compose-cli/context/cloud"
 	"github.com/docker/compose-cli/context/store"
-	"github.com/docker/compose-cli/secrets"
 )
 
 // New returns a backend client associated with current context

client/compose.go → api/client/compose.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/compose-spec/compose-go/types"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/errdefs"
 )
 

client/containers.go → api/client/containers.go

@@ -19,7 +19,7 @@ package client
 import (
 	"context"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/errdefs"
 )
 

client/secrets.go → api/client/secrets.go

@@ -19,8 +19,8 @@ package client
 import (
 	"context"
 
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/errdefs"
-	"github.com/docker/compose-cli/secrets"
 )
 
 type secretsService struct {

backend/backend.go

@@ -23,11 +23,11 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/context/cloud"
 	"github.com/docker/compose-cli/errdefs"
-	"github.com/docker/compose-cli/secrets"
 )
 
 var (

cli/cmd/compose/compose.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/errdefs"
 )
 

cli/cmd/compose/convert.go

@@ -23,7 +23,7 @@ import (
 	"github.com/compose-spec/compose-go/cli"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 )
 
 func convertCommand() *cobra.Command {

cli/cmd/compose/down.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/progress"
 )
 

cli/cmd/compose/list.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 )
 
 func listCommand() *cobra.Command {

cli/cmd/compose/logs.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 )
 
 func logsCommand() *cobra.Command {

cli/cmd/compose/ps.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 )
 
 func psCommand() *cobra.Command {

cli/cmd/compose/up.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/progress"
 )
 

cli/cmd/context/create_aci.go

@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/aci"
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/errdefs"
 )

cli/cmd/context/create_ecs.go

@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/ecs"
 	"github.com/docker/compose-cli/errdefs"

cli/cmd/exec.go

@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 type execOpts struct {

cli/cmd/inspect.go

@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/formatter"
 )
 

cli/cmd/kill.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/errdefs"
 )
 

cli/cmd/login/login.go

@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/cli/mobycli"
-	"github.com/docker/compose-cli/client"
 	"github.com/docker/compose-cli/errdefs"
 )
 

cli/cmd/logout/azure.go

@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/errdefs"
 )
 

cli/cmd/logs.go

@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 type logsOpts struct {

cli/cmd/ps.go

@@ -28,7 +28,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	formatter2 "github.com/docker/compose-cli/formatter"
 )
 

cli/cmd/rm.go

@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/errdefs"
 )
 

cli/cmd/run/run.go

@@ -25,10 +25,10 @@ import (
 	"github.com/containerd/console"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/cli/options/run"
-	"github.com/docker/compose-cli/client"
 	"github.com/docker/compose-cli/progress"
 )
 

cli/cmd/secrets.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose-cli/client"
-	"github.com/docker/compose-cli/secrets"
+	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/secrets"
 )
 
 type createSecretOptions struct {

cli/cmd/secrets_test.go

@@ -22,7 +22,7 @@ import (
 
 	"gotest.tools/v3/golden"
 
-	"github.com/docker/compose-cli/secrets"
+	"github.com/docker/compose-cli/api/secrets"
 )
 
 func TestPrintList(t *testing.T) {

cli/cmd/start.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 )
 
 // StartCommand starts containers

cli/cmd/stop.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 )
 
 type stopOpts struct {

cli/options/run/opts.go

@@ -26,7 +26,7 @@ import (
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/docker/go-connections/nat"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/formatter"
 )
 

cli/options/run/opts_test.go

@@ -25,7 +25,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 var (

ecs/backend.go

@@ -22,14 +22,14 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/backend"
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
 	apicontext "github.com/docker/compose-cli/context"
 	"github.com/docker/compose-cli/context/cloud"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/errdefs"
-	"github.com/docker/compose-cli/secrets"
 )
 
 const backendType = store.EcsContextType

ecs/cloudformation.go

@@ -23,7 +23,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 
 	ecsapi "github.com/aws/aws-sdk-go/service/ecs"
 	"github.com/aws/aws-sdk-go/service/elbv2"

ecs/cloudformation_test.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/awslabs/goformation/v4/cloudformation"

ecs/list.go

@@ -19,7 +19,7 @@ package ecs
 import (
 	"context"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 )
 
 func (b *ecsAPIService) List(ctx context.Context, project string) ([]compose.Stack, error) {

ecs/local/backend.go

@@ -19,9 +19,9 @@ package local
 import (
 	"context"
 
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
-	"github.com/docker/compose-cli/secrets"
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/docker/client"
 
 	"github.com/docker/compose-cli/backend"

ecs/local/compose.go

@@ -30,7 +30,7 @@ import (
 	types2 "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/errdefs"
 
 	"github.com/aws/aws-sdk-go/aws"

ecs/ps.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/compose-cli/compose"
+	"github.com/docker/compose-cli/api/compose"
 )
 
 func (b *ecsAPIService) Ps(ctx context.Context, project string) ([]compose.ServiceStatus, error) {

ecs/sdk.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/client"
 
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/secrets"
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/secrets"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"

ecs/secrets.go

@@ -19,7 +19,7 @@ package ecs
 import (
 	"context"
 
-	"github.com/docker/compose-cli/secrets"
+	"github.com/docker/compose-cli/api/secrets"
 )
 
 func (b *ecsAPIService) CreateSecret(ctx context.Context, secret secrets.Secret) (string, error) {

example/backend.go

@@ -26,12 +26,12 @@ import (
 
 	"github.com/compose-spec/compose-go/types"
 
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/backend"
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
 	"github.com/docker/compose-cli/context/cloud"
 	"github.com/docker/compose-cli/errdefs"
-	"github.com/docker/compose-cli/secrets"
 )
 
 type apiService struct {

local/backend.go

@@ -36,12 +36,12 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/pkg/errors"
 
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/containers"
+	"github.com/docker/compose-cli/api/secrets"
 	"github.com/docker/compose-cli/backend"
-	"github.com/docker/compose-cli/compose"
-	"github.com/docker/compose-cli/containers"
 	"github.com/docker/compose-cli/context/cloud"
 	"github.com/docker/compose-cli/errdefs"
-	"github.com/docker/compose-cli/secrets"
 )
 
 type local struct {

server/interceptor.go

@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/config"
 	apicontext "github.com/docker/compose-cli/context"
 	"github.com/docker/compose-cli/context/store"

server/proxy/containers.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/formatter"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
 	"github.com/docker/compose-cli/server/proxy/streams"

server/proxy/containers_test.go

@@ -21,7 +21,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/formatter"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
 )

server/proxy/proxy.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/docker/compose-cli/client"
+	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/config"
 	containersv1 "github.com/docker/compose-cli/protos/containers/v1"
 	contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"

tests/aci-e2e/e2e-aci_test.go

@@ -45,7 +45,7 @@ import (
 
 	"github.com/docker/compose-cli/aci"
 	"github.com/docker/compose-cli/aci/login"
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/errdefs"
 	"github.com/docker/compose-cli/tests/aci-e2e/storage"

tests/framework/e2e.go

@@ -33,7 +33,7 @@ import (
 	is "gotest.tools/v3/assert/cmp"
 	"gotest.tools/v3/icmd"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 var (

utils/formatter/container.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/compose-cli/containers"
+	"github.com/docker/compose-cli/api/containers"
 )
 
 type portGroup struct {