test: fix failing tests (#2606)

<!-- Provide summary of changes -->

Found another typo in the customized env test. Also found a spot in multiple envs that was not updated. Fixed all the template integ tests. 



<!-- Issue number, if available. E.g. "Fixes #31", "Addresses #42, 77" -->

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Author: bvtujo

e2e/customized-env/customized_env_test.go

@@ -233,7 +233,7 @@ environments:
 			for _, sd := range svc.ServiceDiscoveries {
 				envs = append(envs, sd.Environment[0])
 				namespaces = append(namespaces, sd.Namespace)
-				wantedNamespaces = append(wantedNamespaces, fmt.Sprintf("%s.%s.%s.local:80", svc.SvcName, sd.Environment, appName))
+				wantedNamespaces = append(wantedNamespaces, fmt.Sprintf("%s.%s.%s.local:80", svc.SvcName, sd.Environment[0], appName))
 			}
 			Expect(envs).To(ConsistOf("test", "prod", "shared"))
 			Expect(namespaces).To(ConsistOf(wantedNamespaces))

e2e/multi-env-app/multi_env_test.go

@@ -171,9 +171,15 @@ var _ = Describe("Multiple Env App", func() {
 				envRoutes[route.Environment] = route
 			}
 
-			Expect(len(svc.ServiceDiscoveries)).To(Equal(1))
-			Expect(svc.ServiceDiscoveries[0].Environment).To(ConsistOf("test", "prod"))
-			Expect(svc.ServiceDiscoveries[0].Namespace).To(Equal(fmt.Sprintf("%s.%s.local:80", svc.SvcName, appName)))
+			Expect(len(svc.ServiceDiscoveries)).To(Equal(2))
+			var envs, namespaces, wantedNamespaces []string
+			for _, sd := range svc.ServiceDiscoveries {
+				envs = append(envs, sd.Environment[0])
+				namespaces = append(namespaces, sd.Namespace)
+				wantedNamespaces = append(wantedNamespaces, fmt.Sprintf("%s.%s.%s.local:80", svc.SvcName, sd.Environment[0], appName))
+			}
+			Expect(envs).To(ConsistOf("test", "prod"))
+			Expect(namespaces).To(ConsistOf(wantedNamespaces))
 
 			// Call each environment's endpoint and ensure it returns a 200
 			for _, env := range []string{"test", "prod"} {

go.sum

@@ -1325,6 +1325,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/pkg/template/template_integration_test.go

@@ -20,13 +20,15 @@ func TestTemplate_ParseScheduledJob(t *testing.T) {
 		opts template.WorkloadOpts
 	}{
 		"renders a valid template by default": {
-			opts: template.WorkloadOpts{},
+			opts: template.WorkloadOpts{
+				ServiceDiscoveryEndpoint: "test.app.local"},
 		},
 		"renders with timeout and no retries": {
 			opts: template.WorkloadOpts{
 				StateMachine: &template.StateMachineOpts{
 					Timeout: aws.Int(3600),
 				},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 		"renders with options": {
@@ -35,6 +37,7 @@ func TestTemplate_ParseScheduledJob(t *testing.T) {
 					Retries: aws.Int(5),
 					Timeout: aws.Int(3600),
 				},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 		"renders with options and addons": {
@@ -48,6 +51,7 @@ func TestTemplate_ParseScheduledJob(t *testing.T) {
 					SecretOutputs:   []string{"TablePassword"},
 					PolicyOutputs:   []string{"TablePolicy"},
 				},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 	}
@@ -81,7 +85,8 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 	}{
 		"renders a valid template by default": {
 			opts: template.WorkloadOpts{
-				HTTPHealthCheck: defaultHttpHealthCheck,
+				HTTPHealthCheck:          defaultHttpHealthCheck,
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 		"renders a valid template with addons with no outputs": {
@@ -90,6 +95,7 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 				NestedStack: &template.WorkloadNestedStackOpts{
 					StackName: "AddonsStack",
 				},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 		"renders a valid template with addons with outputs": {
@@ -101,6 +107,7 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 					SecretOutputs:   []string{"TablePassword"},
 					PolicyOutputs:   []string{"TablePolicy"},
 				},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 		"renders a valid template with private subnet placement": {
@@ -110,11 +117,13 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 					AssignPublicIP: "DISABLED",
 					SubnetsType:    "PrivateSubnets",
 				},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 		"renders a valid template with all storage options": {
 			opts: template.WorkloadOpts{
-				HTTPHealthCheck: defaultHttpHealthCheck,
+				HTTPHealthCheck:          defaultHttpHealthCheck,
+				ServiceDiscoveryEndpoint: "test.app.local",
 				Storage: &template.StorageOpts{
 					Ephemeral: aws.Int(500),
 					EFSPerms: []*template.EFSPermission{
@@ -147,7 +156,8 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 		},
 		"renders a valid template with minimal storage options": {
 			opts: template.WorkloadOpts{
-				HTTPHealthCheck: defaultHttpHealthCheck,
+				HTTPHealthCheck:          defaultHttpHealthCheck,
+				ServiceDiscoveryEndpoint: "test.app.local",
 				Storage: &template.StorageOpts{
 					EFSPerms: []*template.EFSPermission{
 						{
@@ -175,17 +185,19 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 		},
 		"renders a valid template with ephemeral storage": {
 			opts: template.WorkloadOpts{
-				HTTPHealthCheck: defaultHttpHealthCheck,
+				HTTPHealthCheck:          defaultHttpHealthCheck,
+				ServiceDiscoveryEndpoint: "test.app.local",
 				Storage: &template.StorageOpts{
 					Ephemeral: aws.Int(500),
 				},
 			},
 		},
 		"renders a valid template with entrypoint and command overrides": {
 			opts: template.WorkloadOpts{
-				HTTPHealthCheck: defaultHttpHealthCheck,
-				EntryPoint:      []string{"/bin/echo", "hello"},
-				Command:         []string{"world"},
+				HTTPHealthCheck:          defaultHttpHealthCheck,
+				EntryPoint:               []string{"/bin/echo", "hello"},
+				Command:                  []string{"world"},
+				ServiceDiscoveryEndpoint: "test.app.local",
 			},
 		},
 	}