tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move errdefs => api/errdefs

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-01-15 16:51:31 +01:00
parent 5e20ffdc50
commit f1ac6d4fdc
44 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aci/aci.go
View File

@ -39,8 +39,8 @@ import (
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/progress" "github.com/docker/compose-cli/api/progress"
"github.com/docker/compose-cli/errdefs"
) )
func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error {

2
aci/compose.go
View File

@ -28,7 +28,7 @@ import (
"github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/utils/formatter" "github.com/docker/compose-cli/utils/formatter"
) )

2
aci/containers.go
View File

@ -33,7 +33,7 @@ import (
"github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
type aciContainerService struct { type aciContainerService struct {

2
aci/context.go
View File

@ -28,7 +28,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/utils/prompt" "github.com/docker/compose-cli/utils/prompt"
) )

2
aci/convert/volume.go
View File

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

2
aci/login/client.go
View File

@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/internal" "github.com/docker/compose-cli/internal"
) )

2
aci/login/login.go
View File

@ -33,7 +33,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
//go login process, derived from code sample provided by MS at https://github.com/devigned/go-az-cli-stuff //go login process, derived from code sample provided by MS at https://github.com/devigned/go-az-cli-stuff

2
aci/volumes.go
View File

@ -30,9 +30,9 @@ import (
"github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/progress" "github.com/docker/compose-cli/api/progress"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
) )
type aciVolumeService struct { type aciVolumeService struct {

2
api/backend/backend.go
View File

@ -26,10 +26,10 @@ import (
"github.com/docker/compose-cli/api/cloud" "github.com/docker/compose-cli/api/cloud"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/resources" "github.com/docker/compose-cli/api/resources"
"github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
) )
var ( var (

2
api/client/compose.go
View File

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

2
api/client/containers.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
type containerService struct { type containerService struct {

2
api/client/resources.go
View File

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

2
api/client/secrets.go
View File

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

2
api/client/volume.go
View File

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

2
api/cloud/api.go
View File

@ -19,7 +19,7 @@ package cloud
import ( import (
"context" "context"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
// Service cloud specific services // Service cloud specific services

2
api/context/store/store.go
View File

@ -28,7 +28,7 @@ import (
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
const ( const (

2
api/context/store/store_test.go
View File

@ -25,7 +25,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/assert/cmp" "gotest.tools/v3/assert/cmp"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
func testStore(t *testing.T) Store { func testStore(t *testing.T) Store {

0
errdefs/errors.go → api/errdefs/errors.go
View File

0
errdefs/errors_test.go → api/errdefs/errors_test.go
View File

2
cli/cmd/context/create_aci.go
View File

@ -25,7 +25,7 @@ import (
"github.com/docker/compose-cli/aci" "github.com/docker/compose-cli/aci"
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
func init() { func init() {

2
cli/cmd/context/create_ecs.go
View File

@ -28,8 +28,8 @@ import (
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/ecs" "github.com/docker/compose-cli/ecs"
"github.com/docker/compose-cli/errdefs"
) )
func init() { func init() {

2
cli/cmd/context/update.go
View File

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
"github.com/docker/compose-cli/errdefs"
) )
func updateCommand() *cobra.Command { func updateCommand() *cobra.Command {

2
cli/cmd/kill.go
View File

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

2
cli/cmd/login/login.go
View File

@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/cli/cmd/mobyflags" "github.com/docker/compose-cli/cli/cmd/mobyflags"
"github.com/docker/compose-cli/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
"github.com/docker/compose-cli/errdefs"
) )
// Command returns the login command // Command returns the login command

2
cli/cmd/logout/azure.go
View File

@ -24,7 +24,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
// AzureLogoutCommand returns the azure logout command // AzureLogoutCommand returns the azure logout command

2
cli/cmd/rm.go
View File

@ -26,8 +26,8 @@ import (
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/cli/formatter" "github.com/docker/compose-cli/cli/formatter"
"github.com/docker/compose-cli/errdefs"
) )
type rmOpts struct { type rmOpts struct {

2
cli/cmd/start.go
View File

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

2
cli/cmd/stop.go
View File

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

2
cli/formatter/formatter.go
View File

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
// Print prints formatted lists in different formats // Print prints formatted lists in different formats

2
cli/main.go
View File

@ -34,6 +34,7 @@ import (
apicontext "github.com/docker/compose-cli/api/context" apicontext "github.com/docker/compose-cli/api/context"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/cli/cmd" "github.com/docker/compose-cli/cli/cmd"
"github.com/docker/compose-cli/cli/cmd/compose" "github.com/docker/compose-cli/cli/cmd/compose"
contextcmd "github.com/docker/compose-cli/cli/cmd/context" contextcmd "github.com/docker/compose-cli/cli/cmd/context"
@ -45,7 +46,6 @@ import (
"github.com/docker/compose-cli/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
cliopts "github.com/docker/compose-cli/cli/options" cliopts "github.com/docker/compose-cli/cli/options"
"github.com/docker/compose-cli/config" "github.com/docker/compose-cli/config"
"github.com/docker/compose-cli/errdefs"
// Backend registrations // Backend registrations
_ "github.com/docker/compose-cli/aci" _ "github.com/docker/compose-cli/aci"

2
cli/server/metrics_test.go
View File

@ -31,6 +31,7 @@ import (
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/metrics"
@ -40,7 +41,6 @@ import (
streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1" streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1"
volumesv1 "github.com/docker/compose-cli/cli/server/protos/volumes/v1" volumesv1 "github.com/docker/compose-cli/cli/server/protos/volumes/v1"
"github.com/docker/compose-cli/cli/server/proxy" "github.com/docker/compose-cli/cli/server/proxy"
"github.com/docker/compose-cli/errdefs"
) )
func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) { func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) {

2
ecs/awsResources.go
View File

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

2
ecs/backend.go
View File

@ -27,10 +27,10 @@ import (
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
apicontext "github.com/docker/compose-cli/api/context" apicontext "github.com/docker/compose-cli/api/context"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/resources" "github.com/docker/compose-cli/api/resources"
"github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"

2
ecs/context.go
View File

@ -25,7 +25,7 @@ import (
"strings" "strings"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/utils/prompt" "github.com/docker/compose-cli/utils/prompt"
"github.com/AlecAivazis/survey/v2/terminal" "github.com/AlecAivazis/survey/v2/terminal"

2
ecs/local/compose.go
View File

@ -29,7 +29,7 @@ import (
"github.com/sanathkr/go-yaml" "github.com/sanathkr/go-yaml"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
func (e ecsLocalSimulation) Build(ctx context.Context, project *types.Project) error { func (e ecsLocalSimulation) Build(ctx context.Context, project *types.Project) error {

2
ecs/local/context.go
View File

@ -20,8 +20,8 @@ import (
"context" "context"
"github.com/docker/compose-cli/api/cloud" "github.com/docker/compose-cli/api/cloud"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/ecs" "github.com/docker/compose-cli/ecs"
"github.com/docker/compose-cli/errdefs"
) )
var _ cloud.Service = ecsLocalSimulation{} var _ cloud.Service = ecsLocalSimulation{}

2
ecs/run.go
View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
) )
func (b *ecsAPIService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error { func (b *ecsAPIService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {

2
ecs/sdk.go
View File

@ -25,8 +25,8 @@ import (
"time" "time"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/errdefs"
"github.com/docker/compose-cli/internal" "github.com/docker/compose-cli/internal"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"

2
ecs/up.go
View File

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

2
ecs/volumes.go
View File

@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
"github.com/awslabs/goformation/v4/cloudformation" "github.com/awslabs/goformation/v4/cloudformation"
"github.com/awslabs/goformation/v4/cloudformation/efs" "github.com/awslabs/goformation/v4/cloudformation/efs"

2
example/backend.go
View File

@ -27,10 +27,10 @@ import (
"github.com/docker/compose-cli/api/cloud" "github.com/docker/compose-cli/api/cloud"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/api/resources" "github.com/docker/compose-cli/api/resources"
"github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
) )

2
local/compose/compose.go
View File

@ -29,7 +29,7 @@ import (
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/sanathkr/go-yaml" "github.com/sanathkr/go-yaml"
errdefs2 "github.com/docker/compose-cli/errdefs" errdefs2 "github.com/docker/compose-cli/api/errdefs"
) )
// NewComposeService create a local implementation of the compose.Service API // NewComposeService create a local implementation of the compose.Service API

2
local/containers.go
View File

@ -34,7 +34,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/local/moby" "github.com/docker/compose-cli/local/moby"
) )

2
tests/aci-e2e/e2e-aci_test.go
View File

@ -52,8 +52,8 @@ import (
"github.com/docker/compose-cli/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/context/store"
"github.com/docker/compose-cli/api/errdefs"
"github.com/docker/compose-cli/cli/cmd" "github.com/docker/compose-cli/cli/cmd"
"github.com/docker/compose-cli/errdefs"
. "github.com/docker/compose-cli/tests/framework" . "github.com/docker/compose-cli/tests/framework"
) )