feat: Added Setup in learning paths with a few life improvements fixes

Author: ROunofF

hack/destroy-infrastructure.sh

@@ -39,4 +39,5 @@ wait
 # Only delete ide-role if all clusters are deleted
 if [ "$cluster" == "all" ]; then
   aws cloudformation delete-stack --stack-name ${EKS_CLUSTER_NAME}-ide-role || true
+  echo "Deleted role"
 fi

hack/exec.sh

@@ -19,16 +19,19 @@ container_image='eks-workshop-environment'
 
 (cd $SCRIPT_DIR/../lab && $CONTAINER_CLI build -q -t $container_image .)
 
-echo "Checking SKIP: $SKIP_CREDENTIALS"
+
 if [ -z "$SKIP_CREDENTIALS" -a -z "$USE_CURRENT_USER" ]; then
+  echo "Passing temp AWS credentials"
   source $SCRIPT_DIR/lib/generate-aws-creds.sh
 elif [ -n "${USE_CURRENT_USER:-}" ]; then
   if [ -z "$AWS_ACCESS_KEY_ID" ]; then
-    echo "No role credentials found, please check your AWS credentials"
+    echo "No AWS_ACCESS_KEY_ID found, please check your AWS credentials"
     exit 1
   fi
+  echo "Using USE_CURRENT_USER"
   aws_credential_args="-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
 else
+  echo "Using DEFAULT no credentials passed"
   aws_credential_args=""
 fi
 
@@ -38,5 +41,6 @@ $CONTAINER_CLI run --rm \
   -v $SCRIPT_DIR/../manifests:/manifests \
   -v $SCRIPT_DIR/../cluster:/cluster \
   --entrypoint /bin/bash \
+  -e "RESET_NO_DELETE=true" \
   -e 'EKS_CLUSTER_NAME' -e 'EKS_CLUSTER_AUTO_NAME'  -e 'AWS_REGION' -e 'AWS_CONTAINER_CREDENTIALS_RELATIVE_URI' -e RESOURCE_CODEBUILD_ROLE_ARN \
   $aws_credential_args $container_image -c "$shell_command"

hack/shell.sh

@@ -40,6 +40,7 @@ fi
 $CONTAINER_CLI run --rm $interactive_args $dns_args \
   -v $SCRIPT_DIR/../manifests:/eks-workshop/manifests \
   -v $SCRIPT_DIR/../cluster:/cluster \
+  -e "RESET_NO_DELETE=true" \
   -e 'EKS_CLUSTER_NAME' -e 'EKS_CLUSTER_AUTO_NAME' -e 'AWS_REGION' \
   -p 8889:8889 \
   $aws_credential_args $container_image $shell_command

lab/bin/reset-environment

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 GREEN='\033[1;32m'
 RED='\033[1;31m'
 PURPLE='\033[1;35m'
@@ -41,8 +43,8 @@ fi
 rm -f /home/ec2-user/.kube/config
 EKS_CLUSTER_AUTO_NAME=${EKS_CLUSTER_AUTO_NAME:-"eks-workshop-auto"}
 
-aws eks update-kubeconfig --name $EKS_CLUSTER_AUTO_NAME --alias eks-workshop-auto
-aws eks update-kubeconfig --name $EKS_CLUSTER_NAME --alias default --user-alias default
+aws eks update-kubeconfig --name $EKS_CLUSTER_AUTO_NAME --alias eks-workshop-auto 2>/dev/null || true
+aws eks update-kubeconfig --name $EKS_CLUSTER_NAME --alias default --user-alias default 2>/dev/null || true
 
 module=$1
 
@@ -66,10 +68,13 @@ mkdir -p /eks-workshop
 logmessage "🚀 We're preparing your environment for the next lab, sit tight!"
 
 REPOSITORY_REF=${REPOSITORY_REF:-""}
+RESET_NO_DELETE=${RESET_NO_DELETE:-""}
 
 if [ ! -z "${REPOSITORY_REF}" ]; then
   rm -f /home/ec2-user/environment/eks-workshop
-  rm -rf $manifests_path
+  if [ -z "${RESET_NO_DELETE}" ]; then
+    rm -rf $manifests_path
+  fi
   rm -rf $repository_path
 
   logmessage "📦 Refreshing copy of workshop repository from GitHub..."
@@ -78,7 +83,12 @@ if [ ! -z "${REPOSITORY_REF}" ]; then
 
   logmessage ""
 
-  cp -R $repository_path/manifests $manifests_path
+  # In containers we cannot delete the base path so we need to copy inside
+  for dir in $repository_path/manifests/*/  $repository_path/manifests/.*/; do
+    [ -d "$dir" ] || continue
+    [[ "$dir" == */. || "$dir" == */.. ]] && continue
+    cp -R "$dir" $manifests_path/
+  done
 
   ln -s $manifests_path /home/ec2-user/environment/eks-workshop
 fi

lab/scripts/setup.sh

@@ -30,9 +30,28 @@ EOT
 
 touch ~/.bashrc.d/workshop-env.bash
 
+REPOSITORY_OWNER=${REPOSITORY_OWNER:-"aws-samples"}
+REPOSITORY_NAME=${REPOSITORY_NAME:-"eks-workshop-v2"}
+REPOSITORY_REF=${REPOSITORY_REF:-"main"}
+
 cat << EOT > /home/ec2-user/.bashrc.d/aliases.bash
 function prepare-environment() {
   start_time=\$(date +%s)
+
+  if [[ "\$1" == fastpaths/* ]]; then
+    cluster_name="\$EKS_CLUSTER_AUTO_NAME"
+    create_cmd="create-cluster-auto"
+  else
+    cluster_name="\$EKS_CLUSTER_NAME"
+    create_cmd="create-cluster"
+  fi
+
+  if ! aws eks describe-cluster --name "\$cluster_name" --no-cli-pager &>/dev/null; then
+    echo "Error: EKS cluster '\$cluster_name' does not exist."
+    echo "Please create it first by running: \$create_cmd"
+    return 1
+  fi
+
   bash /usr/local/bin/reset-environment \$1
   exit_code=\$?
   source ~/.bashrc.d/workshop-env.bash
@@ -41,13 +60,12 @@ function prepare-environment() {
 }
 
 function use-cluster() { bash /usr/local/bin/use-cluster \$1; source ~/.bashrc.d/env.bash; }
-function create-cluster() { URL=https://raw.githubusercontent.com/${REPOSITORY_OWNER}/${REPOSITORY_NAME}/refs/heads/${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Creating cluster with eksctl from $URL"; curl -fsSL $URL | envsubst | eksctl create cluster -f -; }
-function create-cluster-auto() { URL=https://raw.githubusercontent.com/${REPOSITORY_OWNER}/${REPOSITORY_NAME}/refs/heads/${REPOSITORY_REF}/cluster/eksctl/cluster-auto.yaml; echo "Creating cluster with eksctl from $URL"; curl -fsSL $URL | envsubst | eksctl create cluster -f -; }
+function create-cluster() { URL=https://raw.githubusercontent.com/\${REPOSITORY_OWNER}/\${REPOSITORY_NAME}/refs/heads/\${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Creating cluster with eksctl from \$URL"; curl -fsSL \$URL | envsubst | eksctl create cluster -f -; }
+function create-cluster-auto() { URL=https://raw.githubusercontent.com/\${REPOSITORY_OWNER}/\${REPOSITORY_NAME}/refs/heads/\${REPOSITORY_REF}/cluster/eksctl/cluster-auto.yaml; echo "Creating cluster with eksctl from \$URL"; curl -fsSL \$URL | envsubst | eksctl create cluster -f -; }
+function delete-cluster() { URL=https://raw.githubusercontent.com/\${REPOSITORY_OWNER}/\${REPOSITORY_NAME}/refs/heads/\${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Creating cluster with eksctl from \$URL"; curl -fsSL \$URL | envsubst | eksctl delete cluster -f -; }
+function delete-cluster-auto() { URL=https://raw.githubusercontent.com/\${REPOSITORY_OWNER}/\${REPOSITORY_NAME}/refs/heads/\${REPOSITORY_REF}/cluster/eksctl/cluster-auto.yaml; echo "Creating cluster with eksctl from \$URL"; curl -fsSL \$URL | envsubst | eksctl delete cluster -f -; }
 EOT
 
-REPOSITORY_OWNER=${REPOSITORY_OWNER:-"aws-samples"}
-REPOSITORY_NAME=${REPOSITORY_NAME:-"eks-workshop-v2"}
-
 if [ ! -z "$REPOSITORY_REF" ]; then
   cat << EOT > ~/.bashrc.d/repository.bash
 export REPOSITORY_OWNER='${REPOSITORY_OWNER}'