Add converters for TaskPlacement fields

SoManyHs · SoManyHs · commit 309fbee7e451 · 2018-08-21T12:54:34.000-07:00
diff --git a/ecs-cli/modules/utils/compose/ecs_params_reader.go b/ecs-cli/modules/utils/compose/ecs_params_reader.go
@@ -293,3 +293,48 @@ func parseHealthCheckTime(field string) (*int64, error) {
 
 	return nil, nil
 }
+
+// ConvertToECSPlacementConstraint converts a list of Constraints specified in the
+// ecs-params into a format that is compatible with ECSClient calls.
+func ConvertToECSPlacementConstraints(ecsParams *ECSParams) ([]*ecs.PlacementConstraint, error) {
+	if ecsParams == nil {
+		return nil, nil
+	}
+
+	constraints := ecsParams.RunParams.TaskPlacement.Constraints
+
+	output := []*ecs.PlacementConstraint{}
+	for _, constraint := range constraints {
+		ecsConstraint := &ecs.PlacementConstraint{
+			Type: aws.String(constraint.Type),
+		}
+		if constraint.Expression != "" {
+			ecsConstraint.Expression = aws.String(constraint.Expression)
+		}
+		output = append(output, ecsConstraint)
+	}
+
+	return output, nil
+}
+
+// ConvertToECSPlacementStrategy converts a list of Strategies specified in the
+// ecs-params into a format that is compatible with ECSClient calls.
+func ConvertToECSPlacementStrategy(ecsParams *ECSParams) ([]*ecs.PlacementStrategy, error) {
+	if ecsParams == nil {
+		return nil, nil
+	}
+	strategies := ecsParams.RunParams.TaskPlacement.Strategies
+
+	output := []*ecs.PlacementStrategy{}
+	for _, strategy := range strategies {
+		ecsStrategy := &ecs.PlacementStrategy{
+			Type: aws.String(strategy.Type),
+		}
+		if strategy.Field != "" {
+			ecsStrategy.Field = aws.String(strategy.Field)
+		}
+		output = append(output, ecsStrategy)
+	}
+
+	return output, nil
+}
diff --git a/ecs-cli/modules/utils/compose/ecs_params_reader_test.go b/ecs-cli/modules/utils/compose/ecs_params_reader_test.go
@@ -471,6 +471,86 @@ func TestConvertToECSNetworkConfiguration_NoNetworkConfig(t *testing.T) {
 	}
 }
 
+func TestConvertToECSPlacementConstraints(t *testing.T) {
+	constraint1 := Constraint{
+		Expression: "attribute:ecs.instance-type =~ t2.*",
+		Type:       ecs.PlacementConstraintTypeMemberOf,
+	}
+	constraint2 := Constraint{
+		Type: ecs.PlacementConstraintTypeDistinctInstance,
+	}
+	constraints := []Constraint{constraint1, constraint2}
+	taskPlacement := TaskPlacement{
+		Constraints: constraints,
+	}
+
+	ecsParams := &ECSParams{
+		RunParams: RunParams{
+			TaskPlacement: taskPlacement,
+		},
+	}
+
+	expectedConstraints := []*ecs.PlacementConstraint{
+		&ecs.PlacementConstraint{
+			Expression: aws.String("attribute:ecs.instance-type =~ t2.*"),
+			Type:       aws.String(ecs.PlacementConstraintTypeMemberOf),
+		},
+		&ecs.PlacementConstraint{
+			Type: aws.String(ecs.PlacementConstraintTypeDistinctInstance),
+		},
+	}
+
+	ecsPlacementConstraints, err := ConvertToECSPlacementConstraints(ecsParams)
+
+	if assert.NoError(t, err) {
+		assert.ElementsMatch(t, expectedConstraints, ecsPlacementConstraints, "Expected placement constraints to match")
+	}
+}
+
+func TestConvertToECSPlacementStrategy(t *testing.T) {
+	strategy1 := Strategy{
+		Field: "instanceId",
+		Type:  ecs.PlacementStrategyTypeBinpack,
+	}
+	strategy2 := Strategy{
+		Field: "attribute:ecs.availability-zone",
+		Type:  ecs.PlacementStrategyTypeSpread,
+	}
+	strategy3 := Strategy{
+		Type: ecs.PlacementStrategyTypeRandom,
+	}
+	strategy := []Strategy{strategy1, strategy2, strategy3}
+	taskPlacement := TaskPlacement{
+		Strategies: strategy,
+	}
+
+	ecsParams := &ECSParams{
+		RunParams: RunParams{
+			TaskPlacement: taskPlacement,
+		},
+	}
+
+	expectedStrategy := []*ecs.PlacementStrategy{
+		&ecs.PlacementStrategy{
+			Field: aws.String("instanceId"),
+			Type:  aws.String(ecs.PlacementStrategyTypeBinpack),
+		},
+		&ecs.PlacementStrategy{
+			Field: aws.String("attribute:ecs.availability-zone"),
+			Type:  aws.String(ecs.PlacementStrategyTypeSpread),
+		},
+		&ecs.PlacementStrategy{
+			Type: aws.String(ecs.PlacementStrategyTypeRandom),
+		},
+	}
+
+	ecsPlacementStrategy, err := ConvertToECSPlacementStrategy(ecsParams)
+
+	if assert.NoError(t, err) {
+		assert.ElementsMatch(t, expectedStrategy, ecsPlacementStrategy, "Expected placement strategy to match")
+	}
+}
+
 func TestReadECSParams_WithHealthCheck(t *testing.T) {
 	ecsParamsString := `version: 1
 task_definition:
