Skip to content

Commit 644f596

Browse files
authored
fix!: add upgrade guide, update provider constraints (#705)
* fix!: add upgrade guide, update provider constraints * Update README.md
1 parent b66a080 commit 644f596

File tree

4 files changed

+39
-6
lines changed

4 files changed

+39
-6
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ determining that location is as follows:
189189
- [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0
190190
- [jq](https://stedolan.github.io/jq/) >= 1.6
191191
- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
192-
- [terraform-provider-google] plugin ~> 4.5
193-
- [terraform-provider-google-beta] plugin ~> 4.5
192+
- [terraform-provider-google] plugin ~> 4.11
193+
- [terraform-provider-google-beta] plugin ~> 4.11
194194
- [terraform-provider-gsuite] plugin 0.1.x if GSuite functionality is desired
195195

196196
### Permissions

docs/upgrading_to_project_factory_v13.0.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,36 @@ Service accounts principles on which networkUser can be managed through `grant_n
3434
Additional roles that are managed through `grant_network_role` variable.
3535
- roles/container.hostServiceAgentUser on "serviceAccount:service-{PROJECT-NUMBER}@container-engine-robot.iam.gserviceaccount.com
3636
- roles/composer.sharedVpcAgent on "service-{PROJECT-NUMBER}@cloudcomposer-accounts.iam.gserviceaccount.com"
37+
38+
### Add `dimensions` field to `consumer_quota` object
39+
40+
The `dimensions` field was added to the `consumer_quota` object.
41+
42+
```diff
43+
module "project-factory" {
44+
source = "terraform-google-modules/project-factory/google"
45+
- version = "~> 12.0"
46+
+ version = "~> 13.0"
47+
48+
name = "pf-test-1"
49+
random_project_id = "true"
50+
org_id = "1234567890"
51+
usage_bucket_name = "pf-test-1-usage-report-bucket"
52+
usage_bucket_prefix = "pf/test/1/integration"
53+
billing_account = "ABCDEF-ABCDEF-ABCDEF"
54+
consumer_quotas = [
55+
{
56+
service = "servicemanagement.googleapis.com"
57+
metric = urlencode("servicemanagement.googleapis.com/default_requests")
58+
limit = urlencode("/min/project")
59+
+ dimensions = {}
60+
value = "95"
61+
}
62+
]
63+
}
64+
```
65+
66+
### Google Cloud Platform Provider upgrade
67+
68+
The Project Factory module now requires version 4.11 or higher of the Google Cloud Platform Provider and 4.11 or higher of
69+
the Google Cloud Platform Beta Provider.

modules/gsuite_enabled/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 4.5"
22+
version = "~> 4.11"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 4.5"
26+
version = "~> 4.11"
2727
}
2828
gsuite = {
2929
source = "DeviaVir/gsuite"

versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 4.5"
22+
version = "~> 4.11"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 4.5"
26+
version = "~> 4.11"
2727
}
2828
}
2929
provider_meta "google" {

0 commit comments

Comments
 (0)