From ddaedbacbb63715364747d08043202754c018341 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 15:04:02 +0100 Subject: [PATCH 01/16] chore: add expression paranthesis --- .github/workflows/unit-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index e8a49350f9..dc3b8547be 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -10,8 +10,8 @@ on: - reopened jobs: - unit_test_for_prs: - if: contains(github.event.pull_request.labels.*.name, 'ci/run-unit') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') + all_unit_tests: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') }} uses: ./.github/workflows/unit.yml strategy: fail-fast: false From 87c211822f1f2a7b88836014d341e5e040687410 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 15:07:26 +0100 Subject: [PATCH 02/16] chore: remove matrix from unit test workflow --- .github/workflows/unit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 5f082a551b..6423755e21 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,9 +20,6 @@ concurrency: jobs: unit-test: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: ${{fromJSON(needs.build-test-matrix.outputs.tests)}} container: image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform env: From 5ce2b0a57d955030ab3bb41c5f89c1c995a957a9 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 15:07:51 +0100 Subject: [PATCH 03/16] chore: use only one trigger --- .github/workflows/unit-all.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index dc3b8547be..0d2897e0a8 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -1,13 +1,6 @@ name: Unit Tests - PR on: pull_request: {} - pull_request_target: - types: - - opened - - edited - - synchronize - - labeled - - reopened jobs: all_unit_tests: From ef42aaa0277db13163b75c0ec926450c78376a61 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 15:42:23 +0100 Subject: [PATCH 04/16] chore: trigger CI by labels only A new action helps by assigning labels based on the changed files. A new set of labels makes it easy to distinguish which unit tests should be run. We also set the trigger to only one target (the one coresponding to label changes), so that no CI run is double triggered and nothing needs to be aborted. --- .github/labeler.yml | 55 +++++++++++ .github/workflows/examples-pr.yml | 3 +- .github/workflows/integration-pr.yml | 3 +- .../workflows/{pr-size.yml => pr-labels.yml} | 17 +++- .github/workflows/unit-@cdktf-api-core.yml | 24 ----- .github/workflows/unit-@cdktf-commons.yml | 24 ----- .github/workflows/unit-@cdktf-hcl2cdk.yml | 24 ----- .github/workflows/unit-@cdktf-hcl2json.yml | 24 ----- .../unit-@cdktf-provider-generator.yml | 24 ----- .github/workflows/unit-all.yml | 99 ++++++++++++++++++- .github/workflows/unit-cdktf-cli.yml | 24 ----- .github/workflows/unit-cdktf.yml | 24 ----- 12 files changed, 169 insertions(+), 176 deletions(-) create mode 100644 .github/labeler.yml rename .github/workflows/{pr-size.yml => pr-labels.yml} (70%) delete mode 100644 .github/workflows/unit-@cdktf-api-core.yml delete mode 100644 .github/workflows/unit-@cdktf-commons.yml delete mode 100644 .github/workflows/unit-@cdktf-hcl2cdk.yml delete mode 100644 .github/workflows/unit-@cdktf-hcl2json.yml delete mode 100644 .github/workflows/unit-@cdktf-provider-generator.yml delete mode 100644 .github/workflows/unit-cdktf-cli.yml delete mode 100644 .github/workflows/unit-cdktf.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000000..83d852bc48 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,55 @@ +ci/run-unit/@cdktf/api-core: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/@cdktf/api-core/**" + # All scripts we use + - "tools/align-version.sh" + +ci/run-unit/@cdktf/commons: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/@cdktf/commons/**" + # All scripts we use + - "tools/align-version.sh" + +ci/run-unit/@cdktf/hcl2cdk: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/@cdktf/hcl2cdk/**" + # All scripts we use + - "tools/align-version.sh" + +ci/run-unit/@cdktf/hcl2json: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/@cdktf/hcl2json/**" + # All scripts we use + - "tools/align-version.sh" + +ci/run-unit/@cdktf/provider-generator: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/@cdktf/provider-generator/**" + # All scripts we use + - "tools/align-version.sh" + +ci/run-unit/cdktf-cli: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/cdktf-cli/**" + # All scripts we use + - "tools/align-version.sh" + +ci/run-unit/cdktf: + # The workflow used + - ".github/workflows/unit.yml" + # All packages under test + - "packages/cdktf/**" + # All scripts we use + - "tools/align-version.sh" diff --git a/.github/workflows/examples-pr.yml b/.github/workflows/examples-pr.yml index f6cba6ccb3..470005af01 100644 --- a/.github/workflows/examples-pr.yml +++ b/.github/workflows/examples-pr.yml @@ -1,6 +1,5 @@ name: Examples - PR on: - pull_request: {} pull_request_target: types: - opened @@ -11,7 +10,7 @@ on: jobs: examples: - if: contains(github.event.pull_request.labels.*.name, 'ci/run-examples') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-examples') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') }} uses: ./.github/workflows/examples.yml with: concurrency_group_prefix: pr diff --git a/.github/workflows/integration-pr.yml b/.github/workflows/integration-pr.yml index b13094bec2..89ea62522e 100644 --- a/.github/workflows/integration-pr.yml +++ b/.github/workflows/integration-pr.yml @@ -1,6 +1,5 @@ name: Integration Tests - PR on: - pull_request: {} pull_request_target: types: - opened @@ -11,7 +10,7 @@ on: jobs: integration_test: - if: contains(github.event.pull_request.labels.*.name, 'ci/run-integration') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-integration') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') }} uses: ./.github/workflows/integration.yml with: concurrency_group_prefix: pr diff --git a/.github/workflows/pr-size.yml b/.github/workflows/pr-labels.yml similarity index 70% rename from .github/workflows/pr-size.yml rename to .github/workflows/pr-labels.yml index b8caafaf30..e1dd30680c 100644 --- a/.github/workflows/pr-size.yml +++ b/.github/workflows/pr-labels.yml @@ -1,9 +1,20 @@ -name: PR Size label - +name: "Pull Request Labeler" on: [pull_request] jobs: - labeler: + pr_ci_trigger: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v4 + with: + # The config file lives under .github/labeler.yml + repo-token: "${{ secrets.GITHUB_TOKEN }}" + sync-labels: false # If set to true we could not easily overwrite it individually + + pr_size: runs-on: ubuntu-latest name: Label the PR size steps: diff --git a/.github/workflows/unit-@cdktf-api-core.yml b/.github/workflows/unit-@cdktf-api-core.yml deleted file mode 100644 index 92110bf59e..0000000000 --- a/.github/workflows/unit-@cdktf-api-core.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - @cdktf/api-core -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-@cdktf-api-core.yml" - # All packages under test - - "packages/@cdktf/api-core/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf-core - package: "@cdktf/api-core" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit diff --git a/.github/workflows/unit-@cdktf-commons.yml b/.github/workflows/unit-@cdktf-commons.yml deleted file mode 100644 index 2f99688cfd..0000000000 --- a/.github/workflows/unit-@cdktf-commons.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - @cdktf/commons -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-@cdktf-commons.yml" - # All packages under test - - "packages/@cdktf/commons/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf-commons - package: "@cdktf/commons" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit diff --git a/.github/workflows/unit-@cdktf-hcl2cdk.yml b/.github/workflows/unit-@cdktf-hcl2cdk.yml deleted file mode 100644 index 60d76aafb1..0000000000 --- a/.github/workflows/unit-@cdktf-hcl2cdk.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - @cdktf/hcl2cdk -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-@cdktf-hcl2cdk.yml" - # All packages under test - - "packages/@cdktf/hcl2cdk/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf-hcl2cdk - package: "@cdktf/hcl2cdk" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit diff --git a/.github/workflows/unit-@cdktf-hcl2json.yml b/.github/workflows/unit-@cdktf-hcl2json.yml deleted file mode 100644 index 4510a2d336..0000000000 --- a/.github/workflows/unit-@cdktf-hcl2json.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - @cdktf/hcl2json -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-@cdktf-hcl2json.yml" - # All packages under test - - "packages/@cdktf/hcl2json/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf-hcl2json - package: "@cdktf/hcl2json" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit diff --git a/.github/workflows/unit-@cdktf-provider-generator.yml b/.github/workflows/unit-@cdktf-provider-generator.yml deleted file mode 100644 index aa75804485..0000000000 --- a/.github/workflows/unit-@cdktf-provider-generator.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - @cdktf/provider-generator -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-@cdktf-provider-gener@cdktf/provider-generator.yml" - # All packages under test - - "packages/@cdktf/provider-generator/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf-provider-generator - package: "@cdktf/provider-generator" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index 0d2897e0a8..f91f0c6f57 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -1,6 +1,12 @@ name: Unit Tests - PR on: - pull_request: {} + pull_request_target: + types: + - opened + - edited + - synchronize + - labeled + - reopened jobs: all_unit_tests: @@ -25,3 +31,94 @@ jobs: package: ${{ matrix.package }} terraform_version: ${{ matrix.terraform_version }} secrets: inherit + + cdktf_api_core: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/api-core') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf-api-core + package: "@cdktf/api-core" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit + + cdktf_commons: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/commons') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf-commons + package: "@cdktf/commons" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit + + cdktf_hcl2cdk: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/hcl2cdk') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf-hcl2cdk + package: "@cdktf/hcl2cdk" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit + + cdktf_hcl2json: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/hcl2json') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf-hcl2json + package: "@cdktf/hcl2json" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit + + cdktf_provider_generator: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/provider-generator') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf-provider-generator + package: "@cdktf/provider-generator" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit + + cdktf_cli: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/cdktf-cli') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf-cli + package: "cdktf-cli" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit + + cdktf: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/cdktf') }} + uses: ./.github/workflows/unit.yml + strategy: + fail-fast: false + matrix: + terraform_version: ["1.2.8"] + with: + concurrency_group_prefix: pr-cdktf + package: "cdktf" + terraform_version: ${{ matrix.terraform_version }} + secrets: inherit diff --git a/.github/workflows/unit-cdktf-cli.yml b/.github/workflows/unit-cdktf-cli.yml deleted file mode 100644 index 99d2f0b742..0000000000 --- a/.github/workflows/unit-cdktf-cli.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - cdktf-cli -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-cdktf-cli.yml" - # All packages under test - - "packages/cdktf-cli/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf-cli - package: "cdktf-cli" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit diff --git a/.github/workflows/unit-cdktf.yml b/.github/workflows/unit-cdktf.yml deleted file mode 100644 index 516b562807..0000000000 --- a/.github/workflows/unit-cdktf.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Unit Tests - cdktf -on: - pull_request: - paths: - # This workflow - - ".github/workflows/unit-cdktf.yml" - # All packages under test - - "packages/cdktf/**" - # All scripts we use - - "tools/build-unit-test-matrix.sh" - - "tools/align-version.sh" - -jobs: - unit_test: - uses: ./.github/workflows/unit.yml - strategy: - fail-fast: false - matrix: - terraform_version: ["1.2.8"] - with: - concurrency_group_prefix: pr-cdktf - package: "cdktf" - terraform_version: ${{ matrix.terraform_version }} - secrets: inherit From a34f865d8a40be95e80a49c020dccb52f8394722 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 15:52:53 +0100 Subject: [PATCH 05/16] chore: add debugging job --- .github/workflows/unit-all.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index f91f0c6f57..3a0b63ed2c 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -9,6 +9,12 @@ on: - reopened jobs: + debugging: + runs-on: ubuntu-latest + steps: + - name: "Debug" + run: echo hi + all_unit_tests: if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') }} uses: ./.github/workflows/unit.yml From 6d8241250cc1c1e06e013cc5d1e61e4382dd224b Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 16:52:54 +0100 Subject: [PATCH 06/16] chore: try again --- .github/workflows/unit-all.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index 3a0b63ed2c..decb313582 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -1,5 +1,6 @@ name: Unit Tests - PR on: + pull_request: {} pull_request_target: types: - opened From 66583ec507eb91e957bc8604bed44eb001276fc5 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 17:20:27 +0100 Subject: [PATCH 07/16] chore: remove debugging step --- .github/workflows/unit-all.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index decb313582..cdd7b00921 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -10,12 +10,6 @@ on: - reopened jobs: - debugging: - runs-on: ubuntu-latest - steps: - - name: "Debug" - run: echo hi - all_unit_tests: if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit') || contains(github.event.pull_request.labels.*.name, 'ci/run-all') }} uses: ./.github/workflows/unit.yml From 2a5231ffb6304df7236de5b248405e51d676ef9e Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 17:20:40 +0100 Subject: [PATCH 08/16] chore: ensure caching dirs are in place --- .github/workflows/unit.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 6423755e21..ec6179466d 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -31,6 +31,10 @@ jobs: - name: Get yarn cache directory path id: global-cache-dir-path run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT + - name: ensure all plugin directories exist + run: | + mkdir -p ${{ steps.global-cache-dir-path.outputs.dir }}/terraform-plugins + mkdir -p ${{ steps.global-cache-dir-path.outputs.dir }}/go-cache - uses: actions/cache@v3 id: global-cache # use this to check for `cache-hit` (`steps.global-cache.outputs.cache-hit != 'true'`) with: From 5aa99a42e6cf7ef97597a26970510fd3b67c54cc Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Tue, 22 Nov 2022 17:22:55 +0100 Subject: [PATCH 09/16] chore: correct package name --- .github/labeler.yml | 4 ++-- .github/workflows/unit-all.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 83d852bc48..4871cb4eb4 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,8 +1,8 @@ -ci/run-unit/@cdktf/api-core: +ci/run-unit/@cdktf/cli-core: # The workflow used - ".github/workflows/unit.yml" # All packages under test - - "packages/@cdktf/api-core/**" + - "packages/@cdktf/cli-core/**" # All scripts we use - "tools/align-version.sh" diff --git a/.github/workflows/unit-all.yml b/.github/workflows/unit-all.yml index cdd7b00921..b979815d28 100644 --- a/.github/workflows/unit-all.yml +++ b/.github/workflows/unit-all.yml @@ -33,16 +33,16 @@ jobs: terraform_version: ${{ matrix.terraform_version }} secrets: inherit - cdktf_api_core: - if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/api-core') }} + cdktf_cli_core: + if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/run-unit/@cdktf/cli-core') }} uses: ./.github/workflows/unit.yml strategy: fail-fast: false matrix: terraform_version: ["1.2.8"] with: - concurrency_group_prefix: pr-cdktf-api-core - package: "@cdktf/api-core" + concurrency_group_prefix: pr-cdktf-cli-core + package: "@cdktf/cli-core" terraform_version: ${{ matrix.terraform_version }} secrets: inherit From a0a3689f2f592502e9fd589c766d7d61b0cbbee4 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Wed, 23 Nov 2022 10:58:35 +0100 Subject: [PATCH 10/16] chore: fix unit tests --- packages/@cdktf/cli-core/src/test/lib/cdktf-project.test.ts | 2 +- packages/@cdktf/commons/src/config.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@cdktf/cli-core/src/test/lib/cdktf-project.test.ts b/packages/@cdktf/cli-core/src/test/lib/cdktf-project.test.ts index 0a6ee32a91..bb8b869491 100644 --- a/packages/@cdktf/cli-core/src/test/lib/cdktf-project.test.ts +++ b/packages/@cdktf/cli-core/src/test/lib/cdktf-project.test.ts @@ -49,7 +49,7 @@ describe("CdktfProject", () => { Name: "cdktf-api-test", }, sendCrashReports: false, - dist: path.join(__dirname, "../../../../../dist"), + dist: path.join(__dirname, "../../../../../../dist"), }); fs.copyFileSync( diff --git a/packages/@cdktf/commons/src/config.test.ts b/packages/@cdktf/commons/src/config.test.ts index 24ae2c51f1..4bfd9c133f 100644 --- a/packages/@cdktf/commons/src/config.test.ts +++ b/packages/@cdktf/commons/src/config.test.ts @@ -131,7 +131,7 @@ describe("parseConfig", () => { }; const parsed: any = parseConfig(JSON.stringify(input)); expect(parsed.terraformModules[0].localSource).toMatch( - "/packages/@cdktf/provider-generator/foo" + "/packages/@cdktf/commons/foo" ); }); @@ -232,7 +232,7 @@ describe("parseConfig", () => { const parsed: any = parseConfig(JSON.stringify(input)); expect(parsed.terraformModules[0].localSource).toMatch( - "/packages/@cdktf/provider-generator/consul" + "/packages/@cdktf/commons/consul" ); expect(parsed.terraformModules[0].name).toMatch("consul"); From 787a90f93fa627aa327e1be8931d2d57dd283ef9 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Wed, 23 Nov 2022 11:15:43 +0100 Subject: [PATCH 11/16] chore: fix mocking --- .../src/test/lib/dependencies/prebuilt-providers.test.ts | 8 ++++---- .../cli-core/src/test/lib/terraform-parallelism.test.ts | 4 ++-- .../cli-core/src/test/models/terraform-cloud.test.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/@cdktf/cli-core/src/test/lib/dependencies/prebuilt-providers.test.ts b/packages/@cdktf/cli-core/src/test/lib/dependencies/prebuilt-providers.test.ts index 6684c4f49f..6f9cfb49be 100644 --- a/packages/@cdktf/cli-core/src/test/lib/dependencies/prebuilt-providers.test.ts +++ b/packages/@cdktf/cli-core/src/test/lib/dependencies/prebuilt-providers.test.ts @@ -9,10 +9,6 @@ import { getPrebuiltProviderRepositoryName, resetFetchCache, } from "../../../lib/dependencies/prebuilt-providers"; -import "../../../lib/logging"; - -// Prevent logging outputs from polluting the test results -jest.mock("../../../lib/logging"); function buildNpmResponse( version = "0.0.0", @@ -44,11 +40,15 @@ function buildNpmResponse( } describe("prebuilt-providers", () => { + const initialLogLevel = process.env.CDKTF_LOG_LEVEL; beforeAll(() => { + // Prevent logging outputs from polluting the test results + process.env.CDKTF_LOG_LEVEL = "error"; nock.disableNetConnect(); }); afterAll(() => { + process.env.CDKTF_LOG_LEVEL = initialLogLevel; nock.cleanAll(); nock.enableNetConnect(); }); diff --git a/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts b/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts index 6f2cf929ac..fe98813d84 100644 --- a/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts +++ b/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts @@ -4,8 +4,8 @@ import os from "os"; import { CdktfProject, init, get } from "../../lib/index"; import { exec, Language } from "@cdktf/commons"; -jest.mock("../../lib/util", () => { - const originalModule = jest.requireActual("../../lib/util"); +jest.mock("@cdktf/commons", () => { + const originalModule = jest.requireActual("@cdktf/commons"); return { __esmodule: true, diff --git a/packages/@cdktf/cli-core/src/test/models/terraform-cloud.test.ts b/packages/@cdktf/cli-core/src/test/models/terraform-cloud.test.ts index 86a57526aa..85a8601a29 100644 --- a/packages/@cdktf/cli-core/src/test/models/terraform-cloud.test.ts +++ b/packages/@cdktf/cli-core/src/test/models/terraform-cloud.test.ts @@ -3,7 +3,7 @@ import { logger } from "@cdktf/commons"; import { logBetterErrorAndThrow } from "../../lib/models/terraform-cloud"; -jest.mock("../../lib/logging"); +jest.mock("@cdktf/commons"); describe("BeautifyErrors", () => { afterEach(() => { From bc19f2d033efdddf3357044357d9eb7a5626b17b Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Wed, 23 Nov 2022 11:45:38 +0100 Subject: [PATCH 12/16] chore: fix dist path --- .../@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts b/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts index fe98813d84..f0197e6a70 100644 --- a/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts +++ b/packages/@cdktf/cli-core/src/test/lib/terraform-parallelism.test.ts @@ -58,7 +58,7 @@ describe("terraform parallelism", () => { Name: "cdktf-api-test", }, sendCrashReports: false, - dist: path.join(__dirname, "../../../../../dist"), + dist: path.join(__dirname, "../../../../../../dist"), }); fs.copyFileSync( From e23651af6bb6a3e6bbbd75c483b28627c0be7ab0 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Wed, 23 Nov 2022 14:27:26 +0100 Subject: [PATCH 13/16] chore: always release a next version --- .github/workflows/release_next.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/release_next.yml b/.github/workflows/release_next.yml index 6bc6f54b8b..047854e205 100644 --- a/.github/workflows/release_next.yml +++ b/.github/workflows/release_next.yml @@ -3,11 +3,6 @@ on: push: branches: - main - paths: - - "packages/**" - - "tools/**" - - "package.json" - - "yarn.lock" env: SENTRY_ORG: hashicorp From 15a7554aa69a0565f294636e4e7fffa870567645 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Wed, 23 Nov 2022 16:50:27 +0100 Subject: [PATCH 14/16] chore: fix documentation example --- examples/csharp/documentation/MyTerraformStack.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/csharp/documentation/MyTerraformStack.csproj b/examples/csharp/documentation/MyTerraformStack.csproj index 6932f8906c..ca9b6694de 100644 --- a/examples/csharp/documentation/MyTerraformStack.csproj +++ b/examples/csharp/documentation/MyTerraformStack.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp5.0 + netcoreapp3.1 1 From 43dfb855d521ed1e6a766f296254a2bd29fca1b1 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Thu, 24 Nov 2022 12:26:16 +0100 Subject: [PATCH 15/16] chore: remove JSII runtime dependency --- examples/csharp/documentation/MyTerraformStack.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/csharp/documentation/MyTerraformStack.csproj b/examples/csharp/documentation/MyTerraformStack.csproj index ca9b6694de..22fcdde57f 100644 --- a/examples/csharp/documentation/MyTerraformStack.csproj +++ b/examples/csharp/documentation/MyTerraformStack.csproj @@ -10,10 +10,6 @@ - - - - From c24702a0b48496bceaf9e8faf5a63b52b76e90eb Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Thu, 24 Nov 2022 13:28:27 +0100 Subject: [PATCH 16/16] chore: remove warning level --- examples/csharp/documentation/MyTerraformStack.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/csharp/documentation/MyTerraformStack.csproj b/examples/csharp/documentation/MyTerraformStack.csproj index 22fcdde57f..535a47875f 100644 --- a/examples/csharp/documentation/MyTerraformStack.csproj +++ b/examples/csharp/documentation/MyTerraformStack.csproj @@ -3,7 +3,6 @@ Exe netcoreapp3.1 - 1