From 14320e995ab4e91cb64bddbca06b66294056ab67 Mon Sep 17 00:00:00 2001 From: cloud-foundation-bot <60107303+cloud-foundation-bot@users.noreply.github.com> Date: Mon, 20 Dec 2021 12:20:59 -0600 Subject: [PATCH] feat: update TPG version constraints to allow 4.0 (#108) * feat: update TPG version constraints to allow 4.0 * Update versions.tf Co-authored-by: Bharath KKB --- examples/bigquery/billing_account/versions.tf | 12 ++++++---- examples/bigquery/folder/versions.tf | 15 ++++++++---- examples/bigquery/organization/versions.tf | 15 ++++++++---- examples/bigquery/project/versions.tf | 15 ++++++++---- examples/bq-log-alerting/versions.tf | 12 ++++++---- examples/datadog-sink/main.tf | 4 ---- examples/datadog-sink/versions.tf | 11 ++++++++- examples/pubsub/billing_account/versions.tf | 12 ++++++---- examples/pubsub/folder/versions.tf | 15 ++++++++---- examples/pubsub/organization/versions.tf | 15 ++++++++---- examples/pubsub/project/versions.tf | 15 ++++++++---- examples/splunk-sink/versions.tf | 12 ++++++---- examples/storage/billing_account/versions.tf | 12 ++++++---- examples/storage/folder/versions.tf | 15 ++++++++---- examples/storage/organization/versions.tf | 15 ++++++++---- examples/storage/project/versions.tf | 15 ++++++++---- modules/bigquery/versions.tf | 2 +- modules/bq-log-alerting/versions.tf | 2 +- modules/pubsub/versions.tf | 2 +- modules/storage/versions.tf | 2 +- test/setup/versions.tf | 23 +++++++++++-------- versions.tf | 2 +- 22 files changed, 154 insertions(+), 89 deletions(-) diff --git a/examples/bigquery/billing_account/versions.tf b/examples/bigquery/billing_account/versions.tf index 94f59161..4389ca96 100644 --- a/examples/bigquery/billing_account/versions.tf +++ b/examples/bigquery/billing_account/versions.tf @@ -15,9 +15,11 @@ */ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + } } diff --git a/examples/bigquery/folder/versions.tf b/examples/bigquery/folder/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/bigquery/folder/versions.tf +++ b/examples/bigquery/folder/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/bigquery/organization/versions.tf b/examples/bigquery/organization/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/bigquery/organization/versions.tf +++ b/examples/bigquery/organization/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/bigquery/project/versions.tf b/examples/bigquery/project/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/bigquery/project/versions.tf +++ b/examples/bigquery/project/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/bq-log-alerting/versions.tf b/examples/bq-log-alerting/versions.tf index 13119067..83343943 100644 --- a/examples/bq-log-alerting/versions.tf +++ b/examples/bq-log-alerting/versions.tf @@ -15,9 +15,11 @@ */ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + } } diff --git a/examples/datadog-sink/main.tf b/examples/datadog-sink/main.tf index f894705e..b6490b11 100755 --- a/examples/datadog-sink/main.tf +++ b/examples/datadog-sink/main.tf @@ -14,10 +14,6 @@ * limitations under the License. */ -provider "google" { - version = "~> 3.53.0" -} - locals { datadog_svc = element(google_service_account.datadog-viewer.*.email, 0) log_writ = module.log_export.writer_identity diff --git a/examples/datadog-sink/versions.tf b/examples/datadog-sink/versions.tf index 3647ea62..828a53fb 100644 --- a/examples/datadog-sink/versions.tf +++ b/examples/datadog-sink/versions.tf @@ -16,5 +16,14 @@ terraform { - required_version = ">=0.12.6" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + local = { + source = "hashicorp/local" + } + } } diff --git a/examples/pubsub/billing_account/versions.tf b/examples/pubsub/billing_account/versions.tf index d9a4ba81..58544457 100644 --- a/examples/pubsub/billing_account/versions.tf +++ b/examples/pubsub/billing_account/versions.tf @@ -16,9 +16,11 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + } } diff --git a/examples/pubsub/folder/versions.tf b/examples/pubsub/folder/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/pubsub/folder/versions.tf +++ b/examples/pubsub/folder/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/pubsub/organization/versions.tf b/examples/pubsub/organization/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/pubsub/organization/versions.tf +++ b/examples/pubsub/organization/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/pubsub/project/versions.tf b/examples/pubsub/project/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/pubsub/project/versions.tf +++ b/examples/pubsub/project/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/splunk-sink/versions.tf b/examples/splunk-sink/versions.tf index d9a4ba81..58544457 100644 --- a/examples/splunk-sink/versions.tf +++ b/examples/splunk-sink/versions.tf @@ -16,9 +16,11 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + } } diff --git a/examples/storage/billing_account/versions.tf b/examples/storage/billing_account/versions.tf index d9a4ba81..58544457 100644 --- a/examples/storage/billing_account/versions.tf +++ b/examples/storage/billing_account/versions.tf @@ -16,9 +16,11 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + } } diff --git a/examples/storage/folder/versions.tf b/examples/storage/folder/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/storage/folder/versions.tf +++ b/examples/storage/folder/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/storage/organization/versions.tf b/examples/storage/organization/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/storage/organization/versions.tf +++ b/examples/storage/organization/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/examples/storage/project/versions.tf b/examples/storage/project/versions.tf index d9a4ba81..2fdc5f12 100644 --- a/examples/storage/project/versions.tf +++ b/examples/storage/project/versions.tf @@ -16,9 +16,14 @@ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/modules/bigquery/versions.tf b/modules/bigquery/versions.tf index e42c6b50..ddb6e1f8 100644 --- a/modules/bigquery/versions.tf +++ b/modules/bigquery/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/modules/bq-log-alerting/versions.tf b/modules/bq-log-alerting/versions.tf index 53f43da1..00dd9b12 100644 --- a/modules/bq-log-alerting/versions.tf +++ b/modules/bq-log-alerting/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index 4eb6c874..089f6f2b 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/modules/storage/versions.tf b/modules/storage/versions.tf index 80dd47cb..6eae2108 100644 --- a/modules/storage/versions.tf +++ b/modules/storage/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/test/setup/versions.tf b/test/setup/versions.tf index f488346d..7884f670 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -15,13 +15,18 @@ */ terraform { - required_version = ">=0.12.6" -} - -provider "google" { - version = "~> 3.53.0" -} - -provider "google-beta" { - version = "~> 3.53.0" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 3.53.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 3.53.0" + } + null = { + source = "hashicorp/null" + } + } } diff --git a/versions.tf b/versions.tf index 9c5c6b6a..a4f4ac5d 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } }