Add integ test run on PR open (#3)

* Add integ test run on pr open

* Refactor base test stack for integ tests

Author: fredericbarthelet

.github/workflows/pr.yaml

@@ -0,0 +1,24 @@
+name: Pull Request
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: lts/hydrogen
+                  registry-url: https://registry.npmjs.org
+            - uses: actions/cache@v2
+              with:
+                  path: ~/.npm
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
+            - run: npm ci
+            - run: npm run build
+            - run: npm run layer:build
+            - run: npm run test:integ

integ.config.json

@@ -1,6 +1,7 @@
 {
     "maxWorkers": 2,
     "parallelRegions": [
+        "us-east-1",
         "eu-west-1"
     ],
     "language": "typescript"

package.json

@@ -7,7 +7,7 @@
     "watch": "tsc -w",
     "test": "jest",
     "layer:build": "pkg -t linux-x64 -o lib/layerX86/extensions/revant lib/revant-extension/revant.js && pkg -t linux-arm64 -o lib/layerARM/extensions/revant lib/revant-extension/revant.js",
-    "integ": "integ-runner --update-on-failed"
+    "test:integ": "integ-runner"
   },
   "devDependencies": {
     "@aws-cdk/integ-runner": "^2.92.0-alpha.0",

test/integ.ec2.ts

@@ -1,4 +1,4 @@
-import { App, Aspects, Duration, Stack, StackProps } from "aws-cdk-lib";
+import { App, Duration, StackProps } from "aws-cdk-lib";
 import { Construct } from "constructs";
 import { ExpectedResult, IntegTest, Match } from "@aws-cdk/integ-tests-alpha";
 
@@ -10,17 +10,12 @@ import {
   MachineImage,
   Vpc,
 } from "aws-cdk-lib/aws-ec2";
-import { Revantios } from "../lib/revantios";
-import { CostLimit } from "../lib";
-import { CoreRessources } from "../lib/core-resources";
+import { BaseStackUnderTest } from "./test-utils";
 
 const app = new App();
 
-class EC2Stack extends Stack {
-  public budget = Revantios.fromUSD(1);
+class EC2Stack extends BaseStackUnderTest {
   public instanceId: string;
-  public dynamoDBBudgetIndex: string;
-  public dynamoDBTableName: string;
   constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
@@ -31,14 +26,7 @@ class EC2Stack extends Stack {
       machineImage: MachineImage.latestAmazonLinux2023(),
     });
 
-    Aspects.of(this).add(new CostLimit({ budget: this.budget.toCents() }));
     this.instanceId = instance.instanceId;
-    this.dynamoDBBudgetIndex = [
-      new Date().toISOString().slice(0, 7),
-      this.node.addr,
-    ].join("#");
-    this.dynamoDBTableName =
-      CoreRessources.getInstance(this).dynamoDBTable.tableName;
   }
 }
 
@@ -98,7 +86,7 @@ integ.assertions
         },
         updatedAt: {
           S: new Date().toISOString(),
-        }
+        },
       },
     })
   )

test/integ.ec2.ts.snapshot/EC2IntegDefaultTestDeployAssert36B7B092.assets.json

@@ -14,15 +14,15 @@
         }
       }
     },
-    "0cb8b99422440380d6b24c36030d9775039ff42fbe62b46230d3d264345ec19b": {
+    "8f0857fc1d012a5bbb3d33d9d631725fd115daa1908a53674b97ab116bd27a92": {
       "source": {
         "path": "EC2IntegDefaultTestDeployAssert36B7B092.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "0cb8b99422440380d6b24c36030d9775039ff42fbe62b46230d3d264345ec19b.json",
+          "objectKey": "8f0857fc1d012a5bbb3d33d9d631725fd115daa1908a53674b97ab116bd27a92.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

test/integ.ec2.ts.snapshot/EC2IntegDefaultTestDeployAssert36B7B092.template.json

@@ -26,7 +26,7 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1694012790544"
+    "salt": "1694276119451"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -178,7 +178,7 @@
      "Filters": "[{\"Name\":\"instance-state-name\",\"Values\":[\"pending\",\"running\",\"shutting-down\",\"terminated\",\"stopping\",\"stopped\"]}]"
     },
     "flattenResponse": "false",
-    "salt": "1694012790544"
+    "salt": "1694276119451"
    },
    "DependsOn": [
     "AwsApiCallEC2stopInstancesae3190c9cc698cf969f9acf9d133e035"
@@ -425,7 +425,7 @@
     }
    }
   },
-  "AwsApiCallDynamoDBputItemefd261a4428d09668b91214c4ea140f4": {
+  "AwsApiCallDynamoDBputItemff310099c11c3b1d47f94c2d167ede56": {
    "Type": "Custom::DeployAssert@SdkCallDynamoDBputItem",
    "Properties": {
     "ServiceToken": {
@@ -449,10 +449,10 @@
        ]
       ]
      },
-     "Item": "{\"PK\":{\"S\":\"2023-09#c8f5ec86153761e35310d3376adad0942b36297052\"},\"accruedExpenses\":{\"N\":\"10000000001\"},\"updatedAt\":{\"S\":\"2023-09-06T15:06:30.545Z\"}}"
+     "Item": "{\"PK\":{\"S\":\"2023-09#c8f5ec86153761e35310d3376adad0942b36297052\"},\"accruedExpenses\":{\"N\":\"10000000001\"},\"updatedAt\":{\"S\":\"2023-09-09T16:15:19.452Z\"}}"
     },
     "flattenResponse": "false",
-    "salt": "1694012790545"
+    "salt": "1694276119452"
    },
    "DependsOn": [
     "AwsApiCallEC2describeInstanceStatusb32986d428de6b3fc2ed9cd3ca844424",
@@ -490,10 +490,10 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1694012790545"
+    "salt": "1694276119452"
    },
    "DependsOn": [
-    "AwsApiCallDynamoDBputItemefd261a4428d09668b91214c4ea140f4"
+    "AwsApiCallDynamoDBputItemff310099c11c3b1d47f94c2d167ede56"
    ],
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -529,7 +529,7 @@
      "IncludeAllInstances": "true"
     },
     "flattenResponse": "false",
-    "salt": "1694012790545"
+    "salt": "1694276119452"
    },
    "DependsOn": [
     "AwsApiCallEC2startInstancesae3190c9cc698cf969f9acf9d133e035"

test/integ.ec2.ts.snapshot/EC2StackUnderTest.assets.json

@@ -1,28 +1,28 @@
 {
   "version": "33.0.0",
   "files": {
-    "4b996a3e5a083d5c78c6f30a8571a94fb7ec557eecbe54dbc065faba0d9076e6": {
+    "3d0ed04128f7a73685fa26cd18facba2ffc6ba76775010e856976db6cb55ad5f": {
       "source": {
-        "path": "asset.4b996a3e5a083d5c78c6f30a8571a94fb7ec557eecbe54dbc065faba0d9076e6",
+        "path": "asset.3d0ed04128f7a73685fa26cd18facba2ffc6ba76775010e856976db6cb55ad5f",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "4b996a3e5a083d5c78c6f30a8571a94fb7ec557eecbe54dbc065faba0d9076e6.zip",
+          "objectKey": "3d0ed04128f7a73685fa26cd18facba2ffc6ba76775010e856976db6cb55ad5f.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "3d0ed04128f7a73685fa26cd18facba2ffc6ba76775010e856976db6cb55ad5f": {
+    "4b996a3e5a083d5c78c6f30a8571a94fb7ec557eecbe54dbc065faba0d9076e6": {
       "source": {
-        "path": "asset.3d0ed04128f7a73685fa26cd18facba2ffc6ba76775010e856976db6cb55ad5f",
+        "path": "asset.4b996a3e5a083d5c78c6f30a8571a94fb7ec557eecbe54dbc065faba0d9076e6",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "3d0ed04128f7a73685fa26cd18facba2ffc6ba76775010e856976db6cb55ad5f.zip",
+          "objectKey": "4b996a3e5a083d5c78c6f30a8571a94fb7ec557eecbe54dbc065faba0d9076e6.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
@@ -40,15 +40,15 @@
         }
       }
     },
-    "3a6278219005c65cf02b6db9d30b907d3e35189fb4a892dff9a35d59c7efaf75": {
+    "8120cdcfefcafaea628026c2c00aa72c2711c3066ed2a8f9c689285e71d0b15f": {
       "source": {
         "path": "EC2StackUnderTest.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "3a6278219005c65cf02b6db9d30b907d3e35189fb4a892dff9a35d59c7efaf75.json",
+          "objectKey": "8120cdcfefcafaea628026c2c00aa72c2711c3066ed2a8f9c689285e71d0b15f.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }