From ad8bba4ef4fd69325a4955f59682419b2a26e5fb Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 10 Mar 2021 15:57:51 +0100 Subject: [PATCH 1/5] Update Terraform versions which are tested against --- .github/workflows/build.yml | 8 ++++---- .github/workflows/examples.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 945a2243b6..a34c72901b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - terraform: ["0.12.29", "0.13.4", "0.14.0"] + terraform: ["0.13.6", "0.14.7", "0.15.0-beta1"] container: image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform env: @@ -45,7 +45,7 @@ jobs: - name: create bundle run: yarn package - name: Upload dist - if: ${{ matrix.terraform == '0.12.29' }} + if: ${{ matrix.terraform == '0.14.7' }} uses: actions/upload-artifact@v2 with: name: dist @@ -55,7 +55,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - terraform: ["0.12.29", "0.13.4", "0.14.0"] + terraform: ["0.13.6", "0.14.7", "0.15.0-beta1"] target: ["typescript", "python", "java", "csharp"] container: image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform @@ -94,7 +94,7 @@ jobs: runs-on: windows-latest strategy: matrix: - terraform: ["0.12.29", "0.13.4", "0.14.0"] + terraform: ["0.13.6", "0.14.7", "0.15.0-beta1"] target: ["typescript", "python", "java", "csharp"] needs: build env: diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 0cb8455e7d..dc8d685a36 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - terraform: ["0.14.0"] + terraform: ["0.14.7"] target: ["python", "csharp", "java", "typescript"] container: image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform From 46193b05c784ad1a0783c5b10a8ff545b09ec5f1 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 10 Mar 2021 16:19:50 +0100 Subject: [PATCH 2/5] Cleanup old Terraform versions --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dd6fe442f..c85655941f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV DEFAULT_TERRAFORM_VERSION=0.14.7 \ MAVEN_OPTS="-Xms256m -Xmx3G" # Install Terraform -RUN AVAILABLE_TERRAFORM_VERSIONS="0.12.29 0.13.0 0.13.4 0.13.6 0.14.0 ${DEFAULT_TERRAFORM_VERSION} 0.15.0-beta1" && \ +RUN AVAILABLE_TERRAFORM_VERSIONS="0.13.6 ${DEFAULT_TERRAFORM_VERSION} 0.15.0-beta1" && \ for VERSION in ${AVAILABLE_TERRAFORM_VERSIONS}; do curl -LOk https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_linux_amd64.zip && \ mkdir -p /usr/local/bin/tf/versions/${VERSION} && \ unzip terraform_${VERSION}_linux_amd64.zip -d /usr/local/bin/tf/versions/${VERSION} && \ From 2d3880d11a01e7d518b136d7bf33b7a06dfb4201 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 10 Mar 2021 16:25:18 +0100 Subject: [PATCH 3/5] trigger build From 2435d0f340473a7d307bc814eb9b7f1da049ac1e Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 10 Mar 2021 21:07:53 +0100 Subject: [PATCH 4/5] Drop support for 0.12 --- packages/cdktf-cli/bin/cmds/terraform-check.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cdktf-cli/bin/cmds/terraform-check.ts b/packages/cdktf-cli/bin/cmds/terraform-check.ts index 75aff72979..4ff119fd20 100644 --- a/packages/cdktf-cli/bin/cmds/terraform-check.ts +++ b/packages/cdktf-cli/bin/cmds/terraform-check.ts @@ -1,7 +1,7 @@ import { TerraformCli } from './ui/models/terraform-cli' import * as semver from 'semver'; -const MIN_SUPPORTED_VERSION = '0.12.0' +const MIN_SUPPORTED_VERSION = '0.13.0' const VERSION_REGEXP = /Terraform v\d+.\d+.\d+/ export const terraformCheck = async (): Promise => { From 2f1cc9ac58df1d02878f7ca4846cdfcdb41ef980 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Thu, 11 Mar 2021 10:09:56 +0100 Subject: [PATCH 5/5] Don't drop out for unsupported versions Technically, versions like `0.12` might still work. So, I think for the time being it's ok to print the warning only. If we see an increase in support issues around this, we should reconsider --- packages/cdktf-cli/bin/cmds/terraform-check.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/cdktf-cli/bin/cmds/terraform-check.ts b/packages/cdktf-cli/bin/cmds/terraform-check.ts index 4ff119fd20..37963a83d4 100644 --- a/packages/cdktf-cli/bin/cmds/terraform-check.ts +++ b/packages/cdktf-cli/bin/cmds/terraform-check.ts @@ -17,9 +17,8 @@ export const terraformCheck = async (): Promise => { const cleanTerraformVersion = semver.clean(terraformVersionMatches[0].substring(terraformVersionMatches[0].indexOf('v'))) if (cleanTerraformVersion && semver.lt(cleanTerraformVersion, MIN_SUPPORTED_VERSION)) { - const errorMessage = `Error: unsupported Terraform version [${cleanTerraformVersion}] - please upgrade to >=${MIN_SUPPORTED_VERSION}` - console.error(errorMessage) - process.exit(1) + const warningMessage = `Warning: unsupported Terraform version [${cleanTerraformVersion}] - please upgrade to >=${MIN_SUPPORTED_VERSION}` + console.warn(warningMessage) } } } catch(e) {