Make the template own and delete the log group

Author: keithduncan

.buildkite/steps/cleanup.sh

@@ -61,11 +61,4 @@ aws ec2 describe-instances \
   --filters "Name=tag:Name,Values=Packer Builder" \
   --query "$(printf 'Reservations[].Instances[?LaunchTime<`%s`].[InstanceId]' "$cutoff_date")" \
   --output text \
-  | xargs -n1 -t -I% aws ec2 terminate-instances --instance-ids "%"
-
-echo "--- Deleting old lambda logs after ${cutoff_date_milli}"
-aws logs describe-log-groups \
-  --log-group-name-prefix "/aws/lambda/buildkite-aws-stack-test-" \
-  --query "$(printf 'logGroups[?creationTime<`%s`].[logGroupName]' "$cutoff_date_milli" )" \
-  --output text \
-  | xargs -n1 -t -I% aws logs delete-log-group --log-group-name "%"
+  | xargs -n1 -t -I% aws ec2 terminate-instances --instance-ids "%"

templates/aws-stack.yml

@@ -1068,6 +1068,14 @@ Resources:
       Role: !GetAtt AsgProcessSuspenderRole.Arn
       Runtime: 'python3.7'
 
+  # This mirrors the group that would be created by the lambda, but enforces
+  # a retention period and also ensures it's removed when the stack is removed
+  AzRebalancingSuspenderFunctionLogGroup:
+    Type: AWS::Logs::LogGroup
+    Properties:
+      LogGroupName: !Sub "/aws/lambda/${AzRebalancingSuspenderFunction}"
+      RetentionInDays: 1
+
   AzRebalancingSuspender:
     Type: AWS::CloudFormation::CustomResource
     Version: 1.0