import changes from GH

Author: bonclay7

PetAdoptions/cdk/pet_stack/resources/destroy_stack.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo ---------------------------------------------------------------------------------------------
-echo This script destroys the CDK stack
+echo This script destroys the resources created in the workshop
 echo ---------------------------------------------------------------------------------------------
 
 if [ -z "$AWS_REGION" ]; then
@@ -11,7 +11,7 @@ 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  
+aws dynamodb update-contributor-insights --table-name $DDB_CONTRIB --contributor-insights-action DISABLE
 
 echo STARTING SERVICES CLEANUP
 echo -----------------------------
@@ -22,25 +22,28 @@ STACK_NAME_APP=$(aws ssm get-parameter --name '/eks/petsite/stackname' --region
 
 # Set default name in case Parameters are gone (partial deletion)
 if [ -z $STACK_NAME ]; then STACK_NAME="Services"; fi
-if [ -z $STACK_NAME_APP ]; then STACK_NAME_APP="Applications"; fi 
+if [ -z $STACK_NAME_APP ]; then STACK_NAME_APP="Applications"; fi
+if [ -z $STACK_NAME_CODEPIPELINE ]; then STACK_NAME_CODEPIPELINE="Observability-Workshop"; fi
 
 # Fix for CDK teardown issues
 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
 
-#Deleting keycloak 
+#Deleting keycloak
 kubectl delete namespace keycloak --force
 
-# Get rid of all resources (Application first, then cluster or it will fail)
-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_APP
+aws cloudformation wait stack-delete-complete --stack-name $STACK_NAME_APP
 aws cloudformation delete-stack --stack-name $STACK_NAME
+aws cloudformation wait stack-delete-complete --stack-name $STACK_NAME
 
 aws cloudwatch delete-dashboards --dashboard-names "EKS_FluentBit_Dashboard"
 
+# delete the code pipeline stack
+aws cloudformation delete-stack --stack-name $STACK_NAME_CODEPIPELINE
+aws cloudformation wait stack-delete-complete --stack-name $STACK_NAME_CODEPIPELINE
+
 echo CDK BOOTSTRAP WAS NOT DELETED
 
 echo ----- ✅ DONE --------

setup-cloudshell.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+if [ -z "$AWS_REGION" ]; then
+	echo "error: environment variable AWS_REGION not set. Aborting."
+	exit 1
+fi
+
+function install_helm(){
+	echo "Installing helm"
+	curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+	chmod 700 get_helm.sh
+	./get_helm.sh
+	sudo mv $(which helm) $HOME/.local/bin/
+	rm get_helm.sh
+}
+
+function install_eksctl(){
+	echo "Installing eksctl"
+	ARCH=amd64
+	PLATFORM=$(uname -s)_$ARCH
+	curl -sLO "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_$PLATFORM.tar.gz"
+	curl -sL "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check
+	tar -xzf eksctl_$PLATFORM.tar.gz -C /tmp && rm eksctl_$PLATFORM.tar.gz
+	sudo mv /tmp/eksctl $HOME/.local/bin/
+}
+
+function install_awscurl(){
+	echo "Installing awscurl"
+	pip install awscurl
+}
+
+mkdir -p $HOME/.local/bin
+cd /tmp
+
+# install helm
+command -v helm >/dev/null 2>&1 ||
+	{ install_helm; }
+
+# install awscurl
+command -v awscurl >/dev/null 2>&1 ||
+	{ install_awscurl; }
+
+# install eksctl
+command -v eksctl >/dev/null 2>&1 ||
+	{ install_eksctl; }
+
+echo "All dependencies installed!"
+
+cd -