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

Fix linter warnings

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-04-28 11:05:00 +02:00
parent 30029fa701
commit 4642bfa172
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecs/pkg/amazon/cloudformation.go
View File

@ -117,7 +117,7 @@ func (c client) GetEcsTaskExecutionRole(spec types.ServiceConfig) (string, error
type convertAPI interface { type convertAPI interface {
GetDefaultVPC() (string, error) GetDefaultVPC() (string, error)
GetSubNets(vpcId string) ([]string, error) GetSubNets(vpcID string) ([]string, error)
ListRolesForPolicy(policy string) ([]string, error) ListRolesForPolicy(policy string) ([]string, error)
GetRoleArn(name string) (string, error) GetRoleArn(name string) (string, error)
} }

4
ecs/pkg/amazon/down_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
) )
func Test_down_dont_delete_cluster(t *testing.T) { func TestDownDontDeleteCluster(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
m := mock.NewMockAPI(ctrl) m := mock.NewMockAPI(ctrl)
@ -23,7 +23,7 @@ func Test_down_dont_delete_cluster(t *testing.T) {
c.ComposeDown("test_project", false) c.ComposeDown("test_project", false)
} }
func Test_down_delete_cluster(t *testing.T) { func TestDownDeleteCluster(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
m := mock.NewMockAPI(ctrl) m := mock.NewMockAPI(ctrl)

4
ecs/pkg/amazon/sdk.go
View File

@ -93,14 +93,14 @@ func (s sdk) GetDefaultVPC() (string, error) {
return *vpcs.Vpcs[0].VpcId, nil return *vpcs.Vpcs[0].VpcId, nil
} }
func (s sdk) GetSubNets(vpc string) ([]string, error) { func (s sdk) GetSubNets(vpcID string) ([]string, error) {
logrus.Debug("Retrieve SubNets") logrus.Debug("Retrieve SubNets")
subnets, err := s.EC2.DescribeSubnets(&ec2.DescribeSubnetsInput{ subnets, err := s.EC2.DescribeSubnets(&ec2.DescribeSubnetsInput{
DryRun: nil, DryRun: nil,
Filters: []*ec2.Filter{ Filters: []*ec2.Filter{
{ {
Name: aws.String("vpc-id"), Name: aws.String("vpc-id"),
Values: []*string{aws.String(vpc)}, Values: []*string{aws.String(vpcID)},
}, },
{ {
Name: aws.String("default-for-az"), Name: aws.String("default-for-az"),

6
ecs/pkg/amazon/up.go
View File

@ -16,6 +16,9 @@ func (c *client) ComposeUp(project *compose.Project) error {
c.api.CreateCluster(c.Cluster) c.api.CreateCluster(c.Cluster)
} }
update, err := c.api.StackExists(project.Name) update, err := c.api.StackExists(project.Name)
if err != nil {
return err
}
if update { if update {
return fmt.Errorf("we do not (yet) support updating an existing CloudFormation stack") return fmt.Errorf("we do not (yet) support updating an existing CloudFormation stack")
} }
@ -31,6 +34,9 @@ func (c *client) ComposeUp(project *compose.Project) error {
} }
err = c.api.DescribeStackEvents(project.Name) err = c.api.DescribeStackEvents(project.Name)
if err != nil {
return err
}
// TODO monitor progress // TODO monitor progress
return nil return nil