Move errdefs => api/errdefs

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

View File

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

View File

@ -28,7 +28,7 @@ import (
"github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/compose"
"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"
)

View File

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

View File

@ -28,7 +28,7 @@ import (
"github.com/pkg/errors"
"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"
)

View File

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

View File

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

View File

@ -33,7 +33,7 @@ import (
"github.com/pkg/errors"
"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

View File

@ -30,9 +30,9 @@ import (
"github.com/docker/compose-cli/aci/login"
"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/volumes"
"github.com/docker/compose-cli/errdefs"
)
type aciVolumeService struct {

View File

@ -26,10 +26,10 @@ import (
"github.com/docker/compose-cli/api/cloud"
"github.com/docker/compose-cli/api/compose"
"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/secrets"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
)
var (

View File

@ -20,7 +20,7 @@ import (
"context"
"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"
)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -28,8 +28,8 @@ import (
"github.com/docker/compose-cli/api/client"
"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/errdefs"
)
func init() {

View File

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"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/errdefs"
)
func updateCommand() *cobra.Command {

View File

@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra"
"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/errdefs"
)
type killOpts struct {

View File

@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra"
"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/mobycli"
"github.com/docker/compose-cli/errdefs"
)
// Command returns the login command

View File

@ -24,7 +24,7 @@ import (
"github.com/spf13/cobra"
"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

View File

@ -26,8 +26,8 @@ import (
"github.com/docker/compose-cli/api/client"
"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/errdefs"
)
type rmOpts struct {

View File

@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra"
"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/errdefs"
)
// StartCommand starts containers

View File

@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra"
"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/errdefs"
)
type stopOpts struct {

View File

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

View File

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

View File

@ -31,6 +31,7 @@ import (
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/compose"
"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/volumes"
"github.com/docker/compose-cli/cli/metrics"
@ -40,7 +41,6 @@ import (
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"
"github.com/docker/compose-cli/errdefs"
)
func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) {

View File

@ -23,7 +23,7 @@ import (
"strings"
"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/service/elbv2"

View File

@ -27,10 +27,10 @@ import (
"github.com/docker/compose-cli/api/containers"
apicontext "github.com/docker/compose-cli/api/context"
"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/secrets"
"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/session"

View File

@ -25,7 +25,7 @@ import (
"strings"
"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/AlecAivazis/survey/v2/terminal"

View File

@ -29,7 +29,7 @@ import (
"github.com/sanathkr/go-yaml"
"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 {

View File

@ -20,8 +20,8 @@ import (
"context"
"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/errdefs"
)
var _ cloud.Service = ecsLocalSimulation{}

View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/types"
"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 {

View File

@ -25,8 +25,8 @@ import (
"time"
"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/errdefs"
"github.com/docker/compose-cli/internal"
"github.com/aws/aws-sdk-go/aws"

View File

@ -26,7 +26,7 @@ import (
"github.com/sirupsen/logrus"
"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"
)

View File

@ -21,8 +21,8 @@ import (
"fmt"
"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/errdefs"
"github.com/awslabs/goformation/v4/cloudformation"
"github.com/awslabs/goformation/v4/cloudformation/efs"

View File

@ -27,10 +27,10 @@ import (
"github.com/docker/compose-cli/api/cloud"
"github.com/docker/compose-cli/api/compose"
"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/secrets"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
"github.com/compose-spec/compose-go/types"
)

View File

@ -29,7 +29,7 @@ import (
"github.com/docker/docker/client"
"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

View File

@ -34,7 +34,7 @@ import (
"github.com/pkg/errors"
"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"
)

View File

@ -52,8 +52,8 @@ import (
"github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/containers"
"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/errdefs"
. "github.com/docker/compose-cli/tests/framework"
)