added self-setup via cf

Author: maschnetwork

Diff for: setup/cloud9.yaml

@@ -6,14 +6,6 @@ Parameters:
     Type: String
     Default: "javaawslambda"
 
-  GitSourceRepository:
-    Description: Git repository url for sources
-    Type: String
-
-  GitTag:
-    Description: Git tag to be cloned from GitSourceRepository
-    Type: String
-
   VpcCIDR:
     Description: Please enter the IP range (CIDR notation) for this VPC
     Type: String
@@ -543,23 +535,23 @@ Resources:
           - action: aws:runShellScript
             name: C9bootstrap
             inputs:
-    mand:
-      - "#!/bin/bash"
-      - date
-      - echo LANG=en_US.utf-8 >> /etc/environment
-      - echo LC_ALL=en_US.UTF-8 >> /etc/environment
-      - . /home/ubuntu/.bashrc
-      - echo '=== Clone Git repository ==='
-      - !Sub sudo -H -u ubuntu bash -c "git clone --depth 1 --branch ${GitTag} ${GitSourceRepository} /home/ubuntu/environment/aws-lambda-java-workshop/"
-      - echo '=== Update and install default software components, resize disk ==='
-      - sudo -H -i -u ubuntu bash -c "/home/ubuntu/environment/aws-lambda-java-workshop/setup-cloud9.sh &>> /home/ubuntu/java-ws-c9setup.log"
-      - echo '=== Setup infrastructure components ==='
-      - sudo -H -i -u ubuntu bash -c "cd /home/ubuntu/environment/aws-lambda-java-workshop/labs/unicorn-store/ && ./setup-infrastructure.sh &>> /home/ubuntu/java-ws-infrasetup.log"
-      - echo '=== Install cfn-signal and report status ==='
-      - pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
-      - if [ "$?" -ne 0 ]; then export BOOTSTRAP_RESULT=false; else export BOOTSTRAP_RESULT=true; fi
-      - "cfn-signal -e $? -s $BOOTSTRAP_RESULT '{{ WaitHandleUrl }}' "
-      - echo "Bootstrap completed with return code $?"
+              runCommand:
+                - "#!/bin/bash"
+                - date
+                - echo LANG=en_US.utf-8 >> /etc/environment
+                - echo LC_ALL=en_US.UTF-8 >> /etc/environment
+                - . /home/ubuntu/.bashrc
+                - echo '=== Clone Git repository ==='
+                - !Sub sudo -H -u ubuntu bash -c "git clone https://github.com/aws-samples/aws-lambda-java-workshop.git /home/ubuntu/environment/aws-lambda-java-workshop/"
+                - echo '=== Update and install default software components, resize disk ==='
+                - sudo -H -i -u ubuntu bash -c "/home/ubuntu/environment/aws-lambda-java-workshop/setup-cloud9.sh &>> /home/ubuntu/java-ws-c9setup.log"
+                - echo '=== Setup infrastructure components ==='
+                - sudo -H -i -u ubuntu bash -c "cd /home/ubuntu/environment/aws-lambda-java-workshop/labs/unicorn-store/ && ./setup-infrastructure.sh &>> /home/ubuntu/java-ws-infrasetup.log"
+                - echo '=== Install cfn-signal and report status ==='
+                - pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
+                - if [ "$?" -ne 0 ]; then export BOOTSTRAP_RESULT=false; else export BOOTSTRAP_RESULT=true; fi
+                - "cfn-signal -e $? -s $BOOTSTRAP_RESULT '{{ WaitHandleUrl }}' "
+                - echo "Bootstrap completed with return code $?"
 
   C9BootstrapAssociation:
     Type: AWS::SSM::Association
@@ -595,11 +587,6 @@ Resources:
       InstanceType:
         Ref: C9InstanceType
       Name: java-on-aws-lambda-workshop
-      OwnerArn: !Join
-        - ''
-        - - 'arn:aws:iam::'
-          - !Ref "AWS::AccountId"
-          - ':assumed-role/WSParticipantRole/Participant'
       Tags:
         -
           Key: SSMBootstrap