WIP

Author: Yuriy Bezsonov

infra/cdk/src/main/java/sample/com/constructs/CodeBuild.java

@@ -133,12 +133,12 @@ public CodeBuild(final Construct scope, final String id, final CodeBuildProps pr
 
         // Create start build Lambda function
         var startLambda = new Lambda(this, "StartLambda",
-            "/lambda/codebuild-start.py", Aws.STACK_NAME + "-codebuild-start", Duration.minutes(2), lambdaRole);
+            "/lambda/codebuild-start.py", "ide-codebuild-start", Duration.minutes(2), lambdaRole);
         Function startBuildFunction = startLambda.getFunction();
 
         // Create report build Lambda function
         var reportLambda = new Lambda(this, "ReportLambda",
-            "/lambda/codebuild-report.py", Aws.STACK_NAME + "-codebuild-report", Duration.minutes(2), lambdaRole);
+            "/lambda/codebuild-report.py", "ide-codebuild-report", Duration.minutes(2), lambdaRole);
         Function reportBuildFunction = reportLambda.getFunction();
 
         // Create EventBridge rule for build completion

infra/scripts/ide/base.sh

@@ -55,16 +55,14 @@ handle_error() {
     exit 1
 }
 
-# Helper function for download verification
+# Helper function for download verification with retry
 download_and_verify() {
     local url="$1"
     local output="$2"
     local description="$3"
 
     log_info "Downloading $description..."
-    if ! wget -q "$url" -O "$output"; then
-        handle_error "Failed to download $description from $url"
-    fi
+    retry_critical "wget -q '$url' -O '$output'"
 }
 
 cd /tmp
@@ -97,9 +95,7 @@ install_nodejs() {
     log_info "Installing Node.js ${NODE_VERSION} and tools..."
 
     # Install NVM
-    if ! curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash; then
-        handle_error "Failed to install NVM"
-    fi
+    retry_critical "curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash"
 
     # Setup NVM environment
     export NVM_DIR="$HOME/.nvm"
@@ -128,9 +124,7 @@ install_maven() {
     local mvn_filename=apache-maven-${MAVEN_VERSION}-bin.tar.gz
     local mvn_url="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${mvn_filename}"
 
-    if ! curl -sS -4 -L "$mvn_url" | tar -xz; then
-        handle_error "Failed to download and extract Maven"
-    fi
+    retry_critical "curl -sS -4 -L '$mvn_url' | tar -xz"
 
     sudo mv "$mvn_foldername" /usr/lib/maven
     echo "export M2_HOME=/usr/lib/maven" | sudo tee -a /etc/profile.d/workshop.sh >/dev/null
@@ -181,9 +175,7 @@ install_kubernetes_tools() {
     # log_info "eksctl version: $(eksctl version)"
 
     log_info "Installing Helm ${HELM_VERSION}..."
-    if ! curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3; then
-        handle_error "Failed to download Helm installer"
-    fi
+    retry_critical "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 --version v${HELM_VERSION}
     helm completion bash >> ~/.bash_completion
@@ -195,14 +187,10 @@ install_kubernetes_tools() {
     sudo mv eks-node-viewer /usr/local/bin
 
     log_info "Installing k9s..."
-    if ! curl -sS https://webinstall.dev/k9s | bash; then
-        echo "Warning: k9s installation failed, continuing..."
-    fi
+    retry_optional "curl -sS https://webinstall.dev/k9s | bash"
 
     log_info "Installing e1s..."
-    if ! curl -sL https://raw.githubusercontent.com/keidarcy/e1s-install/master/cloudshell-install.sh | bash; then
-        echo "Warning: e1s installation failed, continuing..."
-    fi
+    retry_optional "curl -sL https://raw.githubusercontent.com/keidarcy/e1s-install/master/cloudshell-install.sh | bash"
 }
 
 install_kubernetes_tools

infra/workshop-template.yaml

@@ -1238,11 +1238,7 @@ Resources:
                   responseData = {'Error': tb_err}
 
               cfnresponse.send(event, context, status, responseData, physical_id)
-      FunctionName:
-        Fn::Join:
-          - ""
-          - - Ref: AWS::StackName
-            - -codebuild-start
+      FunctionName: ide-codebuild-start
       Handler: index.lambda_handler
       Role:
         Fn::GetAtt:
@@ -1308,11 +1304,7 @@ Resources:
                           'error': str(e)
                       })
                   }
-      FunctionName:
-        Fn::Join:
-          - ""
-          - - Ref: AWS::StackName
-            - -codebuild-report
+      FunctionName: ide-codebuild-report
       Handler: index.lambda_handler
       Role:
         Fn::GetAtt:
@@ -1372,7 +1364,7 @@ Resources:
         Fn::GetAtt:
           - CodeBuildCodeBuildRoleBA9C6D5C
           - Arn
-      ContentHash: "1765688713844"
+      ContentHash: "1765690723450"
     DependsOn:
       - CodeBuildBuildCompleteRuleAllowEventRuleWorkshopStackCodeBuildReportLambdaFunctionD77C6091DA4A4BD8
       - CodeBuildBuildCompleteRule06AAF17D