Update known_hosts

Author: Yuriy Bezsonov

infrastructure/cdk/src/main/resources/bootstrapGitea.sh

@@ -167,6 +167,8 @@ PUB_KEY=$(sudo cat /home/ec2-user/.ssh/id_rsa.pub)
 TITLE="$(hostname)$(date +%s)"
 
 while [[ $(curl -s -o /dev/null -w "%{http_code}" localhost:9000/) != "200" ]]; do echo "Gitea is not yet available ..." &&  sleep 5; done
+# Add the host key to known_hosts
+sudo -u ec2-user bash -c "ssh-keyscan -p 2222 $EC2_PRIVATE_IP >> ~/.ssh/known_hosts"
 
 curl -X 'POST' \
   "http://workshop-user:$IDE_PASSWORD@localhost:9000/api/v1/user/keys" \
@@ -186,7 +188,4 @@ export GITEA_PASSWORD="$IDE_PASSWORD"
 export GITEA_USERNAME="workshop-user"
 EOF
 
-# Add the host key to known_hosts
-ssh-keyscan -p 2222 $EC2_PRIVATE_IP >> ~/.ssh/known_hosts
-
 source /etc/profile.d/gitea.sh

infrastructure/cfn/ide-gitea-stack.yaml

@@ -422,7 +422,7 @@ Resources:
   VSCodeIdeGiteaIdeLogGroupCD76FEFA:
     Type: AWS::Logs::LogGroup
     Properties:
-      LogGroupName: ide-bootstrap-log-20250316-121809
+      LogGroupName: ide-bootstrap-log-20250316-125839
       RetentionInDays: 7
     UpdateReplacePolicy: Retain
     DeletionPolicy: Retain
@@ -855,8 +855,8 @@ Resources:
         parameters:
           BootstrapScript:
             default: ""
-            type: String
             description: (Optional) Custom bootstrap script to run.
+            type: String
         mainSteps:
           - inputs:
               runCommand:
@@ -1112,58 +1112,16 @@ Resources:
                       /opt/aws/bin/cfn-signal -e $exit_code '${waitConditionHandleUrl}'
 
                       exit $exit_code
-                    - waitConditionHandleUrl:
-                        Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
-                      readmeUrl: ""
+                    - splashUrl: ""
                       instanceIamRoleArn:
                         Fn::GetAtt:
                           - VSCodeIdeGiteaIdeRole90308F47
                           - Arn
-                      splashUrl: ""
-                      instanceIamRoleName:
-                        Ref: VSCodeIdeGiteaIdeRole90308F47
-                      codeServerVersion: 4.98.2
-                      customBootstrapScript: |
-                        date
-
-                        echo '=== Clone Git repository ==='
-                        sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
-                        # sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
-
-                        echo '=== Setup IDE ==='
-                        sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
-                      passwordName:
-                        Fn::Join:
-                          - "-"
-                          - - Fn::Select:
-                                - 0
-                                - Fn::Split:
-                                    - "-"
-                                    - Fn::Select:
-                                        - 6
-                                        - Fn::Split:
-                                            - ":"
-                                            - Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
-                            - Fn::Select:
-                                - 1
-                                - Fn::Split:
-                                    - "-"
-                                    - Fn::Select:
-                                        - 6
-                                        - Fn::Split:
-                                            - ":"
-                                            - Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
-                            - Fn::Select:
-                                - 2
-                                - Fn::Split:
-                                    - "-"
-                                    - Fn::Select:
-                                        - 6
-                                        - Fn::Split:
-                                            - ":"
-                                            - Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
-                      environmentContentsZip: ""
-                      terminalOnStartup: "true"
+                      readmeUrl: ""
+                      waitConditionHandleUrl:
+                        Ref: VSCodeIdeGiteaIdeBootstrapWaitConditionHandle78036ED5
+                      extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
+                      domain: ""
                       installGitea: |
                         dnf install -y nerdctl cni-plugins
                         mkdir -p /gitea/config /gitea/data
@@ -1334,6 +1292,8 @@ Resources:
                         TITLE="$(hostname)$(date +%s)"
 
                         while [[ $(curl -s -o /dev/null -w "%{http_code}" localhost:9000/) != "200" ]]; do echo "Gitea is not yet available ..." &&  sleep 5; done
+                        # Add the host key to known_hosts
+                        sudo -u ec2-user bash -c "ssh-keyscan -p 2222 $EC2_PRIVATE_IP >> ~/.ssh/known_hosts"
 
                         curl -X 'POST' \
                           "http://workshop-user:$IDE_PASSWORD@localhost:9000/api/v1/user/keys" \
@@ -1353,12 +1313,51 @@ Resources:
                         export GITEA_USERNAME="workshop-user"
                         EOF
 
-                        # Add the host key to known_hosts
-                        ssh-keyscan -p 2222 $EC2_PRIVATE_IP >> ~/.ssh/known_hosts
-
                         source /etc/profile.d/gitea.sh
-                      domain: ""
-                      extensions: ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,vscjava.vscode-java-pack
+                      terminalOnStartup: "true"
+                      environmentContentsZip: ""
+                      passwordName:
+                        Fn::Join:
+                          - "-"
+                          - - Fn::Select:
+                                - 0
+                                - Fn::Split:
+                                    - "-"
+                                    - Fn::Select:
+                                        - 6
+                                        - Fn::Split:
+                                            - ":"
+                                            - Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
+                            - Fn::Select:
+                                - 1
+                                - Fn::Split:
+                                    - "-"
+                                    - Fn::Select:
+                                        - 6
+                                        - Fn::Split:
+                                            - ":"
+                                            - Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
+                            - Fn::Select:
+                                - 2
+                                - Fn::Split:
+                                    - "-"
+                                    - Fn::Select:
+                                        - 6
+                                        - Fn::Split:
+                                            - ":"
+                                            - Ref: VSCodeIdeGiteaIdePasswordSecretD25F73F4
+                      customBootstrapScript: |
+                        date
+
+                        echo '=== Clone Git repository ==='
+                        sudo -H -u ec2-user bash -c "git clone https://github.com/aws-samples/java-on-aws ~/java-on-aws/"
+                        # sudo -H -u ec2-user bash -c "cd ~/java-on-aws && git checkout refactoring"
+
+                        echo '=== Setup IDE ==='
+                        sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/ide.sh"
+                      codeServerVersion: 4.98.2
+                      instanceIamRoleName:
+                        Ref: VSCodeIdeGiteaIdeRole90308F47
             name: IdeBootstrapFunction
             action: aws:runShellScript
       DocumentFormat: YAML
@@ -1498,10 +1497,10 @@ Resources:
           - Arn
       InstanceId:
         Ref: VSCodeIdeGiteaIdeEC2Instance51274E6D
-      SsmDocument:
-        Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
       LogGroupName:
         Ref: VSCodeIdeGiteaIdeLogGroupCD76FEFA
+      SsmDocument:
+        Ref: VSCodeIdeGiteaIdeBootstrapDocument7FC8732A
     UpdateReplacePolicy: Delete
     DeletionPolicy: Delete
 Outputs: