From 00fc3e24111f52e50e2bddae44131aac51f79b93 Mon Sep 17 00:00:00 2001 From: Awais Malik Date: Fri, 6 Oct 2023 16:08:12 -0700 Subject: [PATCH 01/11] chore: upgraded versions.tf to include minor bumps from tpg v5 --- test/setup/versions.tf | 4 ++-- versions.tf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/setup/versions.tf b/test/setup/versions.tf index a48123aa..30651cd2 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.50, < 5.0" + version = ">= 3.50, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.50, < 5.0" + version = ">= 3.50, < 6" } random = { source = "hashicorp/random" diff --git a/versions.tf b/versions.tf index 5699d468..bdf44421 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.50, < 5.0" + version = ">= 3.50, < 6" } random = { source = "hashicorp/random" From 5381c5b56286052538c6096999d09fd0977ba85a Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:21:31 -0700 Subject: [PATCH 02/11] Update versions.tf --- examples/cloudbuild_enabled/versions.tf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/examples/cloudbuild_enabled/versions.tf b/examples/cloudbuild_enabled/versions.tf index 317f4fd7..a1f89829 100644 --- a/examples/cloudbuild_enabled/versions.tf +++ b/examples/cloudbuild_enabled/versions.tf @@ -17,20 +17,18 @@ terraform { required_providers { google = { - source = "hashicorp/google" - version = "~> 4.0" + source = "hashicorp/google" } google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" + source = "hashicorp/google-beta" } null = { source = "hashicorp/null" - version = "~> 3.0" + version = ">= 3.0" } random = { source = "hashicorp/random" - version = "~> 3.0" + version = ">= 3.0" } } required_version = ">= 0.13" From dff10b9390758166015217076219e5ff35630d28 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:21:46 -0700 Subject: [PATCH 03/11] Update versions.tf --- examples/simple-folder/versions.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/simple-folder/versions.tf b/examples/simple-folder/versions.tf index 6c3a22dc..be9e06df 100644 --- a/examples/simple-folder/versions.tf +++ b/examples/simple-folder/versions.tf @@ -17,16 +17,15 @@ terraform { required_providers { google = { - source = "hashicorp/google" - version = "~> 4.0" + source = "hashicorp/google" } null = { source = "hashicorp/null" - version = "~> 3.0" + version = ">= 3.0" } random = { source = "hashicorp/random" - version = "~> 3.0" + version = ">= 3.0" } } required_version = ">= 0.13" From 93f1413482c47ad01e978687d249241d2705c455 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:22:00 -0700 Subject: [PATCH 04/11] Update versions.tf --- examples/simple/versions.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/simple/versions.tf b/examples/simple/versions.tf index 6c3a22dc..be9e06df 100644 --- a/examples/simple/versions.tf +++ b/examples/simple/versions.tf @@ -17,16 +17,15 @@ terraform { required_providers { google = { - source = "hashicorp/google" - version = "~> 4.0" + source = "hashicorp/google" } null = { source = "hashicorp/null" - version = "~> 3.0" + version = ">= 3.0" } random = { source = "hashicorp/random" - version = "~> 3.0" + version = ">= 3.0" } } required_version = ">= 0.13" From 3d44f2be834b0d26a9e849ec755419361b4e291f Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:22:33 -0700 Subject: [PATCH 05/11] Update versions.tf --- modules/cloudbuild/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cloudbuild/versions.tf b/modules/cloudbuild/versions.tf index f6edc55d..6af53675 100644 --- a/modules/cloudbuild/versions.tf +++ b/modules/cloudbuild/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, <6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, <6" } random = { source = "hashicorp/random" From b4870fc077908400761c41a5b64c5f57f4f308fe Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:22:55 -0700 Subject: [PATCH 06/11] Update versions.tf --- modules/tf_cloudbuild_builder/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tf_cloudbuild_builder/versions.tf b/modules/tf_cloudbuild_builder/versions.tf index bda74825..f33696b0 100644 --- a/modules/tf_cloudbuild_builder/versions.tf +++ b/modules/tf_cloudbuild_builder/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } } From 803f58122dfd30e30384829178b060b8c0309674 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:23:11 -0700 Subject: [PATCH 07/11] Update versions.tf --- modules/tf_cloudbuild_source/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tf_cloudbuild_source/versions.tf b/modules/tf_cloudbuild_source/versions.tf index ea052049..2c3bbb50 100644 --- a/modules/tf_cloudbuild_source/versions.tf +++ b/modules/tf_cloudbuild_source/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } } From bc929c39f90a0f334610257a70d9b4f4e0ab5ba5 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Wed, 18 Oct 2023 12:23:30 -0700 Subject: [PATCH 08/11] Update versions.tf --- modules/tf_cloudbuild_workspace/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tf_cloudbuild_workspace/versions.tf b/modules/tf_cloudbuild_workspace/versions.tf index 4440af85..fed2522d 100644 --- a/modules/tf_cloudbuild_workspace/versions.tf +++ b/modules/tf_cloudbuild_workspace/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, < 5.0, != 4.31.0" + version = ">= 4.17, != 4.31.0, < 6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, < 5.0, != 4.31.0" + version = ">= 4.17, != 4.31.0, < 6" } } From 73a3a4292a6276de0a8f030adb92a6a065338aa3 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 12:28:01 -0700 Subject: [PATCH 09/11] Delete examples/cloudbuild_enabled/versions.tf --- examples/cloudbuild_enabled/versions.tf | 35 ------------------------- 1 file changed, 35 deletions(-) delete mode 100644 examples/cloudbuild_enabled/versions.tf diff --git a/examples/cloudbuild_enabled/versions.tf b/examples/cloudbuild_enabled/versions.tf deleted file mode 100644 index a1f89829..00000000 --- a/examples/cloudbuild_enabled/versions.tf +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -terraform { - required_providers { - google = { - source = "hashicorp/google" - } - google-beta = { - source = "hashicorp/google-beta" - } - null = { - source = "hashicorp/null" - version = ">= 3.0" - } - random = { - source = "hashicorp/random" - version = ">= 3.0" - } - } - required_version = ">= 0.13" -} From 378f8859e6ce9ef56b2880fd11286bf453ad75f6 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 12:28:09 -0700 Subject: [PATCH 10/11] Delete examples/simple-folder/versions.tf --- examples/simple-folder/versions.tf | 32 ------------------------------ 1 file changed, 32 deletions(-) delete mode 100644 examples/simple-folder/versions.tf diff --git a/examples/simple-folder/versions.tf b/examples/simple-folder/versions.tf deleted file mode 100644 index be9e06df..00000000 --- a/examples/simple-folder/versions.tf +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -terraform { - required_providers { - google = { - source = "hashicorp/google" - } - null = { - source = "hashicorp/null" - version = ">= 3.0" - } - random = { - source = "hashicorp/random" - version = ">= 3.0" - } - } - required_version = ">= 0.13" -} From 07473e4f7a86abf2861153f4df955d123a046b7d Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 12:28:17 -0700 Subject: [PATCH 11/11] Delete examples/simple/versions.tf --- examples/simple/versions.tf | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 examples/simple/versions.tf diff --git a/examples/simple/versions.tf b/examples/simple/versions.tf deleted file mode 100644 index be9e06df..00000000 --- a/examples/simple/versions.tf +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -terraform { - required_providers { - google = { - source = "hashicorp/google" - } - null = { - source = "hashicorp/null" - version = ">= 3.0" - } - random = { - source = "hashicorp/random" - version = ">= 3.0" - } - } - required_version = ">= 0.13" -}