tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-01 10:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source 
Co-authored-by: Chris Crone <christopher.crone@docker.com>

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-09-10 14:17:49 +02:00
parent 80d23a6097
commit 099b64935b
11 changed files with 47 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aci/cloud.go
View File

@ -31,7 +31,7 @@ type aciCloudService struct {
func (cs *aciCloudService) Login(ctx context.Context, params interface{}) error { func (cs *aciCloudService) Login(ctx context.Context, params interface{}) error {
opts, ok := params.(LoginParams) opts, ok := params.(LoginParams)
if !ok { if !ok {
return errors.New("Could not read azure LoginParams struct from generic parameter") return errors.New("could not read Azure LoginParams struct from generic parameter")
} }
if opts.ClientID != "" { if opts.ClientID != "" {
return cs.loginService.LoginServicePrincipal(opts.ClientID, opts.ClientSecret, opts.TenantID) return cs.loginService.LoginServicePrincipal(opts.ClientID, opts.ClientSecret, opts.TenantID)

12
aci/compose.go
View File

@ -37,7 +37,7 @@ type aciComposeService struct {
} }
func (cs *aciComposeService) Up(ctx context.Context, project *types.Project) error { func (cs *aciComposeService) Up(ctx context.Context, project *types.Project) error {
logrus.Debugf("Up on project with name %q\n", project.Name) logrus.Debugf("Up on project with name %q", project.Name)
groupDefinition, err := convert.ToContainerGroup(ctx, cs.ctx, *project) groupDefinition, err := convert.ToContainerGroup(ctx, cs.ctx, *project)
addTag(&groupDefinition, composeContainerTag) addTag(&groupDefinition, composeContainerTag)
@ -48,7 +48,7 @@ func (cs *aciComposeService) Up(ctx context.Context, project *types.Project) err
} }
func (cs *aciComposeService) Down(ctx context.Context, project string) error { func (cs *aciComposeService) Down(ctx context.Context, project string) error {
logrus.Debugf("Down on project with name %q\n", project) logrus.Debugf("Down on project with name %q", project)
cg, err := deleteACIContainerGroup(ctx, cs.ctx, project) cg, err := deleteACIContainerGroup(ctx, cs.ctx, project)
if err != nil { if err != nil {
@ -69,11 +69,11 @@ func (cs *aciComposeService) Ps(ctx context.Context, project string) ([]compose.
group, err := groupsClient.Get(ctx, cs.ctx.ResourceGroup, project) group, err := groupsClient.Get(ctx, cs.ctx.ResourceGroup, project)
if err != nil { if err != nil {
return []compose.ServiceStatus{}, err return nil, err
} }
if group.Containers == nil || len(*group.Containers) < 1 { if group.Containers == nil || len(*group.Containers) == 0 {
return []compose.ServiceStatus{}, fmt.Errorf("no containers found in ACI container group %s", project) return nil, fmt.Errorf("no containers found in ACI container group %s", project)
} }
res := []compose.ServiceStatus{} res := []compose.ServiceStatus{}
@ -89,7 +89,7 @@ func (cs *aciComposeService) Ps(ctx context.Context, project string) ([]compose.
func (cs *aciComposeService) List(ctx context.Context, project string) ([]compose.Stack, error) { func (cs *aciComposeService) List(ctx context.Context, project string) ([]compose.Stack, error) {
containerGroups, err := getACIContainerGroups(ctx, cs.ctx.SubscriptionID, cs.ctx.ResourceGroup) containerGroups, err := getACIContainerGroups(ctx, cs.ctx.SubscriptionID, cs.ctx.ResourceGroup)
if err != nil { if err != nil {
return []compose.Stack{}, err return nil, err
} }
stacks := []compose.Stack{} stacks := []compose.Stack{}

20
aci/containers.go
View File

@ -43,12 +43,12 @@ type aciContainerService struct {
func (cs *aciContainerService) List(ctx context.Context, all bool) ([]containers.Container, error) { func (cs *aciContainerService) List(ctx context.Context, all bool) ([]containers.Container, error) {
containerGroups, err := getACIContainerGroups(ctx, cs.ctx.SubscriptionID, cs.ctx.ResourceGroup) containerGroups, err := getACIContainerGroups(ctx, cs.ctx.SubscriptionID, cs.ctx.ResourceGroup)
if err != nil { if err != nil {
return []containers.Container{}, err return nil, err
} }
var res []containers.Container var res []containers.Container
for _, group := range containerGroups { for _, group := range containerGroups {
if group.Containers == nil || len(*group.Containers) < 1 { if group.Containers == nil || len(*group.Containers) == 0 {
return []containers.Container{}, fmt.Errorf("no containers found in ACI container group %s", *group.Name) return nil, fmt.Errorf("no containers found in ACI container group %s", *group.Name)
} }
for _, container := range *group.Containers { for _, container := range *group.Containers {
@ -64,7 +64,7 @@ func (cs *aciContainerService) List(ctx context.Context, all bool) ([]containers
func (cs *aciContainerService) Run(ctx context.Context, r containers.ContainerConfig) error { func (cs *aciContainerService) Run(ctx context.Context, r containers.ContainerConfig) error {
if strings.Contains(r.ID, composeContainerSeparator) { if strings.Contains(r.ID, composeContainerSeparator) {
return errors.New(fmt.Sprintf("invalid container name. ACI container name cannot include %q", composeContainerSeparator)) return fmt.Errorf("invalid container name. ACI container name cannot include %q", composeContainerSeparator)
} }
project, err := convert.ContainerToComposeProject(r) project, err := convert.ContainerToComposeProject(r)
@ -72,7 +72,7 @@ func (cs *aciContainerService) Run(ctx context.Context, r containers.ContainerCo
return err return err
} }
logrus.Debugf("Running container %q with name %q\n", r.Image, r.ID) logrus.Debugf("Running container %q with name %q", r.Image, r.ID)
groupDefinition, err := convert.ToContainerGroup(ctx, cs.ctx, project) groupDefinition, err := convert.ToContainerGroup(ctx, cs.ctx, project)
if err != nil { if err != nil {
return err return err
@ -86,7 +86,7 @@ func (cs *aciContainerService) Start(ctx context.Context, containerID string) er
groupName, containerName := getGroupAndContainerName(containerID) groupName, containerName := getGroupAndContainerName(containerID)
if groupName != containerID { if groupName != containerID {
msg := "cannot start specified service %q from compose application %q, you can update and restart the entire compose app with docker compose up --project-name %s" msg := "cannot start specified service %q from compose application %q, you can update and restart the entire compose app with docker compose up --project-name %s"
return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) return fmt.Errorf(msg, containerName, groupName, groupName)
} }
containerGroupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID) containerGroupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID)
@ -110,12 +110,12 @@ func (cs *aciContainerService) Start(ctx context.Context, containerID string) er
func (cs *aciContainerService) Stop(ctx context.Context, containerID string, timeout *uint32) error { func (cs *aciContainerService) Stop(ctx context.Context, containerID string, timeout *uint32) error {
if timeout != nil && *timeout != uint32(0) { if timeout != nil && *timeout != uint32(0) {
return errors.Errorf("ACI integration does not support setting a timeout to stop a container before killing it.") return fmt.Errorf("the ACI integration does not support setting a timeout to stop a container before killing it")
} }
groupName, containerName := getGroupAndContainerName(containerID) groupName, containerName := getGroupAndContainerName(containerID)
if groupName != containerID { if groupName != containerID {
msg := "cannot stop service %q from compose application %q, you can stop the entire compose app with docker stop %s" msg := "cannot stop service %q from compose application %q, you can stop the entire compose app with docker stop %s"
return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) return fmt.Errorf(msg, containerName, groupName, groupName)
} }
return stopACIContainerGroup(ctx, cs.ctx, groupName) return stopACIContainerGroup(ctx, cs.ctx, groupName)
} }
@ -124,7 +124,7 @@ func (cs *aciContainerService) Kill(ctx context.Context, containerID string, _ s
groupName, containerName := getGroupAndContainerName(containerID) groupName, containerName := getGroupAndContainerName(containerID)
if groupName != containerID { if groupName != containerID {
msg := "cannot kill service %q from compose application %q, you can kill the entire compose app with docker kill %s" msg := "cannot kill service %q from compose application %q, you can kill the entire compose app with docker kill %s"
return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) return fmt.Errorf(msg, containerName, groupName, groupName)
} }
return stopACIContainerGroup(ctx, cs.ctx, groupName) // As ACI doesn't have a kill command, we are using the stop implementation instead return stopACIContainerGroup(ctx, cs.ctx, groupName) // As ACI doesn't have a kill command, we are using the stop implementation instead
} }
@ -187,7 +187,7 @@ func (cs *aciContainerService) Delete(ctx context.Context, containerID string, r
groupName, containerName := getGroupAndContainerName(containerID) groupName, containerName := getGroupAndContainerName(containerID)
if groupName != containerID { if groupName != containerID {
msg := "cannot delete service %q from compose application %q, you can delete the entire compose app with docker compose down --project-name %s" msg := "cannot delete service %q from compose application %q, you can delete the entire compose app with docker compose down --project-name %s"
return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) return fmt.Errorf(msg, containerName, groupName, groupName)
} }
if !request.Force { if !request.Force {

34
aci/volumes.go
View File

@ -19,22 +19,19 @@ package aci
import ( import (
"context" "context"
"fmt" "fmt"
"net/http"
"strings" "strings"
"github.com/docker/compose-cli/progress"
"github.com/Azure/go-autorest/autorest/to"
"github.com/docker/compose-cli/aci/login"
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/errdefs"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage"
"github.com/Azure/go-autorest/autorest/to"
"github.com/docker/compose-cli/aci/login"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/compose-cli/errdefs"
"github.com/docker/compose-cli/progress"
) )
type aciVolumeService struct { type aciVolumeService struct {
@ -75,7 +72,7 @@ func (cs *aciVolumeService) List(ctx context.Context) ([]volumes.Volume, error)
return fileShares, nil return fileShares, nil
} }
//VolumeCreateOptions options to create a new ACI volume // VolumeCreateOptions options to create a new ACI volume
type VolumeCreateOptions struct { type VolumeCreateOptions struct {
Account string Account string
Fileshare string Fileshare string
@ -84,7 +81,7 @@ type VolumeCreateOptions struct {
func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (volumes.Volume, error) { func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (volumes.Volume, error) {
opts, ok := options.(VolumeCreateOptions) opts, ok := options.(VolumeCreateOptions)
if !ok { if !ok {
return volumes.Volume{}, errors.New("Could not read azure VolumeCreateOptions struct from generic parameter") return volumes.Volume{}, errors.New("could not read Azure VolumeCreateOptions struct from generic parameter")
} }
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(event(opts.Account, progress.Working, "Validating")) w.Event(event(opts.Account, progress.Working, "Validating"))
@ -96,7 +93,7 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
if err == nil { if err == nil {
w.Event(event(opts.Account, progress.Done, "Use existing")) w.Event(event(opts.Account, progress.Done, "Use existing"))
} else { } else {
if account.StatusCode != 404 { if account.StatusCode != http.StatusNotFound {
return volumes.Volume{}, err return volumes.Volume{}, err
} }
result, err := accountClient.CheckNameAvailability(ctx, storage.AccountCheckNameAvailabilityParameters{ result, err := accountClient.CheckNameAvailability(ctx, storage.AccountCheckNameAvailabilityParameters{
@ -118,8 +115,7 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
w.Event(errorEvent(opts.Account)) w.Event(errorEvent(opts.Account))
return volumes.Volume{}, err return volumes.Volume{}, err
} }
err = future.WaitForCompletionRef(ctx, accountClient.Client) if err := future.WaitForCompletionRef(ctx, accountClient.Client); err != nil {
if err != nil {
w.Event(errorEvent(opts.Account)) w.Event(errorEvent(opts.Account))
return volumes.Volume{}, err return volumes.Volume{}, err
} }
@ -141,7 +137,7 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
w.Event(errorEvent(opts.Fileshare)) w.Event(errorEvent(opts.Fileshare))
return volumes.Volume{}, errors.Wrapf(errdefs.ErrAlreadyExists, "Azure fileshare %q already exists", opts.Fileshare) return volumes.Volume{}, errors.Wrapf(errdefs.ErrAlreadyExists, "Azure fileshare %q already exists", opts.Fileshare)
} }
if fileShare.StatusCode != 404 { if fileShare.StatusCode != http.StatusNotFound {
w.Event(errorEvent(opts.Fileshare)) w.Event(errorEvent(opts.Fileshare))
return volumes.Volume{}, err return volumes.Volume{}, err
} }
@ -199,7 +195,7 @@ func (cs *aciVolumeService) Delete(ctx context.Context, id string, options inter
if err == nil { if err == nil {
if _, ok := account.Tags[dockerVolumeTag]; ok { if _, ok := account.Tags[dockerVolumeTag]; ok {
result, err := storageAccountsClient.Delete(ctx, cs.aciContext.ResourceGroup, storageAccount) result, err := storageAccountsClient.Delete(ctx, cs.aciContext.ResourceGroup, storageAccount)
if result.StatusCode == 204 { if result.StatusCode == http.StatusNoContent {
return errors.Wrapf(errdefs.ErrNotFound, "storage account %s does not exist", storageAccount) return errors.Wrapf(errdefs.ErrNotFound, "storage account %s does not exist", storageAccount)
} }
return err return err
@ -209,7 +205,7 @@ func (cs *aciVolumeService) Delete(ctx context.Context, id string, options inter
result, err := fileShareClient.Delete(ctx, cs.aciContext.ResourceGroup, storageAccount, fileshare) result, err := fileShareClient.Delete(ctx, cs.aciContext.ResourceGroup, storageAccount, fileshare)
if result.StatusCode == 204 { if result.StatusCode == 204 {
return errors.Wrapf(errdefs.ErrNotFound, "fileshare %s does not exist", fileshare) return errors.Wrapf(errdefs.ErrNotFound, "fileshare %q", fileshare)
} }
return err return err
} }

3
api/client/client.go
View File

@ -19,11 +19,10 @@ package client
import ( import (
"context" "context"
"github.com/docker/compose-cli/api/volumes"
"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/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/backend" "github.com/docker/compose-cli/backend"
apicontext "github.com/docker/compose-cli/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/compose-cli/context/cloud" "github.com/docker/compose-cli/context/cloud"

3
cli/cmd/volume/acivolume.go
View File

@ -58,8 +58,7 @@ func createVolume() *cobra.Command {
return err return err
} }
err = progress.Run(ctx, func(ctx context.Context) error { err = progress.Run(ctx, func(ctx context.Context) error {
_, err := c.VolumeService().Create(ctx, aciOpts) if _, err := c.VolumeService().Create(ctx, aciOpts); err != nil {
if err != nil {
return err return err
} }
return nil return nil

8
cli/cmd/volume/acilist.go → cli/cmd/volume/list.go
View File

@ -32,7 +32,7 @@ import (
func listVolume() *cobra.Command { func listVolume() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "ls", Use: "ls",
Short: "list Azure file shares usable as ACI volumes.", Short: "list available volumes in context.",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
c, err := client.New(cmd.Context()) c, err := client.New(cmd.Context())
@ -53,14 +53,14 @@ func listVolume() *cobra.Command {
func printList(out io.Writer, volumes []volumes.Volume) { func printList(out io.Writer, volumes []volumes.Volume) {
printSection(out, func(w io.Writer) { printSection(out, func(w io.Writer) {
for _, vol := range volumes { for _, vol := range volumes {
fmt.Fprintf(w, "%s\t%s\n", vol.ID, vol.Description) // nolint:errcheck _, _ = fmt.Fprintf(w, "%s\t%s\n", vol.ID, vol.Description)
} }
}, "ID", "DESCRIPTION") }, "ID", "DESCRIPTION")
} }
func printSection(out io.Writer, printer func(io.Writer), headers ...string) { func printSection(out io.Writer, printer func(io.Writer), headers ...string) {
w := tabwriter.NewWriter(out, 20, 1, 3, ' ', 0) w := tabwriter.NewWriter(out, 20, 1, 3, ' ', 0)
fmt.Fprintln(w, strings.Join(headers, "\t")) // nolint:errcheck _, _ = fmt.Fprintln(w, strings.Join(headers, "\t"))
printer(w) printer(w)
w.Flush() // nolint:errcheck _ = w.Flush()
} }

0
cli/cmd/volume/acilist_test.go → cli/cmd/volume/list_test.go
View File

17
cli/main.go
View File

@ -27,26 +27,16 @@ import (
"syscall" "syscall"
"time" "time"
volume "github.com/docker/compose-cli/cli/cmd/volume"
"github.com/docker/compose-cli/cli/cmd/compose" "github.com/docker/compose-cli/cli/cmd/compose"
"github.com/docker/compose-cli/cli/cmd/logout" "github.com/docker/compose-cli/cli/cmd/logout"
volume "github.com/docker/compose-cli/cli/cmd/volume"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
// Backend registrations // Backend registrations
_ "github.com/docker/compose-cli/aci" _ "github.com/docker/compose-cli/aci"
_ "github.com/docker/compose-cli/ecs"
_ "github.com/docker/compose-cli/ecs/local"
_ "github.com/docker/compose-cli/example"
_ "github.com/docker/compose-cli/local"
"github.com/docker/compose-cli/metrics"
"github.com/docker/compose-cli/cli/cmd" "github.com/docker/compose-cli/cli/cmd"
contextcmd "github.com/docker/compose-cli/cli/cmd/context" contextcmd "github.com/docker/compose-cli/cli/cmd/context"
"github.com/docker/compose-cli/cli/cmd/login" "github.com/docker/compose-cli/cli/cmd/login"
@ -56,6 +46,11 @@ import (
"github.com/docker/compose-cli/config" "github.com/docker/compose-cli/config"
apicontext "github.com/docker/compose-cli/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/context/store"
_ "github.com/docker/compose-cli/ecs"
_ "github.com/docker/compose-cli/ecs/local"
_ "github.com/docker/compose-cli/example"
_ "github.com/docker/compose-cli/local"
"github.com/docker/compose-cli/metrics"
) )
var ( var (

4
ecs/backend.go
View File

@ -19,14 +19,12 @@ package ecs
import ( import (
"context" "context"
"github.com/docker/compose-cli/api/volumes"
"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"
"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/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/backend" "github.com/docker/compose-cli/backend"
apicontext "github.com/docker/compose-cli/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/compose-cli/context/cloud" "github.com/docker/compose-cli/context/cloud"

7
ecs/local/backend.go
View File

@ -19,17 +19,14 @@ package local
import ( import (
"context" "context"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/docker/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/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/backend" "github.com/docker/compose-cli/backend"
"github.com/docker/compose-cli/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/docker/client"
) )
const backendType = store.EcsLocalSimulationContextType const backendType = store.EcsLocalSimulationContextType