WIP

Author: Yuriy Bezsonov

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

@@ -422,18 +422,22 @@ public Ide(final Construct scope, final String id, final IdeProps props) {
             .build();
         waitCondition.getNode().addDependency(ec2InstanceResource);
 
-        // Outputs
-        CfnOutput.Builder.create(this, "IdeUrl")
+        // CloudFront doesn't need to wait for bootstrap - it's just infrastructure
+
+        // Outputs - these should only be created if bootstrap succeeds
+        var ideUrlOutput = CfnOutput.Builder.create(this, "IdeUrl")
             .value("https://" + distribution.getDistributionDomainName())
             .description("Workshop IDE Url")
             .exportName(instanceName + "-url")
             .build();
+        ideUrlOutput.getNode().addDependency(waitCondition);
 
-        CfnOutput.Builder.create(this, "IdePassword")
+        var idePasswordOutput = CfnOutput.Builder.create(this, "IdePassword")
             .value(ideSecretsManagerPassword.secretValueFromJson("password").unsafeUnwrap())
             .description("Workshop IDE Password")
             .exportName(instanceName + "-password")
             .build();
+        idePasswordOutput.getNode().addDependency(waitCondition);
     }
 
     public SecurityGroup getIdeSecurityGroup() {

infra/scripts/ide/bootstrap.sh

@@ -53,10 +53,10 @@ retry_critical() { retry_command 5 5 "FAIL" "$@"; }
 retry_optional() { retry_command 5 5 "LOG" "$@"; }
 
 echo "Updating system packages..."
-dnf update -y
+sudo dnf update -y
 
 echo "Installing jq (required for secret parsing)..."
-dnf install -y jq
+sudo dnf install -y jq
 
 echo "Installing AWS CLI..."
 retry_critical "curl -LSsf -o /tmp/aws-cli.zip https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip && unzip -q -d /tmp /tmp/aws-cli.zip && /tmp/aws/install --update && rm -rf /tmp/aws*"

infra/workshop-template.yaml

@@ -719,30 +719,6 @@ Resources:
         Fn::GetAtt:
           - IdeInstanceLauncherFunction803C5A2A
           - Arn
-      InstanceName: ide
-      IamInstanceProfileArn:
-        Fn::GetAtt:
-          - IdeIdeInstanceProfile8BD997EA
-          - Arn
-      VolumeSize: "50"
-      SubnetIds:
-        Fn::Join:
-          - ""
-          - - Ref: VpcWorkshopVpcPublicSubnet1SubnetBCB45C45
-            - ","
-            - Ref: VpcWorkshopVpcPublicSubnet2SubnetF8F9426F
-      SecurityGroupIds:
-        Fn::Join:
-          - ""
-          - - Fn::GetAtt:
-                - IdeIdeSecurityGroup5C503C8A
-                - GroupId
-            - ","
-            - Fn::GetAtt:
-                - IdeIdeInternalSecurityGroupD5D3B421
-                - GroupId
-      ImageId:
-        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
       UserData:
         Fn::Base64:
           Fn::Join:
@@ -862,6 +838,30 @@ Resources:
                     exit 1
                 fi
       InstanceTypes: m5.xlarge,m6i.xlarge,t3.xlarge
+      InstanceName: ide
+      IamInstanceProfileArn:
+        Fn::GetAtt:
+          - IdeIdeInstanceProfile8BD997EA
+          - Arn
+      VolumeSize: "50"
+      SubnetIds:
+        Fn::Join:
+          - ""
+          - - Ref: VpcWorkshopVpcPublicSubnet1SubnetBCB45C45
+            - ","
+            - Ref: VpcWorkshopVpcPublicSubnet2SubnetF8F9426F
+      SecurityGroupIds:
+        Fn::Join:
+          - ""
+          - - Fn::GetAtt:
+                - IdeIdeSecurityGroup5C503C8A
+                - GroupId
+            - ","
+            - Fn::GetAtt:
+                - IdeIdeInternalSecurityGroupD5D3B421
+                - GroupId
+      ImageId:
+        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
     UpdateReplacePolicy: Delete
     DeletionPolicy: Delete
   IdeIdeEipAssociation6C6C215D:
@@ -1371,13 +1371,13 @@ Resources:
         Fn::GetAtt:
           - CodeBuildStartLambdaFunction8349284F
           - Arn
+      ContentHash: "1765685570178"
       ProjectName:
         Ref: CodeBuildProjectA0FF5539
       CodeBuildIamRoleArn:
         Fn::GetAtt:
           - CodeBuildCodeBuildRoleBA9C6D5C
           - Arn
-      ContentHash: "1765684594106"
     DependsOn:
       - CodeBuildBuildCompleteRuleAllowEventRuleWorkshopStackCodeBuildReportLambdaFunctionD77C6091DA4A4BD8
       - CodeBuildBuildCompleteRule06AAF17D