From 3d8d982d4a547b7413c1833f551467b66cdd80f8 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 27 Apr 2020 09:46:13 +0200 Subject: [PATCH] format Signed-off-by: Nicolas De Loof --- ecs/pkg/amazon/client.go | 2 +- ecs/pkg/amazon/cloudformation.go | 3 ++- ecs/pkg/amazon/down_test.go | 2 +- ecs/pkg/amazon/sdk.go | 28 ++++++++++++++-------------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ecs/pkg/amazon/client.go b/ecs/pkg/amazon/client.go index 18ffc985..2f6fd433 100644 --- a/ecs/pkg/amazon/client.go +++ b/ecs/pkg/amazon/client.go @@ -30,7 +30,7 @@ func NewClient(profile string, cluster string, region string) (compose.API, erro type client struct { Cluster string Region string - api API + api API } var _ compose.API = &client{} diff --git a/ecs/pkg/amazon/cloudformation.go b/ecs/pkg/amazon/cloudformation.go index 7458e786..91c8bca7 100644 --- a/ecs/pkg/amazon/cloudformation.go +++ b/ecs/pkg/amazon/cloudformation.go @@ -82,6 +82,7 @@ func (c client) Convert(project *compose.Project, loadBalancerArn *string) (*clo } const ECSTaskExecutionPolicy = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy" + var defaultTaskExecutionRole string // GetEcsTaskExecutionRole retrieve the role ARN to apply for task execution @@ -111,4 +112,4 @@ func (c client) GetEcsTaskExecutionRole(spec types.ServiceConfig) (string, error } defaultTaskExecutionRole = arn return arn, nil -} \ No newline at end of file +} diff --git a/ecs/pkg/amazon/down_test.go b/ecs/pkg/amazon/down_test.go index 3245ecef..3738e78d 100644 --- a/ecs/pkg/amazon/down_test.go +++ b/ecs/pkg/amazon/down_test.go @@ -42,4 +42,4 @@ func Test_down_delete_cluster(t *testing.T) { c.ComposeDown(&compose.Project{ Name: "test_project", }, false, true) -} \ No newline at end of file +} diff --git a/ecs/pkg/amazon/sdk.go b/ecs/pkg/amazon/sdk.go index 228507c1..fdea7c6f 100644 --- a/ecs/pkg/amazon/sdk.go +++ b/ecs/pkg/amazon/sdk.go @@ -21,23 +21,23 @@ import ( ) type sdk struct { - sess *session.Session - ECS ecsiface.ECSAPI - EC2 ec2iface.EC2API - ELB elbv2iface.ELBV2API - CW cloudwatchlogsiface.CloudWatchLogsAPI - IAM iamiface.IAMAPI - CF cloudformationiface.CloudFormationAPI + sess *session.Session + ECS ecsiface.ECSAPI + EC2 ec2iface.EC2API + ELB elbv2iface.ELBV2API + CW cloudwatchlogsiface.CloudWatchLogsAPI + IAM iamiface.IAMAPI + CF cloudformationiface.CloudFormationAPI } func NewAPI(sess *session.Session) API { return sdk{ - ECS: ecs.New(sess), - EC2: ec2.New(sess), - ELB: elbv2.New(sess), - CW: cloudwatchlogs.New(sess), - IAM: iam.New(sess), - CF: cloudformation.New(sess), + ECS: ecs.New(sess), + EC2: ec2.New(sess), + ELB: elbv2.New(sess), + CW: cloudwatchlogs.New(sess), + IAM: iam.New(sess), + CF: cloudformation.New(sess), } } @@ -99,7 +99,7 @@ func (s sdk) GetSubNets(vpc string) ([]string, error) { Filters: []*ec2.Filter{ { Name: aws.String("vpc-id"), - Values: []*string{ aws.String(vpc)}, + Values: []*string{aws.String(vpc)}, }, { Name: aws.String("default-for-az"),