chore(docs): Merge docs content to stable website

.github/.dependabot.yml

@@ -5,6 +5,9 @@ updates:
     directory: /
     schedule:
       interval: weekly
+    commit_message:
+      prefix: "chore"
+      include_scope: true
     ignore:
       - dependency-name: jsii
       - dependency-name: "@jsii/*"

.github/workflows/docker.yml

@@ -6,26 +6,34 @@ on:
     paths-ignore:
       - "**.md"
       - "docs/**"
+      - "website/**"
 
 jobs:
   build-docker-image:
     if: github.repository == 'hashicorp/terraform-cdk'
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ hashFiles('/Dockerfile') }}
+          key: ${{ runner.os }}-buildx-${{ hashFiles('/Dockerfile', '.terraform.versions.json') }}
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - id: tf-versions
+        run: |
+          DEFAULT_TERRAFORM_VERSION=$(cat .terraform.versions.json | jq -r '.default')
+          AVAILABLE_TERRAFORM_VERSIONS=$(cat .terraform.versions.json | jq -r '.available | join(" ")')
+          echo "::set-output name=default::$DEFAULT_TERRAFORM_VERSION"
+          echo "::set-output name=available::$AVAILABLE_TERRAFORM_VERSIONS"
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
@@ -34,3 +42,6 @@ jobs:
           tags: hashicorp/jsii-terraform:latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+          build-args: |
+            DEFAULT_TERRAFORM_VERSION=${{ steps.tf-versions.outputs.default }}
+            AVAILABLE_TERRAFORM_VERSIONS=${{ steps.tf-versions.outputs.available }}

.github/workflows/examples.yml

@@ -4,18 +4,32 @@ on:
     paths-ignore:
       - "**.md"
       - "docs/**"
+      - "website/**"
 
 jobs:
-  build:
+  build-example-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      examples: ${{ steps.set-examples.outputs.examples }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - id: set-examples
+        run: |
+          tfDefault=$(cat .terraform.versions.json | jq -r '.default')
+          examples=$(npx lerna list --scope "@examples/*" | jq  -R -s -c --arg tfDefault "${tfDefault}" 'split("\n") | map(select(length > 0)) | { target: values, terraform: [$tfDefault]}')
+          echo $examples
+          echo "::set-output name=examples::$examples"
+
+  examples:
+    needs: build-example-matrix
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        terraform: ["0.15.4"]
-        target: ["python", "csharp", "java", "typescript", "go"]
+      fail-fast: false
+      matrix: ${{fromJSON(needs.build-example-matrix.outputs.examples)}}
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
     env:
-      TF_PLUGIN_CACHE_DIR: "/root/.terraform.d/plugin-cache"
       CHECKPOINT_DISABLE: "1"
     steps:
       - uses: actions/checkout@v2
@@ -29,12 +43,8 @@ jobs:
           TERRAFORM_BINARY_NAME: "terraform${{ matrix.terraform }}"
       - name: create bundle
         run: yarn package
-      - name: bootstrap plugin cache
-        run: yum install -y jq && yarn bootstrap-plugin-cache
-        env:
-          TERRAFORM_BINARY_NAME: "terraform${{ matrix.terraform }}"
       - name: examples integration tests
-        run: yarn examples:integration:${TEST_TARGET}
+        run: test/run-against-dist tools/build-examples.sh ${TEST_TARGET}
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           TEST_TARGET: "${{ matrix.target }}"

.github/workflows/build.yml → .github/workflows/integration.yml

@@ -1,16 +1,16 @@
-name: Build
+name: Integration Tests
 on:
   pull_request:
     paths-ignore:
       - "**.md"
       - "docs/**"
+      - "website/**"
 
 jobs:
-  build:
+  prepare-integration-tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        terraform: ["0.14.11", "0.15.4"]
+    outputs:
+      tests: ${{ steps.build-test-matrix.outputs.tests }}
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
     env:
@@ -28,91 +28,64 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - name: installing dependencies
+      - name: installing dependencies and build
         run: |
           yarn install
-      - name: compile
-        run: |
           tools/align-version.sh
           yarn build
-        env:
-          TERRAFORM_BINARY_NAME: "terraform${{ matrix.terraform }}"
-      - name: test
-        run: |
-          yarn test
-        env:
-          TERRAFORM_BINARY_NAME: "terraform${{ matrix.terraform }}"
-      - name: create bundle
-        run: yarn package
+          yarn package
       - name: Upload dist
-        if: ${{ matrix.terraform == '0.14.11' }}
         uses: actions/upload-artifact@v2
         with:
           name: dist
           path: dist
+      - name: installing test dependencies
+        run: |
+          cd test && yarn install
+      - id: build-test-matrix
+        run: |
+          ./tools/build-test-matrix.sh
 
   linux_integration:
+    needs: prepare-integration-tests
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        terraform: ["0.14.11", "0.15.4"]
-        target: ["typescript", "python", "java", "csharp", "go"]
+      fail-fast: false
+      matrix: ${{fromJSON(needs.prepare-integration-tests.outputs.tests)}}
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
-    needs: build
     env:
       CHECKPOINT_DISABLE: "1"
       TERRAFORM_VERSION: ${{ matrix.terraform }}
 
     steps:
       - uses: actions/checkout@v2
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
       - name: Download dist
         uses: actions/download-artifact@v2
         with:
           name: dist
           path: dist
-      - name: installing dependencies
-        run: yarn install
+      - name: install test dependencies
+        run: cd test && yarn
       - name: integration tests
-        run: yarn integration:${TEST_TARGET}
+        run: cd test && ./run-against-dist npx jest ${TEST_TARGET}
         env:
           TEST_TARGET: ${{ matrix.target }}
           TERRAFORM_CLOUD_TOKEN: ${{ secrets.TERRAFORM_CLOUD_TOKEN }}
           TERRAFORM_BINARY_NAME: "terraform${{ matrix.terraform }}"
 
   windows_integration:
+    needs: prepare-integration-tests
     runs-on: windows-latest
     strategy:
-      matrix:
-        terraform: ["0.14.11", "0.15.4"]
-        target: ["typescript", "python", "java", "csharp", "go"]
-    needs: build
+      fail-fast: false
+      matrix: ${{fromJSON(needs.prepare-integration-tests.outputs.tests)}}
     env:
       CHECKPOINT_DISABLE: "1"
       TERRAFORM_VERSION: ${{ matrix.terraform }}
 
     steps:
       - uses: actions/checkout@v2
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
       - name: HashiCorp - Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
@@ -129,10 +102,10 @@ jobs:
         with:
           name: dist
           path: dist
-      - name: installing dependencies
-        run: yarn install
+      - name: install test dependencies
+        run: cd test && yarn
       - name: integration tests
-        run: yarn integration:windows:${env:TEST_TARGET}
+        run: cd test && ./run-against-dist.bat "npx jest ${env:TEST_TARGET}"
         env:
           TEST_TARGET: ${{ matrix.target }}
           TERRAFORM_CLOUD_TOKEN: ${{ secrets.TERRAFORM_CLOUD_TOKEN }}

.github/workflows/pr-lint.yml

@@ -30,6 +30,7 @@ jobs:
             cli
             hcl2json
             hcl2cdk
+            provider-generator
             tests
             examples
             readme

.github/workflows/release.yml

@@ -6,11 +6,14 @@ on:
     paths-ignore:
       - "**.md"
       - "docs/**"
+      - "website/**"
 
 jobs:
-  build_artifact:
+  prepare-release:
     if: github.repository == 'hashicorp/terraform-cdk'
     runs-on: ubuntu-latest
+    outputs:
+      tests: ${{ steps.build-test-matrix.outputs.tests }}
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
     env:
@@ -30,23 +33,70 @@ jobs:
           yarn test
       - name: create bundle
         run: yarn package
-      - name: integration tests
-        run: yarn integration
-        env:
-          TERRAFORM_CLOUD_TOKEN: ${{ secrets.TERRAFORM_CLOUD_TOKEN }}
       - name: Upload artifact
         uses: actions/upload-artifact@v1
         with:
           name: dist
           path: dist
+      - name: installing test dependencies
+        run: |
+          cd test && yarn install
+      - id: build-test-matrix
+        run: |
+          ./tools/build-test-matrix.sh
+
+  integration-tests:
+    needs: prepare-release
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJSON(needs.prepare-release.outputs.tests)}}
+    container:
+      image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
+    env:
+      CHECKPOINT_DISABLE: "1"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download dist
+        uses: actions/download-artifact@v2
+        with:
+          name: dist
+          path: dist
+      - name: install test dependencies
+        run: cd test && yarn
+      - name: integration tests
+        run: cd test && ./run-against-dist npx jest ${TEST_TARGET}
+        env:
+          TEST_TARGET: ${{ matrix.target }}
+          TERRAFORM_CLOUD_TOKEN: ${{ secrets.TERRAFORM_CLOUD_TOKEN }}
+
+  release_github:
+    name: Release to Github
+    needs:
+      - prepare-release
+      - integration-tests
+    runs-on: ubuntu-latest
+    container:
+      image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
+    steps:
+      - uses: actions/checkout@v2
+      - name: installing dependencies
+        run: |
+          yarn install
+      - name: Download build artifacts
+        uses: actions/download-artifact@v1
+        with:
+          name: dist
       - name: Release to github
         run: yarn release-github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   release_npm:
     name: Release to Github Packages NPM regitry
-    needs: build_artifact
+    needs:
+      - prepare-release
+      - integration-tests
     runs-on: ubuntu-latest
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
@@ -62,7 +112,9 @@ jobs:
 
   release_pypi:
     name: Release to PyPi
-    needs: build_artifact
+    needs:
+      - prepare-release
+      - integration-tests
     runs-on: ubuntu-latest
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
@@ -79,7 +131,9 @@ jobs:
 
   release_maven:
     name: Release to Maven
-    needs: build_artifact
+    needs:
+      - prepare-release
+      - integration-tests
     runs-on: ubuntu-latest
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
@@ -100,7 +154,9 @@ jobs:
 
   release_nuget:
     name: Release to NuGet
-    needs: build_artifact
+    needs:
+      - prepare-release
+      - integration-tests
     runs-on: ubuntu-latest
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
@@ -117,7 +173,9 @@ jobs:
 
   release_golang:
     name: Release Go to Github Repo
-    needs: build_artifact
+    needs:
+      - prepare-release
+      - integration-tests
     runs-on: ubuntu-latest
     container:
       image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform