Merge pull request #907 from buildkite/keithduncan/update-cleanup-logic

Make the template own and delete the log group

Author: keithduncan

.buildkite/steps/cleanup.sh

@@ -48,6 +48,15 @@ aws s3api list-buckets \
   | grep -E 'buildkite-aws-stack-test-.*-managedsecretsbucket' \
   | xargs -n1 -t -I% aws s3 rb s3://% --force
 
+# Do this before deleting the stacks so we don't race with stack-managed log
+# groups
+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 "%"
+
 echo "--- Deleting old cloudformation stacks"
 aws cloudformation describe-stacks \
   --output text \
@@ -62,10 +71,3 @@ aws ec2 describe-instances \
   --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 "%"