diff --git a/README.md b/README.md index 1a34def3..b3f1ca09 100644 --- a/README.md +++ b/README.md @@ -189,8 +189,8 @@ determining that location is as follows: - [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0 - [jq](https://stedolan.github.io/jq/) >= 1.6 - [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0 -- [terraform-provider-google] plugin ~> 4.5 -- [terraform-provider-google-beta] plugin ~> 4.5 +- [terraform-provider-google] plugin ~> 4.11 +- [terraform-provider-google-beta] plugin ~> 4.11 - [terraform-provider-gsuite] plugin 0.1.x if GSuite functionality is desired ### Permissions diff --git a/docs/upgrading_to_project_factory_v13.0.md b/docs/upgrading_to_project_factory_v13.0.md index 06260395..ffac87b3 100644 --- a/docs/upgrading_to_project_factory_v13.0.md +++ b/docs/upgrading_to_project_factory_v13.0.md @@ -34,3 +34,36 @@ Service accounts principles on which networkUser can be managed through `grant_n Additional roles that are managed through `grant_network_role` variable. - roles/container.hostServiceAgentUser on "serviceAccount:service-{PROJECT-NUMBER}@container-engine-robot.iam.gserviceaccount.com - roles/composer.sharedVpcAgent on "service-{PROJECT-NUMBER}@cloudcomposer-accounts.iam.gserviceaccount.com" + +### Add `dimensions` field to `consumer_quota` object + +The `dimensions` field was added to the `consumer_quota` object. + +```diff + module "project-factory" { + source = "terraform-google-modules/project-factory/google" +- version = "~> 12.0" ++ version = "~> 13.0" + + name = "pf-test-1" + random_project_id = "true" + org_id = "1234567890" + usage_bucket_name = "pf-test-1-usage-report-bucket" + usage_bucket_prefix = "pf/test/1/integration" + billing_account = "ABCDEF-ABCDEF-ABCDEF" + consumer_quotas = [ + { + service = "servicemanagement.googleapis.com" + metric = urlencode("servicemanagement.googleapis.com/default_requests") + limit = urlencode("/min/project") ++ dimensions = {} + value = "95" + } + ] +} +``` + +### Google Cloud Platform Provider upgrade + +The Project Factory module now requires version 4.11 or higher of the Google Cloud Platform Provider and 4.11 or higher of +the Google Cloud Platform Beta Provider. diff --git a/modules/gsuite_enabled/versions.tf b/modules/gsuite_enabled/versions.tf index 2b676992..f9012430 100644 --- a/modules/gsuite_enabled/versions.tf +++ b/modules/gsuite_enabled/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 4.5" + version = "~> 4.11" } google-beta = { source = "hashicorp/google-beta" - version = "~> 4.5" + version = "~> 4.11" } gsuite = { source = "DeviaVir/gsuite" diff --git a/versions.tf b/versions.tf index f748103e..db543690 100644 --- a/versions.tf +++ b/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 4.5" + version = "~> 4.11" } google-beta = { source = "hashicorp/google-beta" - version = "~> 4.5" + version = "~> 4.11" } } provider_meta "google" {