From 9cff52ad19b08364594f822b4e00788450702bf6 Mon Sep 17 00:00:00 2001 From: cloud-foundation-bot <60107303+cloud-foundation-bot@users.noreply.github.com> Date: Fri, 28 Jan 2022 11:14:45 -0600 Subject: [PATCH] feat!: update TPG version constraints to allow 4.0, add Terraform 0.13 constraint (#258) Co-authored-by: Bharath KKB --- examples/mssql-public/versions.tf | 10 ++++++++-- examples/mysql-ha/versions.tf | 10 ++++++++-- examples/mysql-private/versions.tf | 10 ++++++++-- examples/mysql-public/versions.tf | 10 ++++++++-- examples/postgresql-ha/versions.tf | 11 ++++++++--- examples/postgresql-public-iam/versions.tf | 10 ++++++++-- examples/postgresql-public/versions.tf | 10 ++++++++-- modules/mssql/versions.tf | 2 +- modules/mysql/versions.tf | 2 +- modules/postgresql/versions.tf | 2 +- modules/private_service_access/versions.tf | 4 ++-- modules/safer_mysql/versions.tf | 2 +- test/setup/versions.tf | 19 ------------------- 13 files changed, 62 insertions(+), 40 deletions(-) delete mode 100644 test/setup/versions.tf diff --git a/examples/mssql-public/versions.tf b/examples/mssql-public/versions.tf index 29704272..eaf224aa 100644 --- a/examples/mssql-public/versions.tf +++ b/examples/mssql-public/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,5 +15,11 @@ */ terraform { - required_version = ">= 0.12" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } diff --git a/examples/mysql-ha/versions.tf b/examples/mysql-ha/versions.tf index 9b45f9d2..eaf224aa 100644 --- a/examples/mysql-ha/versions.tf +++ b/examples/mysql-ha/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,5 +15,11 @@ */ terraform { - required_version = ">=0.12.6" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } diff --git a/examples/mysql-private/versions.tf b/examples/mysql-private/versions.tf index 9b45f9d2..eaf224aa 100644 --- a/examples/mysql-private/versions.tf +++ b/examples/mysql-private/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,5 +15,11 @@ */ terraform { - required_version = ">=0.12.6" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } diff --git a/examples/mysql-public/versions.tf b/examples/mysql-public/versions.tf index 9b45f9d2..eaf224aa 100644 --- a/examples/mysql-public/versions.tf +++ b/examples/mysql-public/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,5 +15,11 @@ */ terraform { - required_version = ">=0.12.6" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } diff --git a/examples/postgresql-ha/versions.tf b/examples/postgresql-ha/versions.tf index de0b42a8..eaf224aa 100644 --- a/examples/postgresql-ha/versions.tf +++ b/examples/postgresql-ha/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,6 +15,11 @@ */ terraform { - required_version = ">=0.12.6" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } - diff --git a/examples/postgresql-public-iam/versions.tf b/examples/postgresql-public-iam/versions.tf index 9b45f9d2..eaf224aa 100644 --- a/examples/postgresql-public-iam/versions.tf +++ b/examples/postgresql-public-iam/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,5 +15,11 @@ */ terraform { - required_version = ">=0.12.6" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } diff --git a/examples/postgresql-public/versions.tf b/examples/postgresql-public/versions.tf index 9b45f9d2..eaf224aa 100644 --- a/examples/postgresql-public/versions.tf +++ b/examples/postgresql-public/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * 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. @@ -15,5 +15,11 @@ */ terraform { - required_version = ">=0.12.6" + required_providers { + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.0" + } + } + required_version = ">= 0.13" } diff --git a/modules/mssql/versions.tf b/modules/mssql/versions.tf index 848c2bfd..4ae6f5ca 100644 --- a/modules/mssql/versions.tf +++ b/modules/mssql/versions.tf @@ -20,7 +20,7 @@ terraform { google-beta = { source = "hashicorp/google-beta" - version = "~> 3.60" + version = ">= 3.60, < 5.0" } } diff --git a/modules/mysql/versions.tf b/modules/mysql/versions.tf index 8d75c778..8410e145 100644 --- a/modules/mysql/versions.tf +++ b/modules/mysql/versions.tf @@ -27,7 +27,7 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 3.60" + version = ">= 3.60, < 5.0" } } diff --git a/modules/postgresql/versions.tf b/modules/postgresql/versions.tf index 8df41768..dc9f861d 100644 --- a/modules/postgresql/versions.tf +++ b/modules/postgresql/versions.tf @@ -27,7 +27,7 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 3.60" + version = ">= 3.60, < 5.0" } } diff --git a/modules/private_service_access/versions.tf b/modules/private_service_access/versions.tf index 1b7e47c0..dcc7b197 100644 --- a/modules/private_service_access/versions.tf +++ b/modules/private_service_access/versions.tf @@ -23,11 +23,11 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } google-beta = { source = "hashicorp/google-beta" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/modules/safer_mysql/versions.tf b/modules/safer_mysql/versions.tf index ed28209c..6240d4b6 100644 --- a/modules/safer_mysql/versions.tf +++ b/modules/safer_mysql/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.60" + version = ">= 3.60, < 5.0" } } diff --git a/test/setup/versions.tf b/test/setup/versions.tf deleted file mode 100644 index 9b45f9d2..00000000 --- a/test/setup/versions.tf +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright 2019 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_version = ">=0.12.6" -}