From 2ef239a4ea1db256a2640e4bedac2d1ef7eb79c7 Mon Sep 17 00:00:00 2001 From: Awais Malik Date: Fri, 6 Oct 2023 16:15:53 -0700 Subject: [PATCH 1/6] chore: upgraded versions.tf to include minor bumps from tpg v5 --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index 3c87dd0..d7533ff 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 4.32, < 5.0" + version = ">= 4.32, < 6" } } From 94a76a92be2577b1d65fb7b0cfa06129479e1d38 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 09:59:11 -0700 Subject: [PATCH 2/6] Delete examples/bigquery/versions.tf --- examples/bigquery/versions.tf | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/bigquery/versions.tf diff --git a/examples/bigquery/versions.tf b/examples/bigquery/versions.tf deleted file mode 100644 index c4daaf9..0000000 --- a/examples/bigquery/versions.tf +++ /dev/null @@ -1,25 +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" - version = "~> 4.23" - } - } - required_version = ">= 0.13" -} From 1a65fb89c6b76a68fec934c21dcb10c9cc1339e0 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 09:59:18 -0700 Subject: [PATCH 3/6] Delete examples/kms/versions.tf --- examples/kms/versions.tf | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/kms/versions.tf diff --git a/examples/kms/versions.tf b/examples/kms/versions.tf deleted file mode 100644 index 6f935e1..0000000 --- a/examples/kms/versions.tf +++ /dev/null @@ -1,25 +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" - version = "~> 4.1" - } - } - required_version = ">= 0.13" -} From 363cdb1732fb48cd86a145b52b7b327bb45bfb08 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 09:59:37 -0700 Subject: [PATCH 4/6] Delete examples/subscriptions_only/versions.tf --- examples/subscriptions_only/versions.tf | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/subscriptions_only/versions.tf diff --git a/examples/subscriptions_only/versions.tf b/examples/subscriptions_only/versions.tf deleted file mode 100644 index 6f935e1..0000000 --- a/examples/subscriptions_only/versions.tf +++ /dev/null @@ -1,25 +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" - version = "~> 4.1" - } - } - required_version = ">= 0.13" -} From ca6d0b5c16ecc722bb12533169084988cc693b20 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 09:59:47 -0700 Subject: [PATCH 5/6] Delete examples/simple/versions.tf --- examples/simple/versions.tf | 25 ------------------------- 1 file changed, 25 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 6f935e1..0000000 --- a/examples/simple/versions.tf +++ /dev/null @@ -1,25 +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" - version = "~> 4.1" - } - } - required_version = ">= 0.13" -} From 342c2c03b76a68e6fb239b1aa6305a649094eb1c Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 10:00:07 -0700 Subject: [PATCH 6/6] Update versions.tf --- test/setup/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 0177d7a..910d5df 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 4.23" + version = ">= 4.23" } google-beta = { source = "hashicorp/google-beta" - version = "~> 4.23" + version = ">= 4.23" } null = { source = "hashicorp/null"