fix: enable queue_delay scaling even when not subscribed to a topic (…

…#3058) Fixes #3016 By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the Apache 2.0 License.
aws · Nov 22, 2021 · f522c9d · f522c9d
1 parent 964702e
commit f522c9d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/internal/pkg/template/templates/workloads/partials/cf/autoscaling.yml b/internal/pkg/template/templates/workloads/partials/cf/autoscaling.yml
@@ -81,7 +81,7 @@ AutoScalingPolicyECSServiceAverageMemoryUtilization:
       ScaleOutCooldown: 60
       TargetValue: {{.Autoscaling.Memory}}
 {{- end}}
-{{- if (and .Subscribe .Autoscaling.QueueDelay) }}
+{{- if .Autoscaling.QueueDelay }}
 BacklogPerTaskCalculatorLogGroup:
   Type: AWS::Logs::LogGroup
   Properties:
@@ -117,11 +117,13 @@ BacklogPerTaskCalculatorFunction:
           Fn::Join:
             - ','
             - - !GetAtt EventsQueue.QueueName
+            {{- if .Subscribe }}
             {{- range $topic := .Subscribe.Topics }}
             {{- if $topic.Queue }}
               - !GetAtt {{logicalIDSafe $topic.Service}}{{logicalIDSafe $topic.Name}}EventsQueue.QueueName
             {{- end }}
             {{- end }}
+            {{- end }}
 
 BacklogPerTaskCalculatorRole:
   Type: AWS::IAM::Role
@@ -161,11 +163,13 @@ BacklogPerTaskCalculatorRole:
                 - sqs:GetQueueUrl
               Resource:
                 - !GetAtt EventsQueue.Arn
+                {{- if .Subscribe }}
                 {{- range $topic := .Subscribe.Topics}}
                 {{- if $topic.Queue}}
                 - !GetAtt {{logicalIDSafe $topic.Service}}{{logicalIDSafe $topic.Name}}EventsQueue.Arn
                 {{- end }}
                 {{- end }}
+                {{- end }}
     ManagedPolicyArns:
       - !Sub arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
 
@@ -213,6 +217,7 @@ AutoScalingPolicyEventsQueue:
         Unit: Count
       TargetValue: {{$acceptableBacklog}}
 
+{{- if .Subscribe }}
 {{- range $topic := .Subscribe.Topics}}
 {{- if $topic.Queue}}
 AutoScalingPolicy{{logicalIDSafe $topic.Service}}{{logicalIDSafe $topic.Name}}EventsQueue:
@@ -235,7 +240,8 @@ AutoScalingPolicy{{logicalIDSafe $topic.Service}}{{logicalIDSafe $topic.Name}}Ev
             Value: !GetAtt {{logicalIDSafe $topic.Service}}{{logicalIDSafe $topic.Name}}EventsQueue.QueueName
         Unit: Count
       TargetValue: {{$acceptableBacklog}}
-{{- end }}{{/* range $topic := .Subscribe.Topics */}}
 {{- end }}{{/* if $topic.Queue */}}
+{{- end }}{{/* range $topic := .Subscribe.Topics */}}
+{{- end }}{{/* if .Subscribe */}}
 
-{{- end }}{{/* if (and .Subscribe .Autoscaling.QueueDelay) */}}
+{{- end }}{{/* if .Autoscaling.QueueDelay */}}