Use service role from flags.

cmd/empire/factories.go

@@ -133,6 +133,7 @@ func newCloudFormationScheduler(db *empire.DB, c *cli.Context) (scheduler.Schedu
 		InternalSubnetIDs:       c.StringSlice(FlagEC2SubnetsPrivate),
 		ExternalSubnetIDs:       c.StringSlice(FlagEC2SubnetsPublic),
 		HostedZone:              zone,
+		ServiceRole:             c.String(FlagECSServiceRole),
 		LogConfiguration:        logConfiguration,
 	}
 

scheduler/cloudformation/cloudformation.go

@@ -25,10 +25,15 @@ import (
 	"golang.org/x/net/context"
 )
 
+// The identifier of the ECS Service resource in CloudFormation.
 const ecsServiceType = "AWS::ECS::Service"
 
+// errNoStack can be returned when there's no CloudFormation stack for a given
+// app.
 var errNoStack = errors.New("no stack for app found")
 
+// cloudformationClient duck types the cloudformation.CloudFormation interface
+// that we use.
 type cloudformationClient interface {
 	CreateStack(*cloudformation.CreateStackInput) (*cloudformation.CreateStackOutput, error)
 	UpdateStack(*cloudformation.UpdateStackInput) (*cloudformation.UpdateStackOutput, error)
@@ -40,6 +45,7 @@ type cloudformationClient interface {
 	WaitUntilStackUpdateComplete(*cloudformation.DescribeStacksInput) error
 }
 
+// ecsClient duck types the ecs.ECS interface that we use.
 type ecsClient interface {
 	ListTasksPages(input *ecs.ListTasksInput, fn func(p *ecs.ListTasksOutput, lastPage bool) (shouldContinue bool)) error
 	DescribeTaskDefinition(*ecs.DescribeTaskDefinitionInput) (*ecs.DescribeTaskDefinitionOutput, error)
@@ -50,6 +56,7 @@ type ecsClient interface {
 	UpdateService(*ecs.UpdateServiceInput) (*ecs.UpdateServiceOutput, error)
 }
 
+// s3Client duck types the s3.S3 interface that we use.
 type s3Client interface {
 	PutObject(*s3.PutObjectInput) (*s3.PutObjectOutput, error)
 }

scheduler/cloudformation/template.go

@@ -17,7 +17,6 @@ import (
 )
 
 const (
-
 	// For HTTP/HTTPS/TCP services, we allocate an ELB and map it's instance port to
 	// the container port. This is the port that processes within the container
 	// should bind to. Tihs value is also exposed to the container through the PORT
@@ -52,6 +51,9 @@ type EmpireTemplate struct {
 	// The Subnet IDs to assign when creating external load balancers.
 	ExternalSubnetIDs []string
 
+	// The name of the ECS Service IAM role.
+	ServiceRole string
+
 	LogConfiguration *ecs.LogConfiguration
 }
 
@@ -77,12 +79,6 @@ func (t *EmpireTemplate) Build(app *scheduler.App) (interface{}, error) {
 	resources := map[string]interface{}{}
 	outputs := map[string]interface{}{}
 
-	serviceRole := "ServiceRole" // TODO: Build a service role.
-	parameters["ServiceRole"] = map[string]string{
-		"Type":    "String",
-		"Default": "ecsServiceRole",
-	}
-
 	for _, p := range app.Processes {
 		cd := t.ContainerDefinition(p)
 
@@ -217,9 +213,7 @@ func (t *EmpireTemplate) Build(app *scheduler.App) (interface{}, error) {
 			},
 		}
 		if len(loadBalancers) > 0 {
-			serviceProperties["Role"] = map[string]string{
-				"Ref": serviceRole,
-			}
+			serviceProperties["Role"] = t.ServiceRole
 		}
 		resources[service] = map[string]interface{}{
 			"Type": "AWS::ECS::Service",