fix: PR review fixes for fastpaths and auto mode cluster support

- SecondaryNav: fix dual active highlighting when Intro and Setup share a path prefix
- create-infrastructure.sh: fix auto cluster condition checking 'standard' instead of 'auto'
- destroy-infrastructure.sh: fix auto cluster name override that diverged from common-env.sh with environment suffix
- setup.sh: fix delete-cluster functions echoing 'Creating' instead of 'Deleting'
- base.tf: auto-detect auto mode cluster via ListClusters API instead of unconditional lookup that fails when cluster doesn't exist
- navigating-labs.md: remove confusing prepare-environment section with placeholder vars, add 'Starting a Lab' tip, constrain oversized browser dialog images, remove duplicated Kustomize section
- introduction/navigating-labs.md: constrain oversized browser dialog image
- fastpaths/index.md: fix intro text to match sidebar order and correctly reference setup for both event and in-your-account flows
- getting-started/first.md: fix expected namespace output to match actual state (no pre-provisioned namespaces)

Author: svennam92

hack/create-infrastructure.sh

@@ -29,7 +29,7 @@ fi
 auto_cluster_exists=0
 aws eks describe-cluster --name "${EKS_CLUSTER_AUTO_NAME}" &> /dev/null || auto_cluster_exists=$?
 
-if [ $auto_cluster_exists -ne 0 ] && [[ "$cluster" == "standard" || "$cluster" == "all" ]]; then
+if [ $auto_cluster_exists -ne 0 ] && [[ "$cluster" == "auto" || "$cluster" == "all" ]]; then
   echo "Creating auto mode cluster ${EKS_CLUSTER_AUTO_NAME}"
   bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster-auto.yaml /cluster/eksctl/access-entries.yaml | envsubst | eksctl create cluster -f -'&
 else

hack/destroy-infrastructure.sh

@@ -22,7 +22,7 @@ else
   echo "Cluster ${EKS_CLUSTER_NAME} does not exist or skipped"
 fi
 
-export EKS_CLUSTER_AUTO_NAME="${EKS_CLUSTER_NAME}-auto"
+export EKS_CLUSTER_AUTO_NAME="${EKS_CLUSTER_AUTO_NAME}"
 auto_cluster_exists=0
 aws eks describe-cluster --name "${EKS_CLUSTER_AUTO_NAME}" &> /dev/null || auto_cluster_exists=$?
 

lab/scripts/setup.sh

@@ -62,8 +62,8 @@ 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 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 -; }
+function delete-cluster() { URL=https://raw.githubusercontent.com/\${REPOSITORY_OWNER}/\${REPOSITORY_NAME}/refs/heads/\${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Deleting 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 "Deleting cluster with eksctl from \$URL"; curl -fsSL \$URL | envsubst | eksctl delete cluster -f -; }
 EOT
 
 if [ ! -z "$REPOSITORY_REF" ]; then

manifests/.workshop/terraform/base.tf

@@ -56,6 +56,8 @@ data "aws_partition" "current" {}
 data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
+data "aws_eks_clusters" "available" {}
+
 data "aws_eks_cluster" "eks_cluster" {
   name = var.eks_cluster_id
 }
@@ -64,11 +66,17 @@ data "aws_eks_cluster_auth" "this" {
   name = var.eks_cluster_id
 }
 
+locals {
+  auto_cluster_exists = contains(data.aws_eks_clusters.available.names, var.eks_cluster_auto_id)
+}
+
 data "aws_eks_cluster" "eks_cluster_auto" {
-  name = var.eks_cluster_auto_id
+  count = local.auto_cluster_exists ? 1 : 0
+  name  = var.eks_cluster_auto_id
 }
 data "aws_eks_cluster_auth" "this_auto" {
-  name = var.eks_cluster_auto_id
+  count = local.auto_cluster_exists ? 1 : 0
+  name  = var.eks_cluster_auto_id
 }
 
 provider "aws" {
@@ -85,9 +93,9 @@ provider "kubernetes" {
 
 provider "kubernetes" {
   alias                  = "auto_mode"
-  host                   = data.aws_eks_cluster.eks_cluster_auto.endpoint
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.eks_cluster_auto.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.this_auto.token
+  host                   = try(data.aws_eks_cluster.eks_cluster_auto[0].endpoint, "https://localhost")
+  cluster_ca_certificate = try(base64decode(data.aws_eks_cluster.eks_cluster_auto[0].certificate_authority[0].data), "")
+  token                  = try(data.aws_eks_cluster_auth.this_auto[0].token, "")
 }
 
 provider "helm" {
@@ -101,9 +109,9 @@ provider "helm" {
 provider "helm" {
   alias = "auto_mode"
   kubernetes {
-    host                   = data.aws_eks_cluster.eks_cluster_auto.endpoint
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.eks_cluster_auto.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.this_auto.token
+    host                   = try(data.aws_eks_cluster.eks_cluster_auto[0].endpoint, "https://localhost")
+    cluster_ca_certificate = try(base64decode(data.aws_eks_cluster.eks_cluster_auto[0].certificate_authority[0].data), "")
+    token                  = try(data.aws_eks_cluster_auth.this_auto[0].token, "")
   }
 }
 

website/docs/fastpaths/getting-started/first.md

@@ -23,21 +23,18 @@ Before we do anything, let's inspect the current Namespaces in our EKS cluster:
 
 ```bash
 $ kubectl get namespaces
-NAME                STATUS   AGE
-amazon-cloudwatch   Active   30h
-default             Active   30h
-external-secrets    Active   30h
-kube-node-lease     Active   30h
-kube-public         Active   30h
-kube-system         Active   30h
-ui                  Active   30h
+NAME              STATUS   AGE
+default           Active   30h
+kube-node-lease   Active   30h
+kube-public       Active   30h
+kube-system       Active   30h
 ```
 
-All of the entries listed are Namespaces for system components that were pre-installed for us. We'll ignore most of these by using [Kubernetes labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to filter the Namespaces down to only those we've created:
+All of the entries listed are Namespaces for system components. We'll use [Kubernetes labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to filter the Namespaces down to only those we've created:
 
 ```bash
 $ kubectl get namespaces -l app.kubernetes.io/created-by=eks-workshop
-ui         Active   21h
+No resources found
 ```
 
 The first thing we'll do is deploy the catalog component by itself. The manifests for this component can be found in `~/environment/eks-workshop/base-application/catalog`.

website/docs/fastpaths/index.md

@@ -13,10 +13,10 @@ Streamlined, role-based learning experiences that get you hands-on with Amazon E
 
 As you can see in the picture, you can choose your learning journey for this workshop as per the following steps:
 
-1. Learn how to navigate the instructions in the lab using _Navigating the Labs_ module to begin with.
-2. [Skip if you're at an AWS Event] : Setup an EKS Auto Mode cluster to use the learning paths.
+1. **[Setup](/docs/fastpaths/setup)** your environment — whether you're at an AWS event or running this in your own account, follow the setup guide to get your IDE and cluster ready.
+2. Learn how to navigate the instructions in the lab using the [Navigating the Labs](/docs/fastpaths/navigating-labs) module.
 3. Based on your role and interest, either choose the EKS developer or the EKS operator path for further learning.
 
 Powered by Amazon EKS Auto Mode, these paths minimize infrastructure setup and management, letting you focus on learning core EKS concepts and deploying workloads faster. Perfect for workshops, events, or self-paced learning when you want immediate hands-on experience.
 
-Let's understand how to navigate this workshop and the lab instructions now.
+Let's get your environment set up!

website/docs/fastpaths/navigating-labs.md

@@ -23,21 +23,10 @@ If you haven't done so yet, you can open the IDE from the *Event outputs* sectio
 
  ![Event Outputs copy/paste](/img/fastpaths/ide-open.png)
 
-## Prepare Environment
-
-The `prepare-environment` tool helps you set up and configure your lab environment for each section. Simply run:
-
-```
-$ prepare-environment $MODULE_NAME
-```
-
-### Basic Usage Patterns
-```
-$ prepare-environment $MODULE_NAME/$LAB
-```
+## Starting a Lab
 
 :::caution
-You should start each lab from the page indicated by "BEFORE YOU START" badge. Starting in the middle of a lab will cause unpredictable behavior.
+Each lab has a "BEFORE YOU START" section with a `prepare-environment` command you need to run first. Always start from that page — jumping into the middle of a lab will cause unpredictable behavior.
 :::
 
 ## Tips
@@ -49,18 +38,18 @@ Depending on your browser, you may need to copy/paste content differently in to
   <TabItem value="Google Chrome" label="Google Chrome (Recommended)" default>
     First time when you try to paste content in the terminal, you will see a browser pop-up that looks like this:
 
-    ![Chrome copy/paste](/docs/introduction/vscode-copy-paste.webp)
+    <img src="/docs/introduction/vscode-copy-paste.webp" alt="Chrome copy/paste" width="480" />
 
     Click **Allow** button to enable this functionality. After this, the subsequent copy/paste will be straight forward. For this workshop, we recommend using Google Chrome if possible.
   </TabItem>
   <TabItem value="Firefox/Safari" label="Firefox/Safari">
     Every time when you try to paste content in the terminal, you will see a small button as shown in the following screenshot adjacent to your mouse pointer. You will need to click on it to actually paste the copied content. 
 
-    ![Firefox/Safari copy/paste](/img/fastpaths/introduction/paste-in-firefox-safari.png)
+    <img src="/img/fastpaths/introduction/paste-in-firefox-safari.png" alt="Firefox/Safari copy/paste" width="480" />
 
     Additionally, you may also see the following pop-up box on the bottom-right corner of your editor window, which you may close and ignore. 
 
-    ![Firefox/Safari copy/paste](/img/fastpaths/introduction/paste-warning-in-firefox-safari.png)
+    <img src="/img/fastpaths/introduction/paste-warning-in-firefox-safari.png" alt="Firefox/Safari copy/paste" width="480" />
   </TabItem>
 </Tabs>
 
@@ -106,18 +95,6 @@ In this workshop, you will see the following two types of commands involving Kus
 
 You can learn more about Kustomize at https://kustomize.io/.
 
-### Using Kustomize
-
-[Kustomize](https://kustomize.io/) allows you to manage Kubernetes manifest files using declarative "kustomization" files. It provides the ability to express "base" manifests for your Kubernetes resources and then apply changes using composition, customization and easily making cross-cutting changes across many resources.
-
-In this workshop, you will see the following two types of commands involving Kustomize.
-
-1. `kubectl kustomize some-deployment.yaml` - This command **generates** the customized version of the yaml using Kustomize configuration. It does not deploy the resource.
-
-1. `kubectl apply -k some-deployment.yaml` - This command directly **applies** the customized version of the yaml using Kustomize configuration and deploys the resource.
-
-You can learn more about Kustomize at https://kustomize.io/.
-
 ## Next Steps
 
 Now that you're familiar with the format of this workshop, head over to Getting started

website/docs/introduction/navigating-labs.md

@@ -68,7 +68,7 @@ $ prepare-environment
 ### Copy/Paste Permission
 Depending on your browser the first time you copy/paste content in to the VSCode terminal you may be presented with a prompt that looks like this:
 
-![VSCode copy/paste](/docs/introduction/vscode-copy-paste.webp)
+<img src="/docs/introduction/vscode-copy-paste.webp" alt="VSCode copy/paste" width="480" />
 ### Terminal commands
 
 Most of the interaction you will do in this workshop will be done with terminal commands, which you can either manually type or copy/paste to the IDE terminal. You will see this terminal commands displayed like this:

website/src/components/SecondaryNav/index.js

@@ -44,7 +44,16 @@ export default function SecondaryNav() {
       <div className={styles.secondaryNavContainer}>
         <div className={styles.navSection}>
           {eksGroup.items.map((item, i) => {
-            const isActive = location.pathname.startsWith(item.to);
+            const normalizedTo = item.to.replace(/\/+$/, '');
+            const normalizedPath = location.pathname.replace(/\/+$/, '');
+            const isActive = normalizedPath === normalizedTo || 
+              (normalizedPath.startsWith(normalizedTo + '/') && 
+               !eksGroup.items.some(other => {
+                 const otherTo = other.to.replace(/\/+$/, '');
+                 return otherTo !== normalizedTo && 
+                        otherTo.startsWith(normalizedTo + '/') && 
+                        normalizedPath.startsWith(otherTo);
+               }));
             return (
               <Link key={i} to={item.to} className={isActive ? styles.activeLink : ''}>{item.label}</Link>
             );
@@ -62,7 +71,16 @@ export default function SecondaryNav() {
       <div className={styles.secondaryNavContainer}>
         <div className={styles.navSection}>
           {autoModeGroup.items.map((item, i) => {
-            const isActive = location.pathname.startsWith(item.to);
+            const normalizedTo = item.to.replace(/\/+$/, '');
+            const normalizedPath = location.pathname.replace(/\/+$/, '');
+            const isActive = normalizedPath === normalizedTo || 
+              (normalizedPath.startsWith(normalizedTo + '/') && 
+               !autoModeGroup.items.some(other => {
+                 const otherTo = other.to.replace(/\/+$/, '');
+                 return otherTo !== normalizedTo && 
+                        otherTo.startsWith(normalizedTo + '/') && 
+                        normalizedPath.startsWith(otherTo);
+               }));
             return (
               <Link key={i} to={item.to} className={isActive ? styles.activeLink : ''}>{item.label}</Link>
             );