Merge pull request #17 from dealmore/issue/16

Improves routing for dynamic routes

.github/workflows/test.yml

@@ -7,21 +7,81 @@ on:
   pull_request:
 
 jobs:
-  test-proxy:
+  test-integration:
     runs-on: ubuntu-latest
     container: registry.gitlab.com/dealmore/dealmore-build-images/lambdaci:nodejs12.x
     steps:
       - uses: actions/checkout@v2
 
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            .yarn
+            **/node_modules
+          key: ${{ runner.os }}-test
+
       - name: Jest
         run: |
           yarn --frozen-lockfile --cache-folder .yarn
           yarn test
 
+  test-e2e-prepare:
+    runs-on: ubuntu-latest
+    container: registry.gitlab.com/dealmore/dealmore-build-images/lambdaci:nodejs12.x
+    steps:
+      - uses: actions/checkout@v2
+
       - name: Cache
         uses: actions/cache@v2
         with:
           path: |
             .yarn
             **/node_modules
           key: ${{ runner.os }}-test
+
+      - name: Yarn install
+        run: yarn --frozen-lockfile --cache-folder .yarn
+
+      - name: Build tf-next
+        run: yarn --cwd packages/terraform-next-build build
+
+      - name: Build e2e fixtures
+        run: yarn test:e2e:prepare
+
+      - name: Upload e2e fixtures
+        uses: actions/upload-artifact@v2
+        with:
+          name: e2e-fixtures
+          path: |
+            packages/proxy/dist.zip
+            test/**/.next-tf/**/*
+          if-no-files-found: error
+
+  test-e2e:
+    needs: test-e2e-prepare
+    runs-on: ubuntu-latest
+    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
+    steps:
+      - name: Setup Docker
+        uses: docker-practice/actions-setup-docker@master
+      - name: Setup Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+      - name: Setup AWS SAM
+        run: |
+          brew tap aws/tap
+          brew install aws-sam-cli
+          sam --version
+      - uses: actions/checkout@v2
+      - name: Download e2e fixtures
+        uses: actions/download-artifact@v2
+        with:
+          name: e2e-fixtures
+      - run: yarn install --frozen-lockfile --check-files
+      - name: Run e2e-test
+        run: yarn test:e2e --runInBand

.vscode/launch.json

@@ -23,6 +23,22 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "port": 9229
+    },
+    {
+      "name": "e2e: Debug Current Jest File",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": [
+        "--inspect-brk",
+        "${workspaceRoot}/node_modules/.bin/jest",
+        "--config",
+        "${workspaceRoot}/jest.e2e.config.js",
+        "--runInBand",
+        "${file}"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "port": 9229
     }
   ]
 }

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "files.associations": {
+    "**/test/**/probes.json": "jsonc"
+  }
+}

examples/complete/package.json

@@ -14,9 +14,9 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "^9.5.4",
-    "react": "16.13.1",
-    "react-dom": "16.13.1"
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
   },
   "devDependencies": {
     "@dealmore/terraform-next-build": "^0.1.0"

examples/static/package.json

@@ -14,9 +14,9 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "^9.5.4",
-    "react": "16.13.1",
-    "react-dom": "16.13.1"
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
   },
   "devDependencies": {
     "@dealmore/terraform-next-build": "^0.1.0"

jest.config.js

@@ -7,4 +7,10 @@ module.exports = {
       tsConfig: 'tsconfig.test.json',
     },
   },
+  // By default we only run tests in the packages subfolders
+  // For e2e tests see the jest.e2e.config.js file
+  testMatch: [
+    '<rootDir>/packages/**/__tests__/**/*.[jt]s?(x)',
+    '<rootDir>/packages/**/?(*.)+(spec|test).[jt]s?(x)',
+  ],
 };

jest.e2e.config.js

@@ -0,0 +1,14 @@
+const mainConfig = require('./jest.config');
+
+module.exports = {
+  ...mainConfig,
+  // We only run e2e tests here
+  // For unit tests see jest.config.js
+  testMatch: [
+    '<rootDir>/test/**/__tests__/**/*.[jt]s?(x)',
+    '<rootDir>/test/**/?(*.)+(spec|test).[jt]s?(x)',
+  ],
+  // We use an increased timeout here because in the worst case
+  // AWS SAM needs to download a docker image before the test can run
+  testTimeout: 60000,
+};

modules/proxy-config/main.tf

@@ -11,6 +11,7 @@ locals {
 resource "aws_s3_bucket" "proxy_config" {
   bucket_prefix = "next-tf-proxy-config"
   acl           = "private"
+  force_destroy = true
 }
 
 data "aws_iam_policy_document" "cf_access" {

modules/statics-deploy/main.tf

@@ -46,6 +46,7 @@ resource "aws_s3_bucket_notification" "on_create" {
 resource "aws_s3_bucket" "static_deploy" {
   bucket_prefix = "next-tf-static-deploy"
   acl           = "private"
+  force_destroy = true
 }
 
 # CloudFront permissions for the bucket

package.json

@@ -5,17 +5,37 @@
   "license": "Apache-2.0",
   "workspaces": [
     "packages/*",
-    "examples/*"
+    "examples/*",
+    "test/fixtures/*"
   ],
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "test:e2e:prepare": "node test/build-fixtures.js",
+    "test:e2e": "jest --config jest.e2e.config.js"
   },
   "devDependencies": {
+    "@types/aws-lambda": "^8.10.64",
+    "@types/hjson": "^2.4.2",
     "@types/jest": "^26.0.3",
     "@types/node": "^12.0.0",
+    "@types/tmp": "^0.2.0",
+    "@types/unzipper": "^0.10.3",
+    "aws-sdk": "*",
+    "get-port": "^5.1.1",
+    "hjson": "^3.2.2",
     "jest": "^26.1.0",
+    "node-fetch": "^2.6.1",
     "prettier": "^2.0.5",
+    "tmp": "^0.2.1",
     "ts-jest": "^26.1.1",
-    "typescript": "^3.9.5"
+    "typescript": "^3.9.5",
+    "unzipper": "^0.10.11",
+    "yaml": "^2.0.0-1"
+  },
+  "resolutions": {
+    "aws-sdk": "2.771.0",
+    "next": "^10.0.3",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   }
 }

packages/deploy-trigger/package.json

@@ -18,7 +18,7 @@
     "@types/aws-lambda": "^8.10.56",
     "@types/mime": "^2.0.2",
     "@types/unzipper": "^0.10.3",
-    "aws-sdk": "2.631.0"
+    "aws-sdk": "*"
   },
   "dependencies": {
     "mime": "^2.4.6",