From c484731655291f57aed9bd1d666864f6045a0e39 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Mon, 7 Oct 2024 10:57:16 +0100 Subject: [PATCH 1/2] Pin to release 0.8.2 of modules Signed-off-by: Jim Enright --- aws/main.tf | 8 ++++---- azure/main.tf | 8 ++++---- gcp/main.tf | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aws/main.tf b/aws/main.tf index dd27eaf..987a4f0 100644 --- a/aws/main.tf +++ b/aws/main.tf @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "~> 0.6.1" + version = ">= 0.6.1" } aws = { source = "hashicorp/aws" @@ -47,7 +47,7 @@ provider "aws" { } module "cdp_aws_prereqs" { - source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs?ref=v0.8.1" + source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs?ref=v0.8.2" env_prefix = var.env_prefix aws_region = var.aws_region @@ -90,7 +90,7 @@ module "cdp_aws_prereqs" { } module "cdp_deploy" { - source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.8.1" + source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.8.2" env_prefix = var.env_prefix infra_type = "aws" diff --git a/azure/main.tf b/azure/main.tf index 4f96722..8d89d9b 100644 --- a/azure/main.tf +++ b/azure/main.tf @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "~> 0.6.1" + version = ">= 0.6.1" } azurerm = { source = "hashicorp/azurerm" @@ -55,7 +55,7 @@ provider "azuread" { } module "cdp_azure_prereqs" { - source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-azure-pre-reqs?ref=v0.8.1" + source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-azure-pre-reqs?ref=v0.8.2" env_prefix = var.env_prefix azure_region = var.azure_region @@ -76,7 +76,7 @@ module "cdp_azure_prereqs" { } module "cdp_deploy" { - source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.8.1" + source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.8.2" env_prefix = var.env_prefix infra_type = "azure" diff --git a/gcp/main.tf b/gcp/main.tf index c78cee6..0ce01b6 100755 --- a/gcp/main.tf +++ b/gcp/main.tf @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ terraform { required_providers { cdp = { source = "cloudera/cdp" - version = "~> 0.6.1" + version = ">= 0.6.1" } google = { source = "hashicorp/google" @@ -45,7 +45,7 @@ provider "google" { module "cdp_gcp_prereqs" { - source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-gcp-pre-reqs?ref=v0.8.1" + source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-gcp-pre-reqs?ref=v0.8.2" env_prefix = var.env_prefix gcp_region = var.gcp_region @@ -62,7 +62,7 @@ module "cdp_gcp_prereqs" { } module "cdp_deploy" { - source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.8.1" + source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.8.2" env_prefix = var.env_prefix infra_type = "gcp" From d2f5b78e7720fb40a9c33014588b0210d0118a94 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Mon, 7 Oct 2024 10:58:05 +0100 Subject: [PATCH 2/2] Update copyright date Signed-off-by: Jim Enright --- .pre-commit-config.yaml | 2 +- LICENSE | 2 +- aws/terraform.tfvars.template | 2 +- aws/variables.tf | 2 +- azure/terraform.tfvars.template | 2 +- azure/variables.tf | 2 +- gcp/terraform.tfvars.template | 2 +- gcp/variables.tf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 480e6eb..16aae3f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/LICENSE b/LICENSE index 15a4aa5..574a2b7 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work. same "printed page" as the copyright notice for easier identification within third-party archives. -Copyright 2023 Cloudera, Inc. +Copyright 2024 Cloudera, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/aws/terraform.tfvars.template b/aws/terraform.tfvars.template index d2d1235..77db42b 100644 --- a/aws/terraform.tfvars.template +++ b/aws/terraform.tfvars.template @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aws/variables.tf b/aws/variables.tf index a989939..7153e01 100644 --- a/aws/variables.tf +++ b/aws/variables.tf @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/azure/terraform.tfvars.template b/azure/terraform.tfvars.template index c2bea1b..ddd7698 100644 --- a/azure/terraform.tfvars.template +++ b/azure/terraform.tfvars.template @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/azure/variables.tf b/azure/variables.tf index 5782169..5004e9c 100644 --- a/azure/variables.tf +++ b/azure/variables.tf @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/gcp/terraform.tfvars.template b/gcp/terraform.tfvars.template index 0a546b7..eb3725e 100644 --- a/gcp/terraform.tfvars.template +++ b/gcp/terraform.tfvars.template @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/gcp/variables.tf b/gcp/variables.tf index 61e5a5e..cf8988f 100755 --- a/gcp/variables.tf +++ b/gcp/variables.tf @@ -1,4 +1,4 @@ -# Copyright 2023 Cloudera, Inc. All Rights Reserved. +# Copyright 2024 Cloudera, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.