From 35405741535da34365fff4082f053d216012cf8a Mon Sep 17 00:00:00 2001 From: badra001 Date: Thu, 6 Jan 2022 12:24:07 -0500 Subject: [PATCH 1/2] update changelog, version --- CHANGELOG.md | 6 ++++++ version.tf | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a6741a..391c2ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,9 @@ * 1.3.2 -- 20211222 - output instance_profile_arn +* 1.3.3 -- 20220106 + - add version number max for external provier to 1.2 (2.x not compatible with tf 0.12) + ## version 2.x branch: compat-tf-0.13 @@ -57,3 +60,6 @@ tag: 2.0.1 * 2.0.2 -- 20211222 - output instance_profile_arn + +* 2.1.0 -- 20220106 + - prep for tf 0.13+ diff --git a/version.tf b/version.tf index 5ec2ece..4df8d41 100644 --- a/version.tf +++ b/version.tf @@ -1,3 +1,4 @@ locals { - _module_version = "1.3.2" + _module_version = "1.3.3" + # _module_version = "2.1.0" } From 6c310157fe33c23cc0b48a142aa20248c45f9060 Mon Sep 17 00:00:00 2001 From: badra001 Date: Thu, 6 Jan 2022 12:32:35 -0500 Subject: [PATCH 2/2] pin version to 1.2 --- README.md | 15 ++++++++++----- versions.tf | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 versions.tf diff --git a/README.md b/README.md index 085cdf6..a8091bb 100644 --- a/README.md +++ b/README.md @@ -100,15 +100,20 @@ module "myrole3" { ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | +| [aws](#requirement\_aws) | >= 3.66.0 | +| [external](#requirement\_external) | >= 2.2.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | n/a | -| [external](#provider\_external) | n/a | -| [ldap](#provider\_ldap) | n/a | +| [aws](#provider\_aws) | >= 3.66.0 | +| [external](#provider\_external) | >= 2.2.0 | +| [ldap](#provider\_ldap) | >= 0.5.4 | | [null](#provider\_null) | n/a | | [template](#provider\_template) | n/a | @@ -123,7 +128,7 @@ No modules. | [aws_iam_instance_profile.role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_instance_profile) | resource | | [aws_iam_role.role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource | | [aws_iam_role_policy_attachment.role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource | -| [ldap_object.role](https://registry.terraform.io/providers/hashicorp/ldap/latest/docs/resources/object) | resource | +| [ldap_object.role](https://registry.terraform.io/providers/trevex/ldap/latest/docs/resources/object) | resource | | [null_resource.role_ldif](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource | | [aws_arn.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source | | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | diff --git a/versions.tf b/versions.tf new file mode 100644 index 0000000..f6feb00 --- /dev/null +++ b/versions.tf @@ -0,0 +1,23 @@ +# tf 0.13+ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.66.0" + } + ldap = { + source = "trevex/ldap" + version = ">= 0.5.4" + } + external = { + source = "hashicorp/external" + version = ">= 2.2.0" + } + } + required_version = ">= 0.13" +} + +# tf 0.12 +# provider "external" { +# version = "~> 1.2" +# }