From e8d65e88792499ba20b9952946ac4a1d71e79364 Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 11:34:45 -0800 Subject: [PATCH 1/7] chore: add LB_DNS env var for internal ALBs --- .../template/templates/workloads/partials/cf/envvars-common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml b/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml index a856d6f89ff..c087b956159 100644 --- a/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml +++ b/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml @@ -28,7 +28,7 @@ {{- end}} {{- end}} {{- end}}{{- end}} -{{- if eq .WorkloadType "Load Balanced Web Service"}} +{{- if or (eq .WorkloadType "Load Balanced Web Service") (eq .WorkloadType "Backend Service")}} {{- if .ALBListener}} - Name: COPILOT_LB_DNS {{- if .ImportedALB}} From 13b636ea5fda9167556f22469402a4ed0dd724f6 Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 11:47:05 -0800 Subject: [PATCH 2/7] chore: add to integ tests --- .../testdata/workloads/backend/http-autoscaling-template.yml | 2 ++ .../testdata/workloads/backend/http-full-config-template.yml | 2 ++ .../testdata/workloads/backend/http-only-path-template.yml | 2 ++ .../testdata/workloads/backend/https-path-alias-template.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml index 2ac36035a5d..7ee00997ced 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml @@ -85,6 +85,8 @@ Resources: Value: !Sub "${EnvName}" - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" + - Name: COPILOT_LB_DNS + Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml index 2d04344cb23..e918f8df290 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml @@ -90,6 +90,8 @@ Resources: Value: !Sub "${EnvName}" - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" + - Name: COPILOT_LB_DNS + Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml index 86ed63f2c80..4a57d32a098 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml @@ -85,6 +85,8 @@ Resources: Value: !Sub "${EnvName}" - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" + - Name: COPILOT_LB_DNS + Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml index a050de8ffea..966b8a3e945 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml @@ -80,6 +80,8 @@ Resources: Value: !Sub '${EnvName}' - Name: COPILOT_SERVICE_NAME Value: !Sub '${WorkloadName}' + - Name: COPILOT_LB_DNS + Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile From 72f28632f57448573f3be367e1b8918a4a409d21 Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 11:57:43 -0800 Subject: [PATCH 3/7] chore: change to internal --- .../testdata/workloads/backend/http-autoscaling-template.yml | 2 +- .../testdata/workloads/backend/http-full-config-template.yml | 2 +- .../testdata/workloads/backend/http-only-path-template.yml | 2 +- .../testdata/workloads/backend/https-path-alias-template.yml | 2 +- .../template/templates/workloads/partials/cf/envvars-common.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml index 7ee00997ced..3462caf5799 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml @@ -86,7 +86,7 @@ Resources: - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" - Name: COPILOT_LB_DNS - Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml index e918f8df290..8d52a7d5ea7 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml @@ -91,7 +91,7 @@ Resources: - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" - Name: COPILOT_LB_DNS - Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml index 4a57d32a098..4a8419b5a1d 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml @@ -86,7 +86,7 @@ Resources: - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" - Name: COPILOT_LB_DNS - Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml index 966b8a3e945..226f8d55589 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml @@ -81,7 +81,7 @@ Resources: - Name: COPILOT_SERVICE_NAME Value: !Sub '${WorkloadName}' - Name: COPILOT_LB_DNS - Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile diff --git a/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml b/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml index c087b956159..b9a8f038c44 100644 --- a/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml +++ b/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml @@ -34,7 +34,7 @@ {{- if .ImportedALB}} Value: {{.ImportedALB.DNSName}} {{- else}} - Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName {{- end}} {{- end}} {{- end}} \ No newline at end of file From 778b3da373d0aa858c2a711cf58c35a21383e5f8 Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 12:11:58 -0800 Subject: [PATCH 4/7] fix: differentiate alb types --- .../workloads/partials/cf/envvars-common.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml b/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml index b9a8f038c44..2e7faa9731b 100644 --- a/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml +++ b/internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml @@ -28,13 +28,19 @@ {{- end}} {{- end}} {{- end}}{{- end}} -{{- if or (eq .WorkloadType "Load Balanced Web Service") (eq .WorkloadType "Backend Service")}} {{- if .ALBListener}} - Name: COPILOT_LB_DNS -{{- if .ImportedALB}} + {{- if eq .WorkloadType "Load Balanced Web Service"}} + {{- if .ImportedALB}} Value: {{.ImportedALB.DNSName}} -{{- else}} + {{- else}} + Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName + {{- end}} + {{- else if eq .WorkloadType "Backend Service"}} + {{- if .ImportedALB}} + Value: {{.ImportedALB.DNSName}} + {{- else}} Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName -{{- end}} -{{- end}} + {{- end}} + {{- end}} {{- end}} \ No newline at end of file From af82e1b40d58d60c814e36cefc8834164ee316d0 Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 12:23:42 -0800 Subject: [PATCH 5/7] chore: try without --- .../testdata/workloads/backend/http-full-config-template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml index 8d52a7d5ea7..2d04344cb23 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml @@ -90,8 +90,6 @@ Resources: Value: !Sub "${EnvName}" - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" - - Name: COPILOT_LB_DNS - Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile From aaac99cd22f65d7f34e56b78b033022568663d51 Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 12:28:28 -0800 Subject: [PATCH 6/7] chore: try with --- .../testdata/workloads/backend/http-full-config-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml index 2d04344cb23..8d52a7d5ea7 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml @@ -90,6 +90,8 @@ Resources: Value: !Sub "${EnvName}" - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" + - Name: COPILOT_LB_DNS + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFile From 54dee37c6bc096a263fdc751fc751e46ace910ee Mon Sep 17 00:00:00 2001 From: Huang Date: Wed, 15 Nov 2023 12:36:10 -0800 Subject: [PATCH 7/7] fix: finally get it...maybe --- .../testdata/workloads/backend/http-full-config-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml index 8d52a7d5ea7..17a2b2c2bf0 100644 --- a/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml +++ b/internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml @@ -121,6 +121,8 @@ Resources: Value: !Sub "${EnvName}" - Name: COPILOT_SERVICE_NAME Value: !Sub "${WorkloadName}" + - Name: COPILOT_LB_DNS + Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName EnvironmentFiles: - !If - HasEnvFileForfluentbit