Merge pull request #696 from docker/ec2_machine

Allow user to set ami/machine by Deploy.Placement.Constraint

ecs/backend.go

@@ -85,23 +85,23 @@ type ecsAPIService struct {
 	aws    API
 }
 
-func (a *ecsAPIService) ContainerService() containers.Service {
+func (b *ecsAPIService) ContainerService() containers.Service {
 	return nil
 }
 
-func (a *ecsAPIService) ComposeService() compose.Service {
-	return a
+func (b *ecsAPIService) ComposeService() compose.Service {
+	return b
 }
 
-func (a *ecsAPIService) SecretsService() secrets.Service {
-	return a
+func (b *ecsAPIService) SecretsService() secrets.Service {
+	return b
 }
 
-func (a *ecsAPIService) VolumeService() volumes.Service {
+func (b *ecsAPIService) VolumeService() volumes.Service {
 	return nil
 }
 
-func (a *ecsAPIService) ResourceService() resources.Service {
+func (b *ecsAPIService) ResourceService() resources.Service {
 	return nil
 }
 

ecs/cloudformation_test.go

@@ -23,21 +23,19 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/awslabs/goformation/v4/cloudformation/efs"
-
-	"github.com/golang/mock/gomock"
-
 	"github.com/docker/compose-cli/api/compose"
 
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/awslabs/goformation/v4/cloudformation"
 	"github.com/awslabs/goformation/v4/cloudformation/ec2"
 	"github.com/awslabs/goformation/v4/cloudformation/ecs"
+	"github.com/awslabs/goformation/v4/cloudformation/efs"
 	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancingv2"
 	"github.com/awslabs/goformation/v4/cloudformation/iam"
 	"github.com/awslabs/goformation/v4/cloudformation/logs"
 	"github.com/compose-spec/compose-go/loader"
 	"github.com/compose-spec/compose-go/types"
+	"github.com/golang/mock/gomock"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
 )

ecs/compatibility.go

@@ -54,6 +54,8 @@ var compatibleComposeAttributes = []string{
 	"services.cap_drop",
 	"services.depends_on",
 	"services.deploy",
+	"services.deploy.placement",
+	"services.deploy.placement.constraints",
 	"services.deploy.replicas",
 	"services.deploy.resources.limits",
 	"services.deploy.resources.limits.cpus",

ecs/ec2.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+	"strings"
 
 	"github.com/awslabs/goformation/v4/cloudformation"
 	"github.com/awslabs/goformation/v4/cloudformation/autoscaling"
@@ -28,11 +29,22 @@ import (
 	"github.com/compose-spec/compose-go/types"
 )
 
+const (
+	placementConstraintAMI     = "node.ami == "
+	placementConstraintMachine = "node.machine == "
+)
+
 func (b *ecsAPIService) createCapacityProvider(ctx context.Context, project *types.Project, template *cloudformation.Template, resources awsResources) error {
-	var ec2 bool
-	for _, s := range project.Services {
-		if requireEC2(s) {
+	var (
+		ec2         bool
+		ami         string
+		machineType string
+	)
+	for _, service := range project.Services {
+		if requireEC2(service) {
 			ec2 = true
+			// TODO once we can assign a service to a CapacityProvider, we could run this _per service_
+			ami, machineType = getUserDefinedMachine(service)
 			break
 		}
 	}
@@ -41,14 +53,20 @@ func (b *ecsAPIService) createCapacityProvider(ctx context.Context, project *typ
 		return nil
 	}
 
-	ami, err := b.aws.GetParameter(ctx, "/aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended")
-	if err != nil {
-		return err
+	if ami == "" {
+		recommended, err := b.aws.GetParameter(ctx, "/aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended")
+		if err != nil {
+			return err
+		}
+		ami = recommended
 	}
 
-	machineType, err := guessMachineType(project)
-	if err != nil {
-		return err
+	if machineType == "" {
+		t, err := guessMachineType(project)
+		if err != nil {
+			return err
+		}
+		machineType = t
 	}
 
 	template.Resources["CapacityProvider"] = &ecs.CapacityProvider{
@@ -98,3 +116,17 @@ func (b *ecsAPIService) createCapacityProvider(ctx context.Context, project *typ
 
 	return nil
 }
+
+func getUserDefinedMachine(s types.ServiceConfig) (ami string, machineType string) {
+	if s.Deploy != nil {
+		for _, s := range s.Deploy.Placement.Constraints {
+			if strings.HasPrefix(s, placementConstraintAMI) {
+				ami = s[len(placementConstraintAMI):]
+			}
+			if strings.HasPrefix(s, placementConstraintMachine) {
+				machineType = s[len(placementConstraintMachine):]
+			}
+		}
+	}
+	return ami, machineType
+}

ecs/ec2_test.go

@@ -0,0 +1,49 @@
+/*
+   Copyright 2020 Docker Compose CLI authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package ecs
+
+import (
+	"testing"
+
+	"github.com/awslabs/goformation/v4/cloudformation/autoscaling"
+	"gotest.tools/v3/assert"
+)
+
+func TestUserDefinedAMI(t *testing.T) {
+	template := convertYaml(t, `
+services:
+  test:
+    image: "image"
+    deploy:
+      placement:
+        constraints:
+          - "node.ami == ami123456789"
+          - "node.machine == t0.femto"
+      resources:
+        # devices:
+        #   - capabilities: ["gpu"]
+        reservations:
+          memory: 8Gb
+          generic_resources:
+            - discrete_resource_spec:
+                kind: gpus
+                value: 1                    
+`, useDefaultVPC)
+	lc := template.Resources["LaunchConfiguration"].(*autoscaling.LaunchConfiguration)
+	assert.Check(t, lc.ImageId == "ami123456789")
+	assert.Check(t, lc.InstanceType == "t0.femto")
+}