Skip to content

Commit 24a8c2d

Browse files
Modify Quota Adjuster Settings documentation (#12818) (#9153)
[upstream:c34f86f5563f6593c9ceaa7a63b155eb5e3bf0ce] Signed-off-by: Modular Magician <[email protected]>
1 parent 7921e7b commit 24a8c2d

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

.changelog/12818.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
cloudquotas: removed validation for `parent` in `google_cloud_quotas_quota_adjuster_settings`
3+
```

google-beta/services/cloudquotas/resource_cloud_quotas_quota_adjuster_settings.go

+11-12
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,23 @@ func ResourceCloudQuotasQuotaAdjusterSettings() *schema.Resource {
5656
Description: `Required. The configured value of the enablement at the given resource. Possible values: ["ENABLED", "DISABLED"]`,
5757
},
5858
"parent": {
59-
Type: schema.TypeString,
60-
Computed: true,
61-
Optional: true,
62-
ForceNew: true,
63-
ValidateFunc: verify.ValidateRegexp(`^(projects|folders|organizations)/([^/]+)$`),
64-
Description: `The parent of the quota preference. Allowed parents are "projects/[project-id / number]" or "folders/[folder-id / number]" or "organizations/[org-id / number]".`,
59+
Type: schema.TypeString,
60+
Computed: true,
61+
Optional: true,
62+
ForceNew: true,
63+
Description: `The parent of the quota preference. Allowed parent format is "projects/[project-id / number]".`,
6564
},
6665
"effective_container": {
6766
Type: schema.TypeString,
6867
Computed: true,
69-
Description: `Fields to capture the hierarchy enablement.
70-
The container (org/folder/project) that determines if the quota adjuster is set for this project/folder/org. We use the nearest-ancestor to determine the effective container.
71-
The nearest ancestor (including this container) with 'enabled' set (either true or false) will be returned.`,
68+
Description: `The resource container that determines if the quota adjuster is set for this project.
69+
Expect this field to be empty currently.`,
7270
},
7371
"effective_enablement": {
74-
Type: schema.TypeString,
75-
Computed: true,
76-
Description: `Based on the effective container's setting above, determines Whether this container has the quota adjuster enabled.`,
72+
Type: schema.TypeString,
73+
Computed: true,
74+
Description: `Based on the effective container's setting above, determines Whether this resource container has the quota adjuster enabled.
75+
Expect this field to be empty currently.`,
7776
},
7877
},
7978
UseJSONNumber: true,

website/docs/r/cloud_quotas_quota_adjuster_settings.html.markdown

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
# ----------------------------------------------------------------------------
1515
subcategory: "Cloud Quotas"
1616
description: |-
17-
QuotaAdjusterSettings represents the preferred quota configuration specified for a project, folder or organization.
17+
QuotaAdjusterSettings resource represents your quota adjuster settings for a particular project.
1818
---
1919

2020
# google_cloud_quotas_quota_adjuster_settings
2121

22-
QuotaAdjusterSettings represents the preferred quota configuration specified for a project, folder or organization. There is only one QuotaAdjusterSettings resource for a quota value targeting a unique set of dimensions.
22+
QuotaAdjusterSettings resource represents your quota adjuster settings for a particular project. When enabled, the quota adjuster monitors your usage for the specified resources and issues quota adjustment requests when resource usage approaches its quota value.
2323

2424
~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
2525
See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
@@ -53,7 +53,7 @@ The following arguments are supported:
5353

5454
* `parent` -
5555
(Required)
56-
The parent of the quota preference. Allowed parents are "projects/[project-id / number]" or "folders/[folder-id / number]" or "organizations/[org-id / number]".
56+
The parent of the quota preference. Allowed parent format is "projects/[project-id / number]".
5757

5858

5959
- - -
@@ -67,12 +67,12 @@ In addition to the arguments listed above, the following computed attributes are
6767
* `id` - an identifier for the resource with format `{{parent}}/locations/global/quotaAdjusterSettings`
6868

6969
* `effective_container` -
70-
Fields to capture the hierarchy enablement.
71-
The container (org/folder/project) that determines if the quota adjuster is set for this project/folder/org. We use the nearest-ancestor to determine the effective container.
72-
The nearest ancestor (including this container) with `enabled` set (either true or false) will be returned.
70+
The resource container that determines if the quota adjuster is set for this project.
71+
Expect this field to be empty currently.
7372

7473
* `effective_enablement` -
75-
Based on the effective container`s setting above, determines Whether this container has the quota adjuster enabled.
74+
Based on the effective container`s setting above, determines Whether this resource container has the quota adjuster enabled.
75+
Expect this field to be empty currently.
7676

7777

7878
## Timeouts

0 commit comments

Comments
 (0)