From 34efe544f3495c23645a317696807cc88f66fffc Mon Sep 17 00:00:00 2001 From: Yurii Rochniak Date: Thu, 22 Apr 2021 20:19:09 +0200 Subject: [PATCH] Upgrade to TF0.15 (#72) * Upgrade to TF0.15 * Ignore docs for the builds --- .github/workflows/terratest.yml | 14 +++++++++++--- README.md | 1 + provider.tf | 14 +++----------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/terratest.yml b/.github/workflows/terratest.yml index aa414c4..a9750fa 100644 --- a/.github/workflows/terratest.yml +++ b/.github/workflows/terratest.yml @@ -5,8 +5,16 @@ on: branches: - master - terraform011 + paths-ignore: + - '**.md' pull_request: - types: [opened, edited, reopened, synchronize] + types: + - opened + - edited + - reopened + - synchronize + paths-ignore: + - '**.md' jobs: terraform-static: @@ -14,7 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - terraform: ['0.14.10', '0.15.0'] + terraform: ['0.15.0'] steps: - name: 'Checkout' uses: actions/checkout@master @@ -34,7 +42,7 @@ jobs: strategy: max-parallel: 1 matrix: - terraform: ['0.14.6', '0.15.0'] + terraform: ['0.15.0'] steps: - name: Set up Go uses: actions/setup-go@v2 diff --git a/README.md b/README.md index e18fd5f..cfc9454 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ You can also manage peering options, but you need to run `apply` twice to do tha **Always make sure you pinned the module version!** +* For Terraform versions `>=0.15` use `v4.*` versions of this module * For Terraform versions `>=0.13` use `v3.*` versions of this module * For Terraform versions `>=0.12 <0.13` use `v2.*` versions of this module * If you're still using Terraform `0.11`, you can use `v1.*` versions of this module diff --git a/provider.tf b/provider.tf index f57a4ac..8f92e26 100644 --- a/provider.tf +++ b/provider.tf @@ -1,17 +1,9 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 3.0" + source = "hashicorp/aws" + version = "~> 3.37" + configuration_aliases = [aws.this, aws.peer] } } } - -# Aliases are required because of cross-region -provider "aws" { - alias = "this" -} - -provider "aws" { - alias = "peer" -}