diff --git a/ecs/pkg/amazon/cloudformation.go b/ecs/pkg/amazon/cloudformation.go index 68f6b344..24b5786d 100644 --- a/ecs/pkg/amazon/cloudformation.go +++ b/ecs/pkg/amazon/cloudformation.go @@ -89,7 +89,7 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err // Private DNS namespace will allow DNS name for the services to be ..local c.createCloudMap(project, template) - loadBalancer := c.createLoadBalancer(project, template) + loadBalancer := c.createLoadBalancer(project, template, "network") for _, service := range project.Services { definition, err := Convert(project, service) @@ -177,20 +177,14 @@ func (c client) Convert(project *compose.Project) (*cloudformation.Template, err return template, nil } -func (c client) createLoadBalancer(project *compose.Project, template *cloudformation.Template) string { - - loadBalancerType := "network" - loadBalancerName := fmt.Sprintf( - "%s%sLB", - strings.Title(project.Name), - strings.ToUpper(loadBalancerType[0:1]), - ) +func (c client) createLoadBalancer(project *compose.Project, template *cloudformation.Template, loadBalancerType string) string { + loadBalancerName := fmt.Sprintf("%sLoadBalancer", strings.Title(project.Name)) // Create LoadBalancer if `ParameterLoadBalancerName` is not set template.Conditions["CreateLoadBalancer"] = cloudformation.Equals("", cloudformation.Ref(ParameterLoadBalancerARN)) - loadBalancer := &elasticloadbalancingv2.LoadBalancer{ + template.Resources[loadBalancerName] = &elasticloadbalancingv2.LoadBalancer{ Name: loadBalancerName, - Scheme: "internet-facing", + Scheme: elbv2.LoadBalancerSchemeEnumInternetFacing, Subnets: []string{ cloudformation.Ref(ParameterSubnet1Id), cloudformation.Ref(ParameterSubnet2Id), @@ -204,7 +198,6 @@ func (c client) createLoadBalancer(project *compose.Project, template *cloudform Type: loadBalancerType, AWSCloudFormationCondition: "CreateLoadBalancer", } - template.Resources[loadBalancerName] = loadBalancer loadBalancerRef := cloudformation.If("CreateLoadBalancer", cloudformation.Ref(loadBalancerName), cloudformation.Ref(ParameterLoadBalancerARN)) return loadBalancerRef diff --git a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden index 15006580..15222e57 100644 --- a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden +++ b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-conversion.golden @@ -258,10 +258,10 @@ }, "Type": "AWS::EC2::SecurityGroupIngress" }, - "TestSimpleConvertNLB": { + "TestSimpleConvertLoadBalancer": { "Condition": "CreateLoadBalancer", "Properties": { - "Name": "TestSimpleConvertNLB", + "Name": "TestSimpleConvertLoadBalancer", "Scheme": "internet-facing", "Subnets": [ { diff --git a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden index 0324c289..5cc9cb98 100644 --- a/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden +++ b/ecs/pkg/amazon/testdata/simple/simple-cloudformation-with-overrides-conversion.golden @@ -258,10 +258,10 @@ }, "Type": "AWS::EC2::SecurityGroupIngress" }, - "TestSimpleWithOverridesNLB": { + "TestSimpleWithOverridesLoadBalancer": { "Condition": "CreateLoadBalancer", "Properties": { - "Name": "TestSimpleWithOverridesNLB", + "Name": "TestSimpleWithOverridesLoadBalancer", "Scheme": "internet-facing", "Subnets": [ {