From 4642bfa1728888575cccab854804a3592391059b Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Tue, 28 Apr 2020 11:05:00 +0200
Subject: [PATCH] Fix linter warnings

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 ecs/pkg/amazon/cloudformation.go | 2 +-
 ecs/pkg/amazon/down_test.go      | 4 ++--
 ecs/pkg/amazon/sdk.go            | 4 ++--
 ecs/pkg/amazon/up.go             | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ecs/pkg/amazon/cloudformation.go b/ecs/pkg/amazon/cloudformation.go
index 5f91d76e7..22b0c1d79 100644
--- a/ecs/pkg/amazon/cloudformation.go
+++ b/ecs/pkg/amazon/cloudformation.go
@@ -117,7 +117,7 @@ func (c client) GetEcsTaskExecutionRole(spec types.ServiceConfig) (string, error
 
 type convertAPI interface {
 	GetDefaultVPC() (string, error)
-	GetSubNets(vpcId string) ([]string, error)
+	GetSubNets(vpcID string) ([]string, error)
 	ListRolesForPolicy(policy string) ([]string, error)
 	GetRoleArn(name string) (string, error)
 }
diff --git a/ecs/pkg/amazon/down_test.go b/ecs/pkg/amazon/down_test.go
index 7e10c9416..c0ec4d0ed 100644
--- a/ecs/pkg/amazon/down_test.go
+++ b/ecs/pkg/amazon/down_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 )
 
-func Test_down_dont_delete_cluster(t *testing.T) {
+func TestDownDontDeleteCluster(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	m := mock.NewMockAPI(ctrl)
@@ -23,7 +23,7 @@ func Test_down_dont_delete_cluster(t *testing.T) {
 	c.ComposeDown("test_project", false)
 }
 
-func Test_down_delete_cluster(t *testing.T) {
+func TestDownDeleteCluster(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	m := mock.NewMockAPI(ctrl)
diff --git a/ecs/pkg/amazon/sdk.go b/ecs/pkg/amazon/sdk.go
index 75e3cc22e..86b65e348 100644
--- a/ecs/pkg/amazon/sdk.go
+++ b/ecs/pkg/amazon/sdk.go
@@ -93,14 +93,14 @@ func (s sdk) GetDefaultVPC() (string, error) {
 	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")
 	subnets, err := s.EC2.DescribeSubnets(&ec2.DescribeSubnetsInput{
 		DryRun: nil,
 		Filters: []*ec2.Filter{
 			{
 				Name:   aws.String("vpc-id"),
-				Values: []*string{aws.String(vpc)},
+				Values: []*string{aws.String(vpcID)},
 			},
 			{
 				Name:   aws.String("default-for-az"),
diff --git a/ecs/pkg/amazon/up.go b/ecs/pkg/amazon/up.go
index 493c8cbaa..d89385bc4 100644
--- a/ecs/pkg/amazon/up.go
+++ b/ecs/pkg/amazon/up.go
@@ -16,6 +16,9 @@ func (c *client) ComposeUp(project *compose.Project) error {
 		c.api.CreateCluster(c.Cluster)
 	}
 	update, err := c.api.StackExists(project.Name)
+	if err != nil {
+		return err
+	}
 	if update {
 		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)
+	if err != nil {
+		return err
+	}
 
 	// TODO monitor progress
 	return nil