Centralize session creation

Rather than creating a session in each service, centralize within the
root command pass session around as needed. This allows us to DRY up
region logic in anticipation of Fargate being available outside of
us-east-1 and reduces the amount of boilerplate per service.

* Don't alias packages unnecessarily
* Pass region to CreateTaskDefinition explicitly rather than plucking it
  from the session

acm/main.go

@@ -3,20 +3,13 @@ package acm
 import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/acm"
-	"github.com/jpignata/fargate/console"
 )
 
 type ACM struct {
 	svc *acm.ACM
 }
 
-func New() ACM {
-	sess, err := session.NewSession()
-
-	if err != nil {
-		console.ErrorExit(err, "Could not create ACM session")
-	}
-
+func New(sess *session.Session) ACM {
 	return ACM{
 		svc: acm.New(sess),
 	}

cloudwatchlogs/main.go

@@ -3,20 +3,13 @@ package cloudwatchlogs
 import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
-	"github.com/jpignata/fargate/console"
 )
 
 type CloudWatchLogs struct {
 	svc *cloudwatchlogs.CloudWatchLogs
 }
 
-func New() CloudWatchLogs {
-	sess, err := session.NewSession()
-
-	if err != nil {
-		console.ErrorExit(err, "Error creating CloudWatch Logs session")
-	}
-
+func New(sess *session.Session) CloudWatchLogs {
 	return CloudWatchLogs{
 		svc: cloudwatchlogs.New(sess),
 	}

cmd/certificate_destroy.go

@@ -22,6 +22,6 @@ func init() {
 func destroyCertificate(domainName string) {
 	console.Info("[%s] Destroying certificate", domainName)
 
-	acm := ACM.New()
+	acm := ACM.New(sess)
 	acm.DeleteCertificate(domainName)
 }

cmd/certificate_import.go

@@ -58,7 +58,7 @@ func validateCertificateAndKeyFiles() {
 func importCertificate() {
 	console.Info("Importing certificate")
 
-	acm := ACM.New()
+	acm := ACM.New(sess)
 
 	certificateData, err := ioutil.ReadFile(certificateFile)
 

cmd/certificate_info.go

@@ -26,7 +26,7 @@ func init() {
 }
 
 func infoCertificate(domainName string) {
-	acm := ACM.New()
+	acm := ACM.New(sess)
 	certificate := acm.DescribeCertificate(domainName)
 
 	console.KeyValue("Domain Name", "%s\n", certificate.DomainName)

cmd/certificate_list.go

@@ -36,7 +36,7 @@ func init() {
 }
 
 func listCertificates() {
-	acm := ACM.New()
+	acm := ACM.New(sess)
 	certificates := acm.ListCertificates()
 
 	if len(certificates) > 0 {

cmd/certificate_request.go

@@ -38,7 +38,7 @@ func init() {
 func createCertificate(domainName string) {
 	console.Info("Requesting certificate [%s]", domainName)
 
-	acm := ACM.New()
+	acm := ACM.New(sess)
 	acm.RequestCertificate(domainName, aliases)
 
 	console.Info("[%s] You must validate ownership of the domain name for the certificate to be issued", domainName)

cmd/certificate_validate.go

@@ -36,8 +36,8 @@ func init() {
 func validateCertificate(domainName string) {
 	console.Info("Validating certificate [%s]", domainName)
 
-	route53 := Route53.New()
-	acm := ACM.New()
+	route53 := Route53.New(sess)
+	acm := ACM.New(sess)
 
 	hostedZones := route53.ListHostedZones()
 	certificate := acm.DescribeCertificate(domainName)

cmd/lb_create.go

@@ -51,7 +51,7 @@ func normalizeFields() {
 }
 
 func getCertificateArns() {
-	acm := ACM.New()
+	acm := ACM.New(sess)
 
 	for _, certificateDomainName := range certificateDomainNames {
 		certificate := acm.DescribeCertificate(certificateDomainName)
@@ -115,8 +115,8 @@ func inferType() {
 func createLb(lbName string) {
 	console.Info("Creating load balancer [%s]", lbName)
 
-	elbv2 := ELBV2.New()
-	ec2 := EC2.New()
+	elbv2 := ELBV2.New(sess)
+	ec2 := EC2.New(sess)
 
 	subnetIds := ec2.GetDefaultVpcSubnetIds()
 	vpcId := ec2.GetDefaultVpcId()

cmd/lb_destroy.go

@@ -22,7 +22,7 @@ func init() {
 func destroyLoadBalancer(domainName string) {
 	console.Info("[%s] Destroying load balancer", domainName)
 
-	elbv2 := ELBV2.New()
+	elbv2 := ELBV2.New(sess)
 	elbv2.DeleteLoadBalancer(domainName)
 	elbv2.DeleteTargetGroup(domainName + "-" + "default")
 }

cmd/lb_list.go

@@ -36,7 +36,7 @@ func init() {
 }
 
 func listLoadBalancers() {
-	elbv2 := ELBV2.New()
+	elbv2 := ELBV2.New(sess)
 	loadBalancers := elbv2.DescribeLoadBalancers([]string{})
 
 	if len(loadBalancers) > 0 {

cmd/root.go

@@ -1,34 +1,66 @@
 package cmd
 
 import (
+	"os"
 	"strconv"
 	"strings"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/jpignata/fargate/console"
 	"github.com/spf13/cobra"
 )
 
-const version = "0.0.1"
+const (
+	version       = "0.0.1"
+	defaultRegion = "us-east-1"
+)
 
 type Port struct {
 	Port     int64
 	Protocol string
 }
 
-var verbose bool
+var (
+	region  string
+	verbose bool
+	sess    *session.Session
+)
 
 var rootCmd = &cobra.Command{
 	Use: "fargate",
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		envAwsRegion := os.Getenv("AWS_REGION")
+		envAwsDefaultRegion := os.Getenv("AWS_DEFAULT_REGION")
+
 		if verbose {
 			verbose = true
 			console.Verbose = true
 		}
+
+		if region == "" {
+			if envAwsDefaultRegion != "" {
+				region = envAwsDefaultRegion
+			} else if envAwsRegion != "" {
+				region = envAwsDefaultRegion
+			} else {
+				region = defaultRegion
+			}
+		}
+
+		sess = session.Must(
+			session.NewSession(
+				&aws.Config{
+					Region: aws.String(region),
+				},
+			),
+		)
 	},
 }
 
 func init() {
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Verbose output")
+	rootCmd.PersistentFlags().StringVarP(&region, "region", "r", "", "AWS Region (defaults to us-east-1)")
 }
 
 func Execute() {

cmd/service_create.go

@@ -70,7 +70,7 @@ func init() {
 }
 
 func validateLb() {
-	elbv2 := ELBV2.New()
+	elbv2 := ELBV2.New(sess)
 	loadBalancer := elbv2.DescribeLoadBalancer(lbName)
 
 	if loadBalancer.Type == "network" {
@@ -166,12 +166,12 @@ func extractEnvVars() {
 func createService(serviceName string) {
 	console.Info("Creating %s", serviceName)
 
-	cwl := CWL.New()
-	ec2 := EC2.New()
-	ecr := ECR.New()
-	ecs := ECS.New()
-	elbv2 := ELBV2.New()
-	iam := IAM.New()
+	cwl := CWL.New(sess)
+	ec2 := EC2.New(sess)
+	ecr := ECR.New(sess)
+	ecs := ECS.New(sess)
+	elbv2 := ELBV2.New(sess)
+	iam := IAM.New(sess)
 
 	var (
 		targetGroupArn string
@@ -240,6 +240,7 @@ func createService(serviceName string) {
 			Name:             serviceName,
 			Port:             port.Port,
 			LogGroupName:     logGroupName,
+			LogRegion:        region,
 		},
 	)
 	ecs.CreateService(

cmd/service_deploy.go

@@ -26,13 +26,13 @@ func init() {
 func deployService(serviceName string) {
 	console.Info("Deploying %s", serviceName)
 
-	ecs := ECS.New()
+	ecs := ECS.New(sess)
 	service := ecs.DescribeService(serviceName)
 
 	if image == "" {
 		var tag string
 
-		ecr := ECR.New()
+		ecr := ECR.New(sess)
 		repositoryUri := ecr.GetRepositoryUri(serviceName)
 		repository := docker.Repository{
 			Uri: repositoryUri,

cmd/service_destroy.go

@@ -22,6 +22,6 @@ func init() {
 func destroyService(serviceName string) {
 	console.Info("[%s] Destroying service", serviceName)
 
-	ecs := ECS.New()
+	ecs := ECS.New(sess)
 	ecs.DestroyService(serviceName)
 }

cmd/service_info.go

@@ -28,8 +28,8 @@ func init() {
 func infoService(serviceName string) {
 	var eniIds []string
 
-	ecs := ECS.New()
-	ec2 := EC2.New()
+	ecs := ECS.New(sess)
+	ec2 := EC2.New(sess)
 	service := ecs.DescribeService(serviceName)
 	tasks := ecs.DescribeTasksForService(serviceName)
 

cmd/service_list.go

@@ -23,7 +23,7 @@ func init() {
 }
 
 func listServices() {
-	ecs := ECS.New()
+	ecs := ECS.New(sess)
 	services := ecs.ListServices()
 
 	if len(services) > 0 {

cmd/service_ps.go

@@ -28,8 +28,8 @@ func init() {
 func psService(serviceName string) {
 	var eniIds []string
 
-	ecs := ECS.New()
-	ec2 := EC2.New()
+	ecs := ECS.New(sess)
+	ec2 := EC2.New(sess)
 	tasks := ecs.DescribeTasksForService(serviceName)
 
 	for _, task := range tasks {

cmd/service_scale.go

@@ -46,7 +46,7 @@ func validateScale(scale string) {
 func setDesiredCount(serviceName, scale string) {
 	if scale[0] == '+' || scale[0] == '-' {
 		if s, err := strconv.ParseInt(scale[1:len(scale)], 10, 64); err == nil {
-			ecs := ECS.New()
+			ecs := ECS.New(sess)
 			desiredCount = ecs.GetDesiredCount(serviceName)
 
 			if scale[0] == '+' {
@@ -74,6 +74,6 @@ func setDesiredCount(serviceName, scale string) {
 func scaleService(serviceName string) {
 	console.Info("Scaling service %s to %d", serviceName, desiredCount)
 
-	ecs := ECS.New()
+	ecs := ECS.New(sess)
 	ecs.SetDesiredCount(serviceName, desiredCount)
 }

ec2/main.go

@@ -1,25 +1,15 @@
 package ec2
 
 import (
-	"os"
-
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/fatih/color"
 )
 
 type EC2 struct {
 	svc *ec2.EC2
 }
 
-func New() EC2 {
-	sess, err := session.NewSession()
-
-	if err != nil {
-		color.Red("Error creating EC2 session: ", err)
-		os.Exit(1)
-	}
-
+func New(sess *session.Session) EC2 {
 	return EC2{
 		svc: ec2.New(sess),
 	}

ecr/main.go

@@ -1,26 +1,16 @@
 package ecr
 
 import (
-	"os"
-
 	"github.com/aws/aws-sdk-go/aws/session"
-	awsecr "github.com/aws/aws-sdk-go/service/ecr"
-	"github.com/fatih/color"
+	"github.com/aws/aws-sdk-go/service/ecr"
 )
 
 type ECR struct {
-	svc *awsecr.ECR
+	svc *ecr.ECR
 }
 
-func New() ECR {
-	sess, err := session.NewSession()
-
-	if err != nil {
-		color.Red("Error creating ECR session: ", err)
-		os.Exit(1)
-	}
-
+func New(sess *session.Session) ECR {
 	return ECR{
-		svc: awsecr.New(sess),
+		svc: ecr.New(sess),
 	}
 }