Bug fix: Service Discovery Service Name is correctly set from ECS Params

PettitWesley · PettitWesley · commit 2de83fe83341 · 2018-10-17T21:48:17.000-07:00
diff --git a/ecs-cli/modules/cli/servicediscovery/servicediscovery_app_test.go b/ecs-cli/modules/cli/servicediscovery/servicediscovery_app_test.go
@@ -37,6 +37,7 @@ import (
 const (
 	testClusterName        = "cluster"
 	testServiceName        = "service"
+	otherTestServiceName   = "some-other-name"
 	testDescription        = "clyde loves pudding"
 	otherTestDescription   = "pudding plays hard to get"
 	testNamespaceStackName = "amazon-ecs-cli-setup-private-dns-namespace-cluster-service"
@@ -231,7 +232,7 @@ func TestCreateServiceDiscoveryWithECSParams(t *testing.T) {
 			Description: testDescription,
 		},
 		ServiceDiscoveryService: utils.ServiceDiscoveryService{
-			Name:        testServiceName,
+			Name:        otherTestServiceName,
 			Description: testDescription,
 			DNSConfig: utils.DNSConfig{
 				TTL:  aws.Int64(60),
@@ -250,7 +251,7 @@ func TestCreateServiceDiscoveryWithECSParams(t *testing.T) {
 	}
 	var validateSDS validateSDSParamsFunc = func(t *testing.T, cfnParams *cloudformation.CfnStackParams) {
 		validateCFNParam(testNamespaceID, parameterKeyNamespaceID, cfnParams, t)
-		validateCFNParam(testServiceName, parameterKeySDSName, cfnParams, t)
+		validateCFNParam(otherTestServiceName, parameterKeySDSName, cfnParams, t)
 		validateCFNParam(servicediscovery.RecordTypeSrv, parameterKeyDNSType, cfnParams, t)
 		validateCFNParam(testDescription, parameterKeySDSDescription, cfnParams, t)
 		validateCFNParam("60", parameterKeyDNSTTL, cfnParams, t)
diff --git a/ecs-cli/modules/cli/servicediscovery/servicediscovery_helper.go b/ecs-cli/modules/cli/servicediscovery/servicediscovery_helper.go
@@ -242,9 +242,14 @@ func truncate(s string, length int) string {
 	return s
 }
 
-func getSDSCFNParams(namespaceID, sdsName, networkMode string, input *utils.ServiceDiscovery) *cloudformation.CfnStackParams {
+func getSDSCFNParams(namespaceID, ecsServiceName, networkMode string, input *utils.ServiceDiscovery) *cloudformation.CfnStackParams {
 	cfnParams := cloudformation.NewCfnStackParams(requiredParamsSDS)
 
+	sdsName := input.ServiceDiscoveryService.Name
+	if sdsName == "" {
+		sdsName = ecsServiceName
+	}
+
 	cfnParams.Add(parameterKeyNamespaceID, namespaceID)
 	cfnParams.Add(parameterKeySDSName, sdsName)
 
