diff --git a/0-bootstrap/main.tf b/0-bootstrap/main.tf index f2d59c608..e0a1e56c3 100644 --- a/0-bootstrap/main.tf +++ b/0-bootstrap/main.tf @@ -14,22 +14,6 @@ * limitations under the License. */ -provider "google" { - version = "~> 3.38" -} - -provider "google-beta" { - version = "~> 3.30" -} - -provider "null" { - version = "~> 2.1" -} - -provider "random" { - version = "~> 2.2" -} - /************************************************* Bootstrap GCP Organization. *************************************************/ diff --git a/0-bootstrap/modules/jenkins-agent/versions.tf b/0-bootstrap/modules/jenkins-agent/versions.tf index 50f0c7ff4..a218a044d 100644 --- a/0-bootstrap/modules/jenkins-agent/versions.tf +++ b/0-bootstrap/modules/jenkins-agent/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = ">=0.13, <0.14" + required_version = ">= 0.13" required_providers { google = "~> 3.5" diff --git a/0-bootstrap/versions.tf b/0-bootstrap/versions.tf index b45fb9def..d8f49a886 100644 --- a/0-bootstrap/versions.tf +++ b/0-bootstrap/versions.tf @@ -15,5 +15,20 @@ */ terraform { - required_version = ">=0.13, <0.14" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + null = { + source = "hashicorp/null" + version = "~> 2.1" + } + + random = { + source = "hashicorp/random" + version = "~> 2.3" + } + } } diff --git a/1-org/envs/shared/projects.tf b/1-org/envs/shared/projects.tf index bb2a98ef1..d4221ec54 100644 --- a/1-org/envs/shared/projects.tf +++ b/1-org/envs/shared/projects.tf @@ -76,7 +76,7 @@ module "org_billing_logs" { module "org_secrets" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account default_service_account = "depriviledge" @@ -106,7 +106,7 @@ module "org_secrets" { module "interconnect" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account default_service_account = "depriviledge" @@ -136,7 +136,7 @@ module "interconnect" { module "scc_notifications" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account default_service_account = "depriviledge" @@ -166,7 +166,7 @@ module "scc_notifications" { module "dns_hub" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account default_service_account = "depriviledge" @@ -204,7 +204,7 @@ module "dns_hub" { module "base_network_hub" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" count = var.enable_hub_and_spoke ? 1 : 0 random_project_id = "true" impersonate_service_account = var.terraform_service_account @@ -243,7 +243,7 @@ module "base_network_hub" { module "restricted_network_hub" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" count = var.enable_hub_and_spoke ? 1 : 0 random_project_id = "true" impersonate_service_account = var.terraform_service_account diff --git a/1-org/envs/shared/providers.tf b/1-org/envs/shared/providers.tf index 5674f1a74..92bbf4390 100644 --- a/1-org/envs/shared/providers.tf +++ b/1-org/envs/shared/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/1-org/envs/shared/versions.tf b/1-org/envs/shared/versions.tf index c001c4e3a..61718ceeb 100644 --- a/1-org/envs/shared/versions.tf +++ b/1-org/envs/shared/versions.tf @@ -16,4 +16,14 @@ terraform { required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } } diff --git a/2-environments/envs/development/providers.tf b/2-environments/envs/development/providers.tf index 5674f1a74..92bbf4390 100644 --- a/2-environments/envs/development/providers.tf +++ b/2-environments/envs/development/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/2-environments/envs/development/versions.tf b/2-environments/envs/development/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/2-environments/envs/development/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/2-environments/envs/non-production/providers.tf b/2-environments/envs/non-production/providers.tf index 5674f1a74..92bbf4390 100644 --- a/2-environments/envs/non-production/providers.tf +++ b/2-environments/envs/non-production/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/2-environments/envs/non-production/versions.tf b/2-environments/envs/non-production/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/2-environments/envs/non-production/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/2-environments/envs/production/providers.tf b/2-environments/envs/production/providers.tf index 5674f1a74..92bbf4390 100644 --- a/2-environments/envs/production/providers.tf +++ b/2-environments/envs/production/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/2-environments/envs/production/versions.tf b/2-environments/envs/production/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/2-environments/envs/production/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/2-environments/modules/env_baseline/monitoring.tf b/2-environments/modules/env_baseline/monitoring.tf index f95e5d7de..cb1df4d76 100644 --- a/2-environments/modules/env_baseline/monitoring.tf +++ b/2-environments/modules/env_baseline/monitoring.tf @@ -20,7 +20,7 @@ module "monitoring_project" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account name = "${var.project_prefix}-${var.environment_code}-monitoring" diff --git a/2-environments/modules/env_baseline/networking.tf b/2-environments/modules/env_baseline/networking.tf index 43fa7cc4f..3e30f9450 100644 --- a/2-environments/modules/env_baseline/networking.tf +++ b/2-environments/modules/env_baseline/networking.tf @@ -20,7 +20,7 @@ module "base_shared_vpc_host_project" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account name = format("%s-%s-shared-base", var.project_prefix, var.environment_code) @@ -53,7 +53,7 @@ module "base_shared_vpc_host_project" { module "restricted_shared_vpc_host_project" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account name = format("%s-%s-shared-restricted", var.project_prefix, var.environment_code) diff --git a/2-environments/modules/env_baseline/secrets.tf b/2-environments/modules/env_baseline/secrets.tf index 81c1d9df1..ffeecdc1d 100644 --- a/2-environments/modules/env_baseline/secrets.tf +++ b/2-environments/modules/env_baseline/secrets.tf @@ -21,7 +21,7 @@ module "env_secrets" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.terraform_service_account default_service_account = "depriviledge" diff --git a/3-networks/envs/development/providers.tf b/3-networks/envs/development/providers.tf index 5674f1a74..92bbf4390 100644 --- a/3-networks/envs/development/providers.tf +++ b/3-networks/envs/development/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/3-networks/envs/development/versions.tf b/3-networks/envs/development/versions.tf index ca5a07d94..61718ceeb 100644 --- a/3-networks/envs/development/versions.tf +++ b/3-networks/envs/development/versions.tf @@ -15,5 +15,15 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } } diff --git a/3-networks/envs/non-production/providers.tf b/3-networks/envs/non-production/providers.tf index 5674f1a74..92bbf4390 100644 --- a/3-networks/envs/non-production/providers.tf +++ b/3-networks/envs/non-production/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/3-networks/envs/non-production/versions.tf b/3-networks/envs/non-production/versions.tf index ca5a07d94..61718ceeb 100644 --- a/3-networks/envs/non-production/versions.tf +++ b/3-networks/envs/non-production/versions.tf @@ -15,5 +15,15 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } } diff --git a/3-networks/envs/production/providers.tf b/3-networks/envs/production/providers.tf index 5674f1a74..92bbf4390 100644 --- a/3-networks/envs/production/providers.tf +++ b/3-networks/envs/production/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/3-networks/envs/production/versions.tf b/3-networks/envs/production/versions.tf index ca5a07d94..61718ceeb 100644 --- a/3-networks/envs/production/versions.tf +++ b/3-networks/envs/production/versions.tf @@ -15,5 +15,15 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } } diff --git a/3-networks/envs/shared/providers.tf b/3-networks/envs/shared/providers.tf index 5674f1a74..92bbf4390 100644 --- a/3-networks/envs/shared/providers.tf +++ b/3-networks/envs/shared/providers.tf @@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.30" } diff --git a/3-networks/envs/shared/versions.tf b/3-networks/envs/shared/versions.tf index 70e15e643..61718ceeb 100644 --- a/3-networks/envs/shared/versions.tf +++ b/3-networks/envs/shared/versions.tf @@ -1,19 +1,29 @@ -/** - * 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_version = ">= 0.12" -} +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/3-networks/modules/base_shared_vpc/dns.tf b/3-networks/modules/base_shared_vpc/dns.tf index dafc13bac..e9583b24a 100644 --- a/3-networks/modules/base_shared_vpc/dns.tf +++ b/3-networks/modules/base_shared_vpc/dns.tf @@ -56,7 +56,7 @@ resource "google_dns_policy" "default_policy" { module "private_googleapis" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.0" + version = "~> 3.1" project_id = var.project_id type = "private" name = "dz-${var.environment_code}-shared-base-apis" @@ -89,7 +89,7 @@ module "private_googleapis" { module "base_gcr" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.0" + version = "~> 3.1" project_id = var.project_id type = "private" name = "dz-${var.environment_code}-shared-base-gcr" @@ -121,7 +121,7 @@ module "base_gcr" { *****************************************/ module "peering_zone" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.0" + version = "~> 3.1" project_id = var.project_id type = "peering" name = "dz-${var.environment_code}-shared-base-to-dns-hub" diff --git a/3-networks/modules/base_shared_vpc/main.tf b/3-networks/modules/base_shared_vpc/main.tf index 07e1c5598..3c0c04cba 100644 --- a/3-networks/modules/base_shared_vpc/main.tf +++ b/3-networks/modules/base_shared_vpc/main.tf @@ -42,7 +42,7 @@ data "google_compute_network" "vpc_base_net_hub" { module "main" { source = "terraform-google-modules/network/google" - version = "~> 2.0" + version = "~> 3.1" project_id = var.project_id network_name = local.network_name shared_vpc_host = "true" diff --git a/4-projects/business_unit_1/development/providers.tf b/4-projects/business_unit_1/development/providers.tf index 13c4da0e1..c57b5f9f9 100644 --- a/4-projects/business_unit_1/development/providers.tf +++ b/4-projects/business_unit_1/development/providers.tf @@ -39,10 +39,8 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } diff --git a/4-projects/business_unit_1/development/versions.tf b/4-projects/business_unit_1/development/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/4-projects/business_unit_1/development/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/4-projects/business_unit_1/non-production/providers.tf b/4-projects/business_unit_1/non-production/providers.tf index 13c4da0e1..c57b5f9f9 100644 --- a/4-projects/business_unit_1/non-production/providers.tf +++ b/4-projects/business_unit_1/non-production/providers.tf @@ -39,10 +39,8 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } diff --git a/4-projects/business_unit_1/non-production/versions.tf b/4-projects/business_unit_1/non-production/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/4-projects/business_unit_1/non-production/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/4-projects/business_unit_1/production/providers.tf b/4-projects/business_unit_1/production/providers.tf index 13c4da0e1..c57b5f9f9 100644 --- a/4-projects/business_unit_1/production/providers.tf +++ b/4-projects/business_unit_1/production/providers.tf @@ -39,10 +39,8 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } diff --git a/4-projects/business_unit_1/production/versions.tf b/4-projects/business_unit_1/production/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/4-projects/business_unit_1/production/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/4-projects/business_unit_2/development/providers.tf b/4-projects/business_unit_2/development/providers.tf index 13c4da0e1..c57b5f9f9 100644 --- a/4-projects/business_unit_2/development/providers.tf +++ b/4-projects/business_unit_2/development/providers.tf @@ -39,10 +39,8 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } diff --git a/4-projects/business_unit_2/development/versions.tf b/4-projects/business_unit_2/development/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/4-projects/business_unit_2/development/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/4-projects/business_unit_2/non-production/providers.tf b/4-projects/business_unit_2/non-production/providers.tf index 13c4da0e1..c57b5f9f9 100644 --- a/4-projects/business_unit_2/non-production/providers.tf +++ b/4-projects/business_unit_2/non-production/providers.tf @@ -39,10 +39,8 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } diff --git a/4-projects/business_unit_2/non-production/versions.tf b/4-projects/business_unit_2/non-production/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/4-projects/business_unit_2/non-production/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/4-projects/business_unit_2/production/providers.tf b/4-projects/business_unit_2/production/providers.tf index 13c4da0e1..c57b5f9f9 100644 --- a/4-projects/business_unit_2/production/providers.tf +++ b/4-projects/business_unit_2/production/providers.tf @@ -39,10 +39,8 @@ data "google_service_account_access_token" "default" { *****************************************/ provider "google" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } provider "google-beta" { access_token = data.google_service_account_access_token.default.access_token - version = "~> 3.12" } diff --git a/4-projects/business_unit_2/production/versions.tf b/4-projects/business_unit_2/production/versions.tf new file mode 100644 index 000000000..61718ceeb --- /dev/null +++ b/4-projects/business_unit_2/production/versions.tf @@ -0,0 +1,29 @@ +/** + * 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_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = ">= 3.50" + } + google-beta = { + source = "hashicorp/google" + version = ">= 3.50" + } + } +} diff --git a/4-projects/modules/single_project/main.tf b/4-projects/modules/single_project/main.tf index 02267a474..9bf057f71 100644 --- a/4-projects/modules/single_project/main.tf +++ b/4-projects/modules/single_project/main.tf @@ -21,7 +21,7 @@ locals { module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.0" + version = "~> 10.1" random_project_id = "true" impersonate_service_account = var.impersonate_service_account activate_apis = distinct(concat(var.activate_apis, ["billingbudgets.googleapis.com"])) diff --git a/test/bundle.hcl b/test/bundle.hcl index ead7c178d..0e80ec5f3 100644 --- a/test/bundle.hcl +++ b/test/bundle.hcl @@ -4,18 +4,18 @@ terraform { providers { google = { - version = ["~> 3.30"] + version = ["~> 3.50"] } google-beta = { - version = ["~> 3.30"] + version = ["~> 3.50"] } external = { version = ["~> 1.0"] } null = { - version = ["~> 2.0"] + version = ["~> 2.1"] } random = { - version = ["~> 2.0"] + version = ["~> 2.3"] } }