chore(template): make StorageOpts transformers safe in templates (aws…

…#1910) Fixes an issue which arose in aws#1892 where templates fail to execute.   By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
iamhopaul123 · Feb 5, 2021 · a6d803e · a6d803e
1 parent e3456b5
commit a6d803e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/internal/pkg/template/template_integration_test.go b/internal/pkg/template/template_integration_test.go
@@ -106,7 +106,7 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 		"renders a valid template with all storage options": {
 			opts: template.WorkloadOpts{
 				HTTPHealthCheck: defaultHttpHealthCheck,
-				Storage: template.StorageOpts{
+				Storage: &template.StorageOpts{
 					EFSPerms: []*template.EFSPermission{
 						{
 							AccessPointID: aws.String("ap-1234"),
@@ -136,7 +136,7 @@ func TestTemplate_ParseLoadBalancedWebService(t *testing.T) {
 		"renders a valid template with minimal storage options": {
 			opts: template.WorkloadOpts{
 				HTTPHealthCheck: defaultHttpHealthCheck,
-				Storage: template.StorageOpts{
+				Storage: &template.StorageOpts{
 					EFSPerms: []*template.EFSPermission{
 						{
 							FilesystemID: aws.String("fs-5678"),

diff --git a/templates/workloads/jobs/scheduled-job/cf.yml b/templates/workloads/jobs/scheduled-job/cf.yml
@@ -44,9 +44,13 @@ Resources:
 {{include "envvars" . | indent 10}}
 {{include "secrets" . | indent 10}}
 {{include "logconfig" . | indent 10}}
+{{- if .Storage}}
 {{include "mount-points" . | indent 10}}
+{{- end}}
 {{include "sidecars" . | indent 8}}
+{{- if .Storage}}
 {{include "volumes" . | indent 6}}
+{{- end}}
 {{include "executionrole" . | indent 2}}
 
 {{include "taskrole" . | indent 2}}

diff --git a/templates/workloads/partials/cf/service-base-properties.yml b/templates/workloads/partials/cf/service-base-properties.yml
@@ -7,7 +7,7 @@ DesiredCount: !GetAtt DynamicDesiredCountAction.DesiredCount
 {{- else }}
 DesiredCount: !Ref TaskCount
 {{- end}}
-{{- if .Storage.Volumes}}
+{{- if .Storage}}
 PlatformVersion: 1.4.0
 {{- end}}
 DeploymentConfiguration:

diff --git a/templates/workloads/partials/cf/taskrole.yml b/templates/workloads/partials/cf/taskrole.yml
@@ -27,6 +27,7 @@ TaskRole:
                 StringEquals:
                   'iam:ResourceTag/copilot-application': !Sub '${AppName}'
                   'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
+      {{- if .Storage}}
       {{- range $EFS := .Storage.EFSPerms}}
       - PolicyName: 'GrantEFSAccess{{$EFS.FilesystemID}}'
         PolicyDocument: 
@@ -45,5 +46,6 @@ TaskRole:
               {{- end}}
               Resource:
                 - !Sub 'arn:aws:elasticfilesystem:${AWS::Region}:${AWS::AccountId}:file-system/{{$EFS.FilesystemID}}'
+      {{- end}}
       {{- end -}}
 
diff --git a/templates/workloads/services/backend/cf.yml b/templates/workloads/services/backend/cf.yml
@@ -56,9 +56,13 @@ Resources:
             StartPeriod: {{.HealthCheck.StartPeriod}}
             Timeout: {{.HealthCheck.Timeout}}
 {{- end}}
+{{- if .Storage}}
 {{include "mount-points" . | indent 10}}
+{{- end}}
 {{include "sidecars" . | indent 8}}
+{{- if .Storage}}
 {{include "volumes" . | indent 6}}
+{{- end}}
 {{include "executionrole" . | indent 2}}
 {{include "taskrole" . | indent 2}}
 {{include "servicediscovery" . | indent 2}}

diff --git a/templates/workloads/services/lb-web/cf.yml b/templates/workloads/services/lb-web/cf.yml
@@ -67,9 +67,13 @@ Resources:
             Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName
 {{include "secrets" . | indent 10}}
 {{include "logconfig" . | indent 10}}
+{{- if .Storage}}
 {{include "mount-points" . | indent 10}}
+{{- end}}
 {{include "sidecars" . | indent 8}}
+{{if .Storage}}
 {{include "volumes" . | indent 6}}
+{{- end}}
 {{include "executionrole" . | indent 2}}
 {{include "taskrole" . | indent 2}}
 {{include "servicediscovery" . | indent 2}}