From 50db9ee507ab0227f93a72d9b1e0afe7bff2f28e Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Wed, 24 Jul 2024 16:18:27 +0100 Subject: [PATCH] Loosen pinning on CDP provider (#72) Signed-off-by: Jim Enright --- .../terraform-cdp-aws-pre-reqs/provider.tf | 6 ++-- .../terraform-cdp-azure-pre-reqs/provider.tf | 2 +- modules/terraform-cdp-deploy/README.md | 2 +- .../examples/ex01-aws-basic/main.tf | 34 ++++++++++++++----- .../examples/ex02-azure-basic/main.tf | 30 ++++++++++++++++ .../examples/ex03-gcp-basic/main.tf | 26 ++++++++++++++ .../modules/aws/provider.tf | 2 +- .../modules/azure/provider.tf | 2 +- .../modules/gcp/provider.tf | 2 +- modules/terraform-cdp-deploy/provider.tf | 2 +- .../terraform-cdp-gcp-pre-reqs/provider.tf | 2 +- 11 files changed, 92 insertions(+), 18 deletions(-) diff --git a/modules/terraform-cdp-aws-pre-reqs/provider.tf b/modules/terraform-cdp-aws-pre-reqs/provider.tf index c91bdc8..bbcb7e9 100644 --- a/modules/terraform-cdp-aws-pre-reqs/provider.tf +++ b/modules/terraform-cdp-aws-pre-reqs/provider.tf @@ -20,15 +20,15 @@ terraform { } http = { source = "hashicorp/http" - version = "3.2.1" + version = "~> 3.2.1" } random = { source = "hashicorp/random" - version = "3.4.3" + version = "~> 3.4.3" } time = { source = "hashicorp/time" - version = "0.9.1" + version = "~> 0.9.1" } } diff --git a/modules/terraform-cdp-azure-pre-reqs/provider.tf b/modules/terraform-cdp-azure-pre-reqs/provider.tf index 0279dee..d842e60 100644 --- a/modules/terraform-cdp-azure-pre-reqs/provider.tf +++ b/modules/terraform-cdp-azure-pre-reqs/provider.tf @@ -24,7 +24,7 @@ terraform { } random = { source = "hashicorp/random" - version = "3.4.3" + version = "~> 3.4.3" } } diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md index db26b6c..c6dc13a 100644 --- a/modules/terraform-cdp-deploy/README.md +++ b/modules/terraform-cdp-deploy/README.md @@ -20,7 +20,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3.0 | -| [cdp](#requirement\_cdp) | 0.6.1 | +| [cdp](#requirement\_cdp) | ~> 0.6.1 | ## Providers diff --git a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf index 6c38773..27f732c 100644 --- a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf +++ b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf @@ -12,6 +12,32 @@ # See the License for the specific language governing permissions and # limitations under the License. +terraform { + required_version = ">= 1.5.7" + required_providers { + cdp = { + source = "cloudera/cdp" + version = "~> 0.6.1" + } + aws = { + source = "hashicorp/aws" + version = "~>5.30" + } + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + local = { + source = "hashicorp/local" + version = "~> 2.5.1" + } + http = { + source = "hashicorp/http" + version = "~> 3.2.1" + } + } +} + provider "aws" { region = var.aws_region } @@ -84,12 +110,4 @@ module "cdp_deploy" { } # Use the CDP Terraform Provider to find the xaccount account and external ids -terraform { - required_providers { - cdp = { - source = "cloudera/cdp" - version = "0.6.1" - } - } -} data "cdp_environments_aws_credential_prerequisites" "cdp_prereqs" {} diff --git a/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf index 780664b..2021bc6 100755 --- a/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf +++ b/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf @@ -12,6 +12,36 @@ # See the License for the specific language governing permissions and # limitations under the License. +terraform { + required_version = ">= 1.5.7" + required_providers { + cdp = { + source = "cloudera/cdp" + version = "~> 0.6.1" + } + azurerm = { + source = "hashicorp/azurerm" + version = "3.84.0" + } + azuread = { + source = "hashicorp/azuread" + version = "2.46.0" + } + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + local = { + source = "hashicorp/local" + version = "~> 2.5.1" + } + http = { + source = "hashicorp/http" + version = "~> 3.2.1" + } + } +} + provider "azurerm" { features { resource_group { diff --git a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf index 0121a30..625ac7f 100755 --- a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf +++ b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf @@ -12,6 +12,32 @@ # See the License for the specific language governing permissions and # limitations under the License. +terraform { + required_version = ">= 1.5.7" + required_providers { + cdp = { + source = "cloudera/cdp" + version = "~> 0.6.1" + } + google = { + source = "hashicorp/google" + version = "4.84.0" + } + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + local = { + source = "hashicorp/local" + version = "~> 2.5.1" + } + http = { + source = "hashicorp/http" + version = "~> 3.2.1" + } + } +} + provider "google" { project = var.gcp_project region = var.gcp_region diff --git a/modules/terraform-cdp-deploy/modules/aws/provider.tf b/modules/terraform-cdp-deploy/modules/aws/provider.tf index 97ead95..edb68e0 100644 --- a/modules/terraform-cdp-deploy/modules/aws/provider.tf +++ b/modules/terraform-cdp-deploy/modules/aws/provider.tf @@ -16,7 +16,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "0.6.1" + version = "~> 0.6.1" } } diff --git a/modules/terraform-cdp-deploy/modules/azure/provider.tf b/modules/terraform-cdp-deploy/modules/azure/provider.tf index 97ead95..edb68e0 100644 --- a/modules/terraform-cdp-deploy/modules/azure/provider.tf +++ b/modules/terraform-cdp-deploy/modules/azure/provider.tf @@ -16,7 +16,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "0.6.1" + version = "~> 0.6.1" } } diff --git a/modules/terraform-cdp-deploy/modules/gcp/provider.tf b/modules/terraform-cdp-deploy/modules/gcp/provider.tf index 97ead95..edb68e0 100644 --- a/modules/terraform-cdp-deploy/modules/gcp/provider.tf +++ b/modules/terraform-cdp-deploy/modules/gcp/provider.tf @@ -16,7 +16,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "0.6.1" + version = "~> 0.6.1" } } diff --git a/modules/terraform-cdp-deploy/provider.tf b/modules/terraform-cdp-deploy/provider.tf index 97ead95..edb68e0 100644 --- a/modules/terraform-cdp-deploy/provider.tf +++ b/modules/terraform-cdp-deploy/provider.tf @@ -16,7 +16,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "0.6.1" + version = "~> 0.6.1" } } diff --git a/modules/terraform-cdp-gcp-pre-reqs/provider.tf b/modules/terraform-cdp-gcp-pre-reqs/provider.tf index 66ff2a8..01c5fed 100644 --- a/modules/terraform-cdp-gcp-pre-reqs/provider.tf +++ b/modules/terraform-cdp-gcp-pre-reqs/provider.tf @@ -21,7 +21,7 @@ terraform { } random = { source = "hashicorp/random" - version = "3.4.3" + version = "~> 3.4.3" } }