Merge branch 'fix-cleanup' into 'main'

Fix resources cleanup

See merge request observability-bd-projects/one-observability-demo!122

Author: awsimaya

PetAdoptions/cdk/pet_stack/lib/common/container-image-builder.ts

@@ -31,7 +31,8 @@ export class ContainerImageBuilder extends Construct {
         const repository = new ecr.Repository(this, props.repositoryName + 'Repository', {
             repositoryName: props.repositoryName,
             imageScanOnPush: true,
-            removalPolicy: cdk.RemovalPolicy.DESTROY
+            removalPolicy: cdk.RemovalPolicy.DESTROY,
+            autoDeleteImages: true,
         });
         const image = new ecrassets.DockerImageAsset(this, props.repositoryName + 'DockerImageAsset', {
           directory: props.dockerImageAssetDirectory

PetAdoptions/cdk/pet_stack/lib/services.ts

@@ -60,7 +60,9 @@ export class Services extends Stack {
 
         // Creates an S3 bucket to store pet images
         const s3_observabilitypetadoptions = new s3.Bucket(this, 's3bucket_petadoption', {
-            publicReadAccess: false
+            publicReadAccess: false,
+            autoDeleteObjects: true,
+            removalPolicy: RemovalPolicy.DESTROY,
         });
 
         // Creates the DynamoDB table for Petadoption data

PetAdoptions/cdk/pet_stack/resources/destroy_stack.sh

@@ -4,6 +4,11 @@ echo ---------------------------------------------------------------------------
 echo This script destroys the CDK stack
 echo ---------------------------------------------------------------------------------------------
 
+if [ -z "$AWS_REGION" ]; then
+	echo "Fatal: environment variable AWS_REGION not set. Aborting."
+	exit 1
+fi
+
 # Disable Contributor Insights
 DDB_CONTRIB=$(aws ssm get-parameter --name '/petstore/dynamodbtablename' | jq .Parameter.Value -r)
 aws dynamodb update-contributor-insights --table-name $DDB_CONTRIB --contributor-insights-action DISABLE  
@@ -24,21 +29,15 @@ aws eks update-kubeconfig --name PetSite
 kubectl delete -f https://raw.githubusercontent.com/aws-samples/one-observability-demo/main/PetAdoptions/cdk/pet_stack/resources/load_balancer/crds.yaml
 
 # Get rid of all resources (Application first, then cluster or it will fail)
-cdk destroy $STACK_NAME_APP $STACK_NAME --force
+cdk destroy $STACK_NAME_APP --force
 cdk destroy $STACK_NAME --force
 
 # Sometimes the SqlSeeder doesn't get deleted cleanly. This helps clean up the environment completely including Sqlseeder
-aws cloudformation delete-stack --stack-name $STACK_NAME 
 aws cloudformation delete-stack --stack-name $STACK_NAME_APP
+aws cloudformation delete-stack --stack-name $STACK_NAME
 
 aws cloudwatch delete-dashboards --dashboard-names "EKS_FluentBit_Dashboard"
 
-# delete s3 buckets
-for b in $(aws s3 ls | awk '/services-s3bucketpetadoption/ {print $3}'); do
-	echo "deleting ${b}"
-	aws s3 rb s3://$b --force
-done
-
 echo CDK BOOTSTRAP WAS NOT DELETED
 
 echo ----- ✅ DONE --------