diff --git a/.gitignore b/.gitignore index 0a9dc51..5c70efd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ bin fargate dist +fargatecli vendor diff --git a/acm/certificate.go b/acm/certificate.go index 9ae4b0c..266aa0c 100644 --- a/acm/certificate.go +++ b/acm/certificate.go @@ -151,8 +151,11 @@ func (acm SDKClient) ImportCertificate(certificate, privateKey, certificateChain } resp, err := acm.client.ImportCertificate(input) + if err != nil { + return "", err + } - return aws.StringValue(resp.CertificateArn), err + return aws.StringValue(resp.CertificateArn), nil } // InflateCertificate uses a partially hydrated certificate to fetch the rest of its details and diff --git a/cmd/root.go b/cmd/root.go index d182a20..6a04057 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -17,7 +17,7 @@ import ( ) const ( - version = "0.3.0" + version = "0.3.2" defaultClusterName = "fargate" defaultRegion = "us-east-1" @@ -45,23 +45,6 @@ CPU (CPU Units) Memory (MiB) 4096 8192 through 30720 in 1GiB increments `) -var validRegions = []string{ - "ap-east-1", - "ap-northeast-1", - "ap-northeast-2", - "ap-south-1", - "ap-southeast-1", - "ap-southeast-2", - "ca-central-1", - "eu-central-1", - "eu-west-1", - "eu-west-2", - "us-east-1", - "us-east-2", - "us-west-1", - "us-west-2", -} - var ( clusterName string noColor bool @@ -124,17 +107,6 @@ CloudWatch Logs, and Amazon Route 53 into an easy-to-use CLI.`, } } - var foundRegion bool = false - for _, validRegion := range validRegions { - if region == validRegion { - foundRegion = true - break - } - } - if !foundRegion { - console.IssueExit("Invalid region: %s [valid regions: %s]", region, strings.Join(validRegions, ", ")) - } - config := &aws.Config{ Region: aws.String(region), } diff --git a/ecs/cluster.go b/ecs/cluster.go index dc2563d..d0e3215 100644 --- a/ecs/cluster.go +++ b/ecs/cluster.go @@ -11,6 +11,9 @@ func (ecs *ECS) CreateCluster() (string, error) { } resp, err := ecs.svc.CreateCluster(input) + if err != nil { + return "", err + } - return aws.StringValue(resp.Cluster.ClusterArn), err + return aws.StringValue(resp.Cluster.ClusterArn), nil } diff --git a/route53/hosted_zone.go b/route53/hosted_zone.go index 94ec340..794da49 100644 --- a/route53/hosted_zone.go +++ b/route53/hosted_zone.go @@ -79,7 +79,11 @@ func (route53 SDKClient) CreateResourceRecord(i CreateResourceRecordInput) (stri }, ) - return aws.StringValue(resp.ChangeInfo.Id), err + if err != nil { + return "", err + } + + return aws.StringValue(resp.ChangeInfo.Id), nil } // CreateAlias creates an alias record in an Amazon Route 53 hosted zone. @@ -106,7 +110,11 @@ func (route53 SDKClient) CreateAlias(i CreateAliasInput) (string, error) { }, ) - return aws.StringValue(resp.ChangeInfo.Id), err + if err != nil { + return "", err + } + + return aws.StringValue(resp.ChangeInfo.Id), nil } // ListHostedZones returns all Amazon Route 53 zones in the caller's account.