From f7a97412dafb78b588ebb556e01fafb5e2dd44ad Mon Sep 17 00:00:00 2001 From: David Mattia <8922077+dmattia@users.noreply.github.com> Date: Wed, 9 Dec 2020 10:33:21 -0600 Subject: [PATCH] work for terraform 0.14 (#20) * work for terraform 0.14 * update example modules * Updated README.md * change source format * req tf 0.13 minimum * upgrade version reqs * Updated README.md * Executed 'terraform fmt' Co-authored-by: dmattia Co-authored-by: actions-bot <58130806+actions-bot@users.noreply.github.com> --- README.md | 12 ++++++++---- context.tf | 3 ++- docs/terraform.md | 8 ++++---- examples/complete/context.tf | 3 ++- examples/complete/versions.tf | 17 +++++++++++++---- versions.tf | 19 ++++++++++++++----- 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index e188281..0141906 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ + # terraform-aws-kms-key [![Latest Release](https://img.shields.io/github/release/cloudposse/terraform-aws-kms-key.svg)](https://github.com/cloudposse/terraform-aws-kms-key/releases/latest) [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com) + [![README Header][readme_header_img]][readme_header_link] @@ -106,16 +108,16 @@ Available targets: | Name | Version | |------|---------| -| terraform | >= 0.12.0 | -| aws | >= 2.0 | -| local | >= 1.2 | +| terraform | >= 0.13 | +| aws | >= 3.0 | +| local | >= 1.3 | | null | >= 2.0 | ## Providers | Name | Version | |------|---------| -| aws | >= 2.0 | +| aws | >= 3.0 | ## Inputs @@ -298,8 +300,10 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply ### Contributors + | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]
[Andriy Knysh][aknysh_homepage] | [![Erik Osterman][osterman_avatar]][osterman_homepage]
[Erik Osterman][osterman_homepage] | [![Igor Rodionov][goruha_avatar]][goruha_homepage]
[Igor Rodionov][goruha_homepage] | |---|---|---| + [aknysh_homepage]: https://github.com/aknysh [aknysh_avatar]: https://img.cloudposse.com/150x150/https://github.com/aknysh.png diff --git a/context.tf b/context.tf index bae0cf1..1b135ad 100644 --- a/context.tf +++ b/context.tf @@ -19,7 +19,8 @@ # module "this" { - source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.19.2" + source = "cloudposse/label/null" + version = "0.22.0" enabled = var.enabled namespace = var.namespace diff --git a/docs/terraform.md b/docs/terraform.md index 85cc0ca..1d6957c 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -3,16 +3,16 @@ | Name | Version | |------|---------| -| terraform | >= 0.12.0 | -| aws | >= 2.0 | -| local | >= 1.2 | +| terraform | >= 0.13 | +| aws | >= 3.0 | +| local | >= 1.3 | | null | >= 2.0 | ## Providers | Name | Version | |------|---------| -| aws | >= 2.0 | +| aws | >= 3.0 | ## Inputs diff --git a/examples/complete/context.tf b/examples/complete/context.tf index bae0cf1..1b135ad 100644 --- a/examples/complete/context.tf +++ b/examples/complete/context.tf @@ -19,7 +19,8 @@ # module "this" { - source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.19.2" + source = "cloudposse/label/null" + version = "0.22.0" enabled = var.enabled namespace = var.namespace diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 88183d0..34bd9eb 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,9 +1,18 @@ terraform { - required_version = ">= 0.12.0" + required_version = ">= 0.13" required_providers { - aws = ">= 2.0" - local = ">= 1.2" - null = ">= 2.0" + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + local = { + source = "hashicorp/local" + version = ">= 1.3" + } + null = { + source = "hashicorp/null" + version = ">= 2.0" + } } } diff --git a/versions.tf b/versions.tf index 88183d0..babd110 100644 --- a/versions.tf +++ b/versions.tf @@ -1,9 +1,18 @@ terraform { - required_version = ">= 0.12.0" + required_version = ">= 0.13" required_providers { - aws = ">= 2.0" - local = ">= 1.2" - null = ">= 2.0" + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + local = { + source = "hashicorp/local" + version = ">= 1.3" + } + null = { + source = "hashicorp/null" + version = ">= 2.0" + } } -} +} \ No newline at end of file