Support Task Placement in CreateService

SoManyHs · SoManyHs · commit 13768d7ada7f · 2018-08-21T12:54:34.000-07:00
diff --git a/ecs-cli/modules/cli/compose/entity/service/service.go b/ecs-cli/modules/cli/compose/entity/service/service.go
@@ -364,8 +364,17 @@ func (s *Service) EntityType() types.Type {
 func (s *Service) buildCreateServiceInput(serviceName, taskDefName string) (*ecs.CreateServiceInput, error) {
 	launchType := s.Context().CommandConfig.LaunchType
 	cluster := s.Context().CommandConfig.Cluster
+	ecsParams := s.ecsContext.ECSParams
 
-	networkConfig, err := composeutils.ConvertToECSNetworkConfiguration(s.ecsContext.ECSParams)
+	networkConfig, err := composeutils.ConvertToECSNetworkConfiguration(ecsParams)
+	if err != nil {
+		return nil, err
+	}
+	placementConstraints, err := composeutils.ConvertToECSPlacementConstraints(ecsParams)
+	if err != nil {
+		return nil, err
+	}
+	placementStrategy, err := composeutils.ConvertToECSPlacementStrategy(ecsParams)
 	if err != nil {
 		return nil, err
 	}
@@ -396,6 +405,14 @@ func (s *Service) buildCreateServiceInput(serviceName, taskDefName string) (*ecs
 		createServiceInput.NetworkConfiguration = networkConfig
 	}
 
+	if placementConstraints != nil {
+		createServiceInput.PlacementConstraints = placementConstraints
+	}
+
+	if placementStrategy != nil {
+		createServiceInput.PlacementStrategy = placementStrategy
+	}
+
 	if launchType != "" {
 		createServiceInput.LaunchType = aws.String(launchType)
 	}
diff --git a/ecs-cli/modules/cli/compose/entity/service/service_test.go b/ecs-cli/modules/cli/compose/entity/service/service_test.go
@@ -205,6 +205,69 @@ func TestCreateEC2Explicitly(t *testing.T) {
 	)
 }
 
+func TestCreateWithTaskPlacement(t *testing.T) {
+	flagSet := flag.NewFlagSet("ecs-cli-up", 0)
+
+	createServiceTest(
+		t,
+		flagSet,
+		&config.CommandConfig{},
+		ecsParamsWithTaskPlacement(),
+		func(input *ecs.CreateServiceInput) {
+			placementConstraints := input.PlacementConstraints
+			placementStrategy := input.PlacementStrategy
+			expectedConstraints := []*ecs.PlacementConstraint{
+				{
+					Type: aws.String("distinctInstance"),
+				}, {
+					Expression: aws.String("attribute:ecs.instance-type =~ t2.*"),
+					Type:       aws.String("memberOf"),
+				},
+			}
+			expectedStrategy := []*ecs.PlacementStrategy{
+				{
+					Type: aws.String("random"),
+				}, {
+					Field: aws.String("instanceId"),
+					Type:  aws.String("binpack"),
+				},
+			}
+
+			assert.Len(t, placementConstraints, 2)
+			assert.Equal(t, expectedConstraints, placementConstraints, "Expected Placement Constraints to match")
+			assert.Len(t, placementStrategy, 2)
+			assert.Equal(t, expectedStrategy, placementStrategy, "Expected Placement Strategy to match")
+		},
+	)
+}
+
+func ecsParamsWithTaskPlacement() *utils.ECSParams {
+	return &utils.ECSParams{
+		RunParams: utils.RunParams{
+			TaskPlacement: utils.TaskPlacement{
+				Constraints: []utils.Constraint{
+					utils.Constraint{
+						Type: ecs.PlacementConstraintTypeDistinctInstance,
+					},
+					utils.Constraint{
+						Expression: "attribute:ecs.instance-type =~ t2.*",
+						Type:       ecs.PlacementConstraintTypeMemberOf,
+					},
+				},
+				Strategies: []utils.Strategy{
+					utils.Strategy{
+						Type: ecs.PlacementStrategyTypeRandom,
+					},
+					utils.Strategy{
+						Field: "instanceId",
+						Type:  ecs.PlacementStrategyTypeBinpack,
+					},
+				},
+			},
+		},
+	}
+}
+
 // Specifies TargeGroupArn to test ALB
 func TestCreateWithALB(t *testing.T) {
 	targetGroupArn := "targetGroupArn"
