Lambda fix for CDK

Author: smoell

infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreStack.java

@@ -30,9 +30,7 @@ public class UnicornStoreStack extends Stack {
         sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
 
         echo '=== Additional Setup ===\n'
-        echo '===== whoami =====\n'
-        whoami
-        echo '\n'
+
         echo '=== Checking directory ===\n'
         sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/app.sh"
         sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
@@ -69,9 +67,14 @@ public UnicornStoreStack(final Construct scope, final String id) {
         // Create VPC
         var vpc = new WorkshopVpc(this, "UnicornStoreVpc", "unicornstore-vpc").getVpc();
 
+        String bootstrapScriptWithRegion = bootstrapScript + String.format(
+                "sudo -H -i -u ec2-user bash -c \"cd ~/java-on-aws/infrastructure/lambda/ && ./build-and-deploy.sh --region %s\"",
+                this.getRegion()
+        );
+
         // Create VSCode IDE
         var ideProps = new VSCodeIdeProps();
-            ideProps.setBootstrapScript(bootstrapScript);
+            ideProps.setBootstrapScript(bootstrapScriptWithRegion);
             ideProps.setVpc(vpc);
             ideProps.setInstanceName("unicornstore-ide");
             ideProps.setInstanceType(InstanceType.of(InstanceClass.M5, InstanceSize.XLARGE));

infrastructure/scripts/setup/monitoring.sh

@@ -10,7 +10,16 @@ log() {
 NAMESPACE="monitoring"
 GRAFANA_SECRET_NAME="grafana-admin"
 GRAFANA_USER="admin"
-GRAFANA_PASSWORD="$(openssl rand -base64 16 | tr -d '\n')"
+
+source /etc/profile.d/workshop.sh
+
+# Use IDE_PASSWORD if set; otherwise generate random Grafana password
+if [ -z "$IDE_PASSWORD" ]; then
+  echo "⚠️  Warning: GRAFANA_PASSWORD is not set via IDE_PASSWORD. A random password will be generated."
+  GRAFANA_PASSWORD="$(openssl rand -base64 16 | tr -d '\n')"
+else
+  GRAFANA_PASSWORD="$IDE_PASSWORD"
+fi
 
 VALUES_FILE="prometheus-values.yaml"
 EXTRA_SCRAPE_FILE="extra-scrape-configs.yaml"