Add CDK v2 Support (#84)

Added CDK V2 support

.github/workflows/build.yml

@@ -5,9 +5,13 @@ on: push
 jobs:
   lint:
     runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        working-dir: [v1,v2]
     defaults:
       run:
-        working-directory: v1
+        working-directory: ${{ matrix.working-dir }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -22,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ matrix.working-dir }}
 
       - name: Install dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -46,13 +50,14 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: v1
     strategy:
       max-parallel: 4
       matrix:
-        node-version: [12,14,16]
+        working-dir: [v1,v2]
+        node-version: [14,16]
+    defaults:
+      run:
+        working-directory: ${{ matrix.working-dir }}
 
     steps:
       - name: Checkout
@@ -68,7 +73,49 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ matrix.working-dir }}
+
+      - name: Install common dependencies
+        working-directory: ./
+        run: yarn install
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install
+
+      - name: Build
+        run: yarn build
+
+      - name: Authenticate Docker to Amazon ECR
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
+
+      - name: Run tests
+        run: yarn test
+
+  test-v1-node12:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: v1
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Node 12
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Cache Node modules
+        id: cache-node-modules
+        uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-v1
 
       - name: Install common dependencies
         working-directory: ./

.github/workflows/integration_tests.yml

@@ -5,9 +5,13 @@ on: push
 jobs:
   integration-tests:
     runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        working-dir: [v1,v2]
     defaults:
       run:
-        working-directory: v1
+        working-directory: ${{ matrix.working-dir }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -22,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ matrix.working-dir }}
 
       - name: Install dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'

common/scripts/fix-version.js

@@ -0,0 +1,16 @@
+// Helper script used to fix package.json version resetting on builds, and helping bump version.json after releases
+
+// Copies the version from version.json into package.json
+var fs = require("fs");
+var path = require("path");
+
+var folder = process.argv[2];
+
+version_file_path = path.join(__dirname, "..", "..", folder, "version.json");
+package_file_path = path.join(__dirname, "..", "..", folder, "package.json");
+
+var version_json = require(version_file_path);
+var package_json = require(package_file_path);
+
+package_json.version = version_json.version;
+fs.writeFileSync(package_file_path, JSON.stringify(package_json, null, 2));