ECS: supporting x-aws-assign_public_ip

Allowing users to choose whether their instances should get a public IP address or not. Defaulting to "no". Signed-off-by: Nitzan Raz <[email protected]>
docker-archive · Jan 11, 2023 · c308a67 · c308a67
1 parent bd636e0
commit c308a67
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/ecs/cloudformation.go b/ecs/cloudformation.go
@@ -235,7 +235,10 @@ func (b *ecsAPIService) createService(project *types.Project, service types.Serv
 		return err
 	}
 
-	assignPublicIP := ecsapi.AssignPublicIpEnabled
+	assignPublicIP := "DISABLED"
+	if assignPublicIPSetting, ok := service.Extensions[extensionAssignPublicIP]; ok && assignPublicIPSetting.(bool) {
+		assignPublicIP = ecsapi.AssignPublicIpEnabled
+	}
 	launchType := ecsapi.LaunchTypeFargate
 	platformVersion := "1.4.0" // LATEST which is set to 1.3.0 (?) which doesn’t allow efs volumes.
 	if requireEC2(service) {

diff --git a/ecs/testdata/input/slightly-complex-service.yaml b/ecs/testdata/input/slightly-complex-service.yaml
@@ -3,6 +3,7 @@ services:
     image: nginx
     ports:
       - "80:80"
+    x-aws-assign_public_ip: true
 
   sensitive:
     image: httpd
diff --git a/ecs/testdata/simple-cloudformation-conversion.golden b/ecs/testdata/simple-cloudformation-conversion.golden
@@ -81,7 +81,7 @@ Resources:
           Ref: SimpleTCP80TargetGroup
       NetworkConfiguration:
         AwsvpcConfiguration:
-          AssignPublicIp: ENABLED
+          AssignPublicIp: DISABLED
           SecurityGroups:
           - Ref: DefaultNetwork
           Subnets:

diff --git a/ecs/testdata/slightly-complex-cloudformation-conversion.golden b/ecs/testdata/slightly-complex-cloudformation-conversion.golden
@@ -220,7 +220,7 @@ Resources:
       LaunchType: FARGATE
       NetworkConfiguration:
         AwsvpcConfiguration:
-          AssignPublicIp: ENABLED
+          AssignPublicIp: DISABLED
           SecurityGroups:
           - Ref: DefaultNetwork
           Subnets:

diff --git a/ecs/x.go b/ecs/x.go
@@ -31,4 +31,5 @@ const (
 	extensionManagedPolicies = "x-aws-policies"
 	extensionAutoScaling     = "x-aws-autoscaling"
 	extensionCloudFormation  = "x-aws-cloudformation"
+	extensionAssignPublicIP  = "x-aws-assign_public_ip"
 )