Merge branch 'main' into release

Author: ofhouse

.github/workflows/CI.yml

@@ -13,9 +13,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: registry.gitlab.com/dealmore/dealmore-build-images/lambda:nodejs14.x
+    container: public.ecr.aws/sam/build-nodejs14.x:latest
 
     steps:
+      - name: Install yarn
+        run: npm install --global [email protected]
+
       - uses: actions/checkout@v2
 
       - name: Cache
@@ -37,31 +40,48 @@ jobs:
         with:
           name: dist
           path: |
-            packages/runtime/dist/
-            packages/tf-next/dist/
-            packages/proxy/dist/
-            packages/proxy/dist.zip
+            packages/api/dist/
+            packages/api/dist.zip
+            packages/deploy-controller/dist/
+            packages/deploy-controller/dist.zip
             packages/deploy-trigger/dist/
             packages/deploy-trigger/dist.zip
+            packages/proxy/dist/
+            packages/proxy/dist.zip
+            packages/proxy-config/dist/
+            packages/proxy-config/dist.zip
+            packages/runtime/dist/
+            packages/tf-next/dist/
           if-no-files-found: error
 
   test-integration:
     needs: build
     runs-on: ubuntu-latest
-    container: registry.gitlab.com/dealmore/dealmore-build-images/lambda:nodejs14.x
+    container: public.ecr.aws/sam/build-nodejs14.x:latest
     services:
       s3:
         image: registry.gitlab.com/dealmore/dealmore-build-images:s3-emulator
         env:
           MINIO_ACCESS_KEY: test
           MINIO_SECRET_KEY: testtest
+      dynamodb:
+        image: amazon/dynamodb-local:latest
+        # @note Github overwrites WORKDIR to repository path, so overwrite that again
+        options: >-
+          --workdir /home/dynamodblocal
 
     env:
+      # Increase heap size for running the tests
+      NODE_OPTIONS: '--max_old_space_size=4096'
       MINIO_ACCESS_KEY: test
       MINIO_SECRET_KEY: testtest
       S3_ENDPOINT: s3:9000
+      TEST_DYNAMO_ENDPOINT: http://dynamodb:8000
 
     steps:
+      - name: Install yarn
+        run: npm install --global [email protected]
+
       - uses: actions/checkout@v2
 
       - name: Cache
@@ -72,7 +92,7 @@ jobs:
             **/node_modules
           key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
 
-      - name: Yarn install
+      - name: Install dependencies
         run: yarn --frozen-lockfile --cache-folder .yarn
 
       - name: Download build artifacts
@@ -82,13 +102,19 @@ jobs:
           path: packages
 
       - name: Jest
-        run: yarn test
+        run: yarn test:not:runtime
 
-  test-e2e-prepare:
+  # We run the runtime tests in a dedicated task since running it with the
+  # other integration tests would cause a memory overflow.
+  test-integration-runtime:
     needs: build
     runs-on: ubuntu-latest
-    container: registry.gitlab.com/dealmore/dealmore-build-images/lambda:nodejs14.x
+    container: public.ecr.aws/sam/build-nodejs14.x:latest
+
     steps:
+      - name: Install yarn
+        run: npm install --global [email protected]
+
       - uses: actions/checkout@v2
 
       - name: Cache
@@ -99,7 +125,7 @@ jobs:
             **/node_modules
           key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
 
-      - name: Yarn install
+      - name: Install dependencies
         run: yarn --frozen-lockfile --cache-folder .yarn
 
       - name: Download build artifacts
@@ -108,41 +134,16 @@ jobs:
           name: dist
           path: packages
 
-      - name: Build e2e fixtures
-        run: yarn test:e2e:prepare
-
-      - name: Upload e2e fixtures
-        uses: actions/upload-artifact@v2
-        with:
-          name: e2e-fixtures
-          path: test/fixtures/**/.next-tf/**/*
-          if-no-files-found: error
+      - name: Jest
+        run: yarn test:runtime
 
-  test-e2e:
-    needs: [build, test-e2e-prepare]
+  test-e2e-prepare:
+    needs: build
     runs-on: ubuntu-latest
-    services:
-      s3:
-        image: registry.gitlab.com/dealmore/dealmore-build-images:s3-emulator
-        env:
-          MINIO_ACCESS_KEY: test
-          MINIO_SECRET_KEY: testtest
-        ports:
-          - 9000:9000
-    env:
-      SAM_CLI_TELEMETRY: 0
-      # Don't worry these are fake AWS credentials for AWS SAM
-      AWS_ACCESS_KEY_ID: ABIAZLJNBT8I3KFOU4NO
-      AWS_SECRET_ACCESS_KEY: 4Xt3Rbx4DO21MhK1IHXZXRvVRDuqaQ0Wo5lILA/h
-      MINIO_ACCESS_KEY: test
-      MINIO_SECRET_KEY: testtest
-
+    container: public.ecr.aws/sam/build-nodejs14.x:latest
     steps:
-      - name: Setup AWS SAM
-        run: |
-          brew tap aws/tap
-          brew install aws-sam-cli
-          sam --version
+      - name: Install yarn
+        run: npm install --global [email protected]
 
       - uses: actions/checkout@v2
 
@@ -152,37 +153,31 @@ jobs:
           path: |
             .yarn
             **/node_modules
-          key: ${{ runner.os }}-e2e-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+
+      - name: Yarn install
+        run: yarn --frozen-lockfile --cache-folder .yarn
 
       - name: Download build artifacts
         uses: actions/download-artifact@v2
         with:
           name: dist
           path: packages
 
-      - name: Download prebuilt e2e fixtures
-        uses: actions/download-artifact@v2
+      - name: Build e2e fixtures
+        run: yarn test:e2e:prepare
+
+      - name: Upload e2e fixtures
+        uses: actions/upload-artifact@v2
         with:
           name: e2e-fixtures
-          path: test/fixtures
-
-      - name: Install dependencies
-        run: yarn --frozen-lockfile --cache-folder .yarn
-
-      - name: Run e2e-test
-        run: yarn test:e2e --runInBand
-
-      - name: Output SAM logs
-        run: |
-          printf "\n\nOutput of sam-local.log:\n"
-          cat sam-local.log
-          printf "\n\nOutput of sam-api.log:\n"
-          cat sam-api.log
+          path: test/fixtures/**/.next-tf/**/*
+          if-no-files-found: error
 
   publishRelease:
     name: Potentially publish release
     runs-on: ubuntu-latest
-    needs: [build, test-integration, test-e2e]
+    needs: [build, test-integration, test-integration-runtime]
     if: github.ref == 'refs/heads/main'
     env:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [1.0.0-canary.2] - 2022-05-31
+
+- Adds static prefix to files served from S3 ([#321](https://github.com/milliHQ/terraform-aws-next-js/pull/321))
+- Add CLI commands ([#317](https://github.com/milliHQ/terraform-aws-next-js/pull/317))
+- No longer require reserved concurrency ([#319](https://github.com/milliHQ/terraform-aws-next-js/pull/319), [#251](https://github.com/milliHQ/terraform-aws-next-js/issues/251))
+- Use CLI and CDK for deployments ([#300](https://github.com/milliHQ/terraform-aws-next-js/pull/300))
+
 ## [0.12.2] - 2022-04-16
 
 - Append querystring to redirects ([#296](https://github.com/milliHQ/terraform-aws-next-js/issues/296), [#304](https://github.com/milliHQ/terraform-aws-next-js/pull/304))