Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 54020db

Browse files
authored
Merge pull request #1150 from gtardif/refacto_folders
Refacto folders
2 parents 80da160 + 907ba0c commit 54020db

File tree

170 files changed

+236
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+236
-363
lines changed

aci/aci.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838
"github.com/docker/compose-cli/aci/login"
3939
"github.com/docker/compose-cli/api/client"
4040
"github.com/docker/compose-cli/api/containers"
41-
"github.com/docker/compose-cli/context/store"
42-
"github.com/docker/compose-cli/errdefs"
43-
"github.com/docker/compose-cli/progress"
41+
"github.com/docker/compose-cli/api/context/store"
42+
"github.com/docker/compose-cli/api/errdefs"
43+
"github.com/docker/compose-cli/api/progress"
4444
)
4545

4646
func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error {

aci/backend.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ import (
2626

2727
"github.com/docker/compose-cli/aci/convert"
2828
"github.com/docker/compose-cli/aci/login"
29+
"github.com/docker/compose-cli/api/backend"
2930
"github.com/docker/compose-cli/api/compose"
3031
"github.com/docker/compose-cli/api/containers"
3132
"github.com/docker/compose-cli/api/resources"
3233
"github.com/docker/compose-cli/api/secrets"
3334
"github.com/docker/compose-cli/api/volumes"
34-
"github.com/docker/compose-cli/backend"
35-
apicontext "github.com/docker/compose-cli/context"
36-
"github.com/docker/compose-cli/context/cloud"
37-
"github.com/docker/compose-cli/context/store"
35+
36+
"github.com/docker/compose-cli/api/cloud"
37+
apicontext "github.com/docker/compose-cli/api/context"
38+
"github.com/docker/compose-cli/api/context/store"
3839
)
3940

4041
const (

aci/compose.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/docker/compose-cli/aci/convert"
2828
"github.com/docker/compose-cli/aci/login"
2929
"github.com/docker/compose-cli/api/compose"
30-
"github.com/docker/compose-cli/context/store"
31-
"github.com/docker/compose-cli/errdefs"
30+
"github.com/docker/compose-cli/api/context/store"
31+
"github.com/docker/compose-cli/api/errdefs"
3232
"github.com/docker/compose-cli/utils/formatter"
3333
)
3434

aci/containers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"github.com/docker/compose-cli/aci/convert"
3333
"github.com/docker/compose-cli/aci/login"
3434
"github.com/docker/compose-cli/api/containers"
35-
"github.com/docker/compose-cli/context/store"
36-
"github.com/docker/compose-cli/errdefs"
35+
"github.com/docker/compose-cli/api/context/store"
36+
"github.com/docker/compose-cli/api/errdefs"
3737
)
3838

3939
type aciContainerService struct {

aci/context.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/hashicorp/go-uuid"
2828
"github.com/pkg/errors"
2929

30-
"github.com/docker/compose-cli/context/store"
31-
"github.com/docker/compose-cli/errdefs"
32-
"github.com/docker/compose-cli/prompt"
30+
"github.com/docker/compose-cli/api/context/store"
31+
"github.com/docker/compose-cli/api/errdefs"
32+
"github.com/docker/compose-cli/utils/prompt"
3333
)
3434

3535
// ContextParams options for creating ACI context

aci/context_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"gotest.tools/v3/assert"
2929
"gotest.tools/v3/assert/cmp"
3030

31-
"github.com/docker/compose-cli/context/store"
31+
"github.com/docker/compose-cli/api/context/store"
3232
)
3333

3434
type contextMocks struct {

aci/convert/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/docker/compose-cli/aci/login"
3434
"github.com/docker/compose-cli/api/compose"
3535
"github.com/docker/compose-cli/api/containers"
36-
"github.com/docker/compose-cli/context/store"
36+
"github.com/docker/compose-cli/api/context/store"
3737
"github.com/docker/compose-cli/utils/formatter"
3838
)
3939

aci/convert/convert_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
"github.com/docker/compose-cli/api/compose"
3232
"github.com/docker/compose-cli/api/containers"
33-
"github.com/docker/compose-cli/context/store"
33+
"github.com/docker/compose-cli/api/context/store"
3434
)
3535

3636
var (

aci/convert/volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/compose-spec/compose-go/types"
3131

3232
"github.com/docker/compose-cli/aci/login"
33-
"github.com/docker/compose-cli/errdefs"
33+
"github.com/docker/compose-cli/api/errdefs"
3434
)
3535

3636
const (

aci/login/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/Azure/go-autorest/autorest"
2727
"github.com/pkg/errors"
2828

29-
"github.com/docker/compose-cli/errdefs"
29+
"github.com/docker/compose-cli/api/errdefs"
3030
"github.com/docker/compose-cli/internal"
3131
)
3232

0 commit comments

Comments
 (0)