Merge branch 'garrjh-c9reboot' into 'main'

Reboot c9 instance after attaching instance profile

See merge request observability-bd-projects/one-observability-demo!154

Author: rapgaws

PetAdoptions/cdk/pet_stack/lib/common/container-image-builder.ts

@@ -32,7 +32,7 @@ export class ContainerImageBuilder extends Construct {
             repositoryName: props.repositoryName,
             imageScanOnPush: true,
             removalPolicy: cdk.RemovalPolicy.DESTROY,
-            autoDeleteImages: true,
+            emptyOnDelete: true,
         });
         const image = new ecrassets.DockerImageAsset(this, props.repositoryName + 'DockerImageAsset', {
           directory: props.dockerImageAssetDirectory
@@ -45,4 +45,4 @@ export class ContainerImageBuilder extends Construct {
         this.repositoryUri = repository.repositoryUri;
         this.imageUri = `${repository.repositoryUri}:latest`;
     }
-}
+}

PetAdoptions/cdk/pet_stack/package.json

@@ -11,24 +11,24 @@
     "test": "jest",
     "cdk": "cdk"
   },
-  "devDependencies": {
-    "@aws-cdk/assert": "^2.68.0",
-    "@types/jest": "^29.5.4",
-    "@types/node": "^20.5.7",
-    "aws-cdk": "^2.97.0",
-    "constructs": "^10.2.69",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "ts-replace-all": "1.0.0",
-    "typescript": "^5.2.2"
-  },
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "^2.97.0-alpha.0",
-    "@types/js-yaml": "4.0.5",
-    "aws-cdk-lib": "^2.97.0",
-    "cdk-ecr-deployment": "^2.5.30",
-    "jest": "^29.6.4",
+    "@aws-cdk/aws-lambda-python-alpha": "^2.131.0-alpha.0",
+    "@types/js-yaml": "^4.0.9",
+    "aws-cdk-lib": "^2.146.0",
+    "cdk-ecr-deployment": "^3.0.67",
+    "jest": "^29.7.0",
     "js-yaml": "^4.1.0",
     "source-map-support": "^0.5.21"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.14.2",
+    "aws-cdk": "^2.146.0",
+    "cdk-nag": "^2.28.144",
+    "constructs": "^10.3.0",
+    "ts-jest": "^29.1.5",
+    "ts-node": "^10.9.2",
+    "ts-replace-all": "^1.0.0",
+    "typescript": "^5.4.5"
   }
-}
+}

buildspec.yml

@@ -1,4 +1,8 @@
 version: 0.2
+env:
+  variables:
+    # https://github.com/cdklabs/cdk-ecr-deployment/issues/478#issuecomment-1938020710
+    NO_PREBUILT_LAMBDA: "1"
 phases:
   install:
     commands:
@@ -15,4 +19,4 @@ phases:
       - cdk deploy Services --context admin_role=${EE_TEAM_ROLE_ARN} --context is_event_engine="true" --require-approval=never --verbose -O ./out/out.json
       - cdk deploy Applications --require-approval=never --verbose -O ./out/out.json
 artifacts:
-  files: './PetAdoptions/cdk/pet_stack/out/out.json'
+  files: "./PetAdoptions/cdk/pet_stack/out/out.json"

cloud9-cfn.yaml

@@ -465,6 +465,7 @@ Resources:
             - ec2:AssociateIamInstanceProfile
             - ec2:ModifyInstanceAttribute
             - ec2:ReplaceIamInstanceProfileAssociation
+            - ec2:RebootInstances
             Resource: !Sub "arn:${AWS::Partition}:ec2:${AWS::Region}:${AWS::AccountId}:instance/*"
           - Effect: Allow
             Action:
@@ -595,7 +596,7 @@ Resources:
                       # attach instance profile
                       response = ec2.associate_iam_instance_profile(IamInstanceProfile=iam_instance_profile, InstanceId=instance['InstanceId'])
                       logger.info('response - associate_iam_instance_profile: {}'.format(response))
-                      #r_ec2 = boto3.resource('ec2')
+                      ec2.reboot_instances(InstanceIds=[instance['InstanceId']], DryRun=False)
 
                       responseData = {'Success': 'Started bootstrapping for instance: '+instance['InstanceId']}
                       cfnresponse.send(event, context, cfnresponse.SUCCESS, responseData, 'CustomResourcePhysicalID')