WIP

Author: Yuriy Bezsonov

.kiro/specs/infra/debugging-notes.md

@@ -0,0 +1,62 @@
+# Java-on-AWS Deployment Guide
+
+## Generate Templates
+```bash
+cd infra
+TEMPLATE_TYPE=java-on-aws npm run generate
+```
+
+## Deploy Stack
+```bash
+aws cloudformation deploy \
+  --template-file cfn/java-on-aws-stack.yaml \
+  --stack-name workshop-stack \
+  --capabilities CAPABILITY_IAM \
+  --parameter-overrides \
+    ParameterKey=ParameterName,ParameterValue=Value
+```
+
+## Test & Debug
+
+### Get Stack Outputs
+```bash
+source .env
+aws cloudformation describe-stacks --stack-name workshop-stack --query 'Stacks[0].Outputs'
+```
+
+### Check Bootstrap Logs
+```bash
+source .env
+# Find log group (format: ide-bootstrap-YYYYMMDD-HHMMSS)
+aws logs describe-log-groups --log-group-name-prefix "ide-bootstrap"
+
+# Get logs
+aws logs get-log-events \
+  --log-group-name "ide-bootstrap-YYYYMMDD-HHMMSS" \
+  --log-stream-name "i-instanceid" \
+  --start-from-head --output text
+```
+
+### Check EKS Cluster
+```bash
+source .env
+aws eks describe-cluster --name workshop-cluster
+kubectl get nodes
+kubectl get pods -A
+```
+
+### Verify Database
+```bash
+source .env
+aws rds describe-db-clusters --db-cluster-identifier workshop-db-cluster
+aws secretsmanager get-secret-value --secret-id workshop-db-secret
+```
+
+## Git Workflow
+```bash
+git add .
+git commit -m "Update infrastructure"
+git push origin new-ws-infra
+```
+
+**Note**: Always `source .env` first for AWS CLI access with proper credentials.

.kiro/specs/infra/deployment-guide.md

@@ -20,7 +20,6 @@ public class WorkshopStack extends Stack {
               - |
                 aws --version
                 echo "Environment Variables:"
-                echo "STACK_NAME: $STACK_NAME"
                 echo "TEMPLATE_TYPE: $TEMPLATE_TYPE"
                 echo "GIT_BRANCH: $GIT_BRANCH"
           build:
@@ -61,7 +60,6 @@ public WorkshopStack(final Construct scope, final String id, final StackProps pr
                 .projectName("workshop-setup")
                 .vpc(vpc.getVpc())
                 .environmentVariables(Map.of(
-                    "STACK_NAME", Aws.STACK_NAME,
                     "TEMPLATE_TYPE", templateType,
                     "GIT_BRANCH", gitBranch))
                 .buildSpec(buildSpec)

infra/cdk/src/main/java/sample/com/WorkshopStack.java

@@ -255,7 +255,6 @@ public Ide(final Construct scope, final String id, final IdeProps props) {
         String userDataTemplate = loadFile("/userdata.sh");
         String userDataContent = userDataTemplate
             .replace("${GIT_BRANCH}", gitBranch)
-            .replace("${STACK_NAME}", Aws.STACK_NAME)
             .replace("${AWS_REGION}", Aws.REGION)
             .replace("${TEMPLATE_TYPE}", templateType)
             .replace("${WAIT_CONDITION_HANDLE_URL}", waitHandle.getRef());

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

@@ -6,7 +6,6 @@ set -e
 
 # Configuration from CDK
 export GIT_BRANCH="${GIT_BRANCH}"
-export STACK_NAME="${STACK_NAME}"
 export AWS_REGION="${AWS_REGION}"
 export TEMPLATE_TYPE="${TEMPLATE_TYPE}"
 export WAIT_CONDITION_HANDLE_URL="${WAIT_CONDITION_HANDLE_URL}"
@@ -95,7 +94,7 @@ if clone_repository; then
 
     echo "Executing full bootstrap script..."
     # Run bootstrap script as root from the cloned directory
-    if cd /home/ec2-user/java-on-aws && WAIT_CONDITION_HANDLE_URL="${WAIT_CONDITION_HANDLE_URL}" infra/scripts/ide/bootstrap.sh "$GIT_BRANCH" "$STACK_NAME" "$TEMPLATE_TYPE"; then
+    if cd /home/ec2-user/java-on-aws && WAIT_CONDITION_HANDLE_URL="${WAIT_CONDITION_HANDLE_URL}" infra/scripts/ide/bootstrap.sh "$GIT_BRANCH" "$TEMPLATE_TYPE"; then
         echo "Bootstrap completed successfully"
         # Bootstrap script already signaled success
     else

infra/cdk/src/main/resources/userdata.sh

@@ -714,7 +714,25 @@ Resources:
         Fn::GetAtt:
           - IdeInstanceLauncherFunction803C5A2A
           - Arn
-      InstanceTypes: m5.xlarge,m6i.xlarge,t3.xlarge
+      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:
@@ -729,10 +747,6 @@ Resources:
 
                 # Configuration from CDK
                 export GIT_BRANCH="new-ws-infra"
-                export STACK_NAME="
-              - Ref: AWS::StackName
-              - |-
-                "
                 export AWS_REGION="
               - Ref: AWS::Region
               - |-
@@ -833,7 +847,7 @@ Resources:
                     if cd /home/ec2-user/java-on-aws && WAIT_CONDITION_HANDLE_URL="
               - Ref: IdeBootstrapWaitConditionHandleD7141CA8
               - |-
-                " infra/scripts/ide/bootstrap.sh "$GIT_BRANCH" "$STACK_NAME" "$TEMPLATE_TYPE"; then
+                " infra/scripts/ide/bootstrap.sh "$GIT_BRANCH" "$TEMPLATE_TYPE"; then
                         echo "Bootstrap completed successfully"
                         # Bootstrap script already signaled success
                     else
@@ -852,30 +866,12 @@ Resources:
                 "
                     exit 1
                 fi
-      ImageId:
-        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
-      SecurityGroupIds:
-        Fn::Join:
-          - ""
-          - - Fn::GetAtt:
-                - IdeIdeSecurityGroup5C503C8A
-                - GroupId
-            - ","
-            - Fn::GetAtt:
-                - IdeIdeInternalSecurityGroupD5D3B421
-                - GroupId
-      SubnetIds:
-        Fn::Join:
-          - ""
-          - - Ref: VpcWorkshopVpcPublicSubnet1SubnetBCB45C45
-            - ","
-            - Ref: VpcWorkshopVpcPublicSubnet2SubnetF8F9426F
-      VolumeSize: "50"
+      InstanceTypes: m5.xlarge,m6i.xlarge,t3.xlarge
+      InstanceName: ide
       IamInstanceProfileArn:
         Fn::GetAtt:
           - IdeIdeInstanceProfile8BD997EA
           - Arn
-      InstanceName: ide
     UpdateReplacePolicy: Delete
     DeletionPolicy: Delete
   IdeIdeEipAssociation6C6C215D:
@@ -1251,10 +1247,6 @@ Resources:
           - Name: TEMPLATE_TYPE
             Type: PLAINTEXT
             Value: base
-          - Name: STACK_NAME
-            Type: PLAINTEXT
-            Value:
-              Ref: AWS::StackName
         Image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: false
@@ -1275,7 +1267,6 @@ Resources:
                 - |
                   aws --version
                   echo "Environment Variables:"
-                  echo "STACK_NAME: $STACK_NAME"
                   echo "TEMPLATE_TYPE: $TEMPLATE_TYPE"
                   echo "GIT_BRANCH: $GIT_BRANCH"
             build:
@@ -1498,13 +1489,13 @@ Resources:
         Fn::GetAtt:
           - CodeBuildStartLambdaFunction8349284F
           - Arn
-      ContentHash: "1765709885426"
+      ProjectName:
+        Ref: CodeBuildProjectA0FF5539
       CodeBuildIamRoleArn:
         Fn::GetAtt:
           - CodeBuildCodeBuildRoleBA9C6D5C
           - Arn
-      ProjectName:
-        Ref: CodeBuildProjectA0FF5539
+      ContentHash: "1765710511221"
     DependsOn:
       - CodeBuildBuildCompleteRuleAllowEventRuleWorkshopStackCodeBuildReportLambdaFunctionD77C6091DA4A4BD8
       - CodeBuildBuildCompleteRule06AAF17D

infra/cfn/base-stack.yaml

@@ -734,6 +734,18 @@ Resources:
         Fn::GetAtt:
           - IdeInstanceLauncherFunction803C5A2A
           - Arn
+      ImageId:
+        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
+      SecurityGroupIds:
+        Fn::Join:
+          - ""
+          - - Fn::GetAtt:
+                - IdeIdeSecurityGroup5C503C8A
+                - GroupId
+            - ","
+            - Fn::GetAtt:
+                - IdeIdeInternalSecurityGroupD5D3B421
+                - GroupId
       SubnetIds:
         Fn::Join:
           - ""
@@ -761,10 +773,6 @@ Resources:
 
                 # Configuration from CDK
                 export GIT_BRANCH="new-ws-infra"
-                export STACK_NAME="
-              - Ref: AWS::StackName
-              - |-
-                "
                 export AWS_REGION="
               - Ref: AWS::Region
               - |-
@@ -865,7 +873,7 @@ Resources:
                     if cd /home/ec2-user/java-on-aws && WAIT_CONDITION_HANDLE_URL="
               - Ref: IdeBootstrapWaitConditionHandleD7141CA8
               - |-
-                " infra/scripts/ide/bootstrap.sh "$GIT_BRANCH" "$STACK_NAME" "$TEMPLATE_TYPE"; then
+                " infra/scripts/ide/bootstrap.sh "$GIT_BRANCH" "$TEMPLATE_TYPE"; then
                         echo "Bootstrap completed successfully"
                         # Bootstrap script already signaled success
                     else
@@ -884,18 +892,6 @@ Resources:
                 "
                     exit 1
                 fi
-      ImageId:
-        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
-      SecurityGroupIds:
-        Fn::Join:
-          - ""
-          - - Fn::GetAtt:
-                - IdeIdeSecurityGroup5C503C8A
-                - GroupId
-            - ","
-            - Fn::GetAtt:
-                - IdeIdeInternalSecurityGroupD5D3B421
-                - GroupId
     UpdateReplacePolicy: Delete
     DeletionPolicy: Delete
   IdeIdeEipAssociation6C6C215D:
@@ -1271,10 +1267,6 @@ Resources:
           - Name: GIT_BRANCH
             Type: PLAINTEXT
             Value: new-ws-infra
-          - Name: STACK_NAME
-            Type: PLAINTEXT
-            Value:
-              Ref: AWS::StackName
         Image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: false
@@ -1295,7 +1287,6 @@ Resources:
                 - |
                   aws --version
                   echo "Environment Variables:"
-                  echo "STACK_NAME: $STACK_NAME"
                   echo "TEMPLATE_TYPE: $TEMPLATE_TYPE"
                   echo "GIT_BRANCH: $GIT_BRANCH"
             build:
@@ -1518,13 +1509,13 @@ Resources:
         Fn::GetAtt:
           - CodeBuildStartLambdaFunction8349284F
           - Arn
-      ContentHash: "1765709890926"
       CodeBuildIamRoleArn:
         Fn::GetAtt:
           - CodeBuildCodeBuildRoleBA9C6D5C
           - Arn
       ProjectName:
         Ref: CodeBuildProjectA0FF5539
+      ContentHash: "1765710516249"
     DependsOn:
       - CodeBuildBuildCompleteRuleAllowEventRuleWorkshopStackCodeBuildReportLambdaFunctionD77C6091DA4A4BD8
       - CodeBuildBuildCompleteRule06AAF17D
@@ -1941,6 +1932,9 @@ Resources:
         Fn::GetAtt:
           - DatabaseDatabaseSetupFunction04FDCEBB
           - Arn
+      SqlStatements: |-
+        CREATE TABLE IF NOT EXISTS unicorns(id TEXT DEFAULT gen_random_uuid() PRIMARY KEY, name TEXT, age TEXT, size TEXT, type TEXT);
+        CREATE EXTENSION IF NOT EXISTS vector;
       SecretName:
         Fn::Join:
           - "-"
@@ -1971,9 +1965,6 @@ Resources:
                         - Fn::Split:
                             - ":"
                             - Ref: DatabaseDatabaseSecret487264A7
-      SqlStatements: |-
-        CREATE TABLE IF NOT EXISTS unicorns(id TEXT DEFAULT gen_random_uuid() PRIMARY KEY, name TEXT, age TEXT, size TEXT, type TEXT);
-        CREATE EXTENSION IF NOT EXISTS vector;
     DependsOn:
       - DatabaseDatabaseClusterDatabaseWriter0EEAA63C
       - DatabaseDatabaseCluster0C7C993F

infra/cfn/java-on-aws-stack.yaml

@@ -2,12 +2,11 @@
 set -e
 
 # Full bootstrap script - called by minimal UserData
-# Parameters: GIT_BRANCH STACK_NAME TEMPLATE_TYPE
+# Parameters: GIT_BRANCH TEMPLATE_TYPE
 
 # Parse parameters
 GIT_BRANCH="$1"
-STACK_NAME="$2"
-TEMPLATE_TYPE="$3"
+TEMPLATE_TYPE="$2"
 
 echo "Full bootstrap started at $(date)"
 echo "Parameters: GIT_BRANCH=$GIT_BRANCH, TEMPLATE_TYPE=$TEMPLATE_TYPE"