Add new fields in QAS resource (#14204) (#10223)

[upstream:f0927d0547ee26934577bdbb234edb6bdd817139]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14204.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudquotas: added `inherited`  and `inherited_from` fields to `google_cloud_quotas_quota_adjuster_settings` resource
+```

google-beta/services/cloudquotas/resource_cloud_quotas_quota_adjuster_settings.go

@@ -65,16 +65,26 @@ func ResourceCloudQuotasQuotaAdjusterSettings() *schema.Resource {
 				Description: `The parent of the quota preference. Allowed parent format is "projects/[project-id / number]".`,
 			},
 			"effective_container": {
-				Type:     schema.TypeString,
-				Computed: true,
-				Description: `The resource container that determines if the quota adjuster is set for this project.
-Expect this field to be empty currently.`,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `The resource container that determines if the quota adjuster is set for this project.`,
 			},
 			"effective_enablement": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `Based on the effective container's setting above, determines Whether this resource container has the quota adjuster enabled.`,
+			},
+			"inherited": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: `Indicates whether the setting is inherited or explicitly specified.`,
+			},
+			"inherited_from": {
 				Type:     schema.TypeString,
 				Computed: true,
-				Description: `Based on the effective container's setting above, determines Whether this resource container has the quota adjuster enabled.
-Expect this field to be empty currently.`,
+				Description: `The resource container from which the setting is inherited. This refers to the  nearest ancestor with enablement set (either ENABLED or DISABLED).
+The value can be 'organizations/{organization_id}', 'folders/{folder_id}', or can be 'default' if no ancestor exists with enablement set.
+The value will be empty when 'enablement' is specified on this resource container.`,
 			},
 		},
 		UseJSONNumber: true,
@@ -177,6 +187,12 @@ func resourceCloudQuotasQuotaAdjusterSettingsRead(d *schema.ResourceData, meta i
 	if err := d.Set("effective_enablement", flattenCloudQuotasQuotaAdjusterSettingsEffectiveEnablement(res["effectiveEnablement"], d, config)); err != nil {
 		return fmt.Errorf("Error reading QuotaAdjusterSettings: %s", err)
 	}
+	if err := d.Set("inherited", flattenCloudQuotasQuotaAdjusterSettingsInherited(res["inherited"], d, config)); err != nil {
+		return fmt.Errorf("Error reading QuotaAdjusterSettings: %s", err)
+	}
+	if err := d.Set("inherited_from", flattenCloudQuotasQuotaAdjusterSettingsInheritedFrom(res["inheritedFrom"], d, config)); err != nil {
+		return fmt.Errorf("Error reading QuotaAdjusterSettings: %s", err)
+	}
 
 	return nil
 }
@@ -270,6 +286,14 @@ func flattenCloudQuotasQuotaAdjusterSettingsEffectiveEnablement(v interface{}, d
 	return v
 }
 
+func flattenCloudQuotasQuotaAdjusterSettingsInherited(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenCloudQuotasQuotaAdjusterSettingsInheritedFrom(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func expandCloudQuotasQuotaAdjusterSettingsEnablement(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

google-beta/services/cloudquotas/resource_cloud_quotas_quota_adjuster_settings_generated_meta.yaml

@@ -8,5 +8,7 @@ fields:
   - field: 'effective_container'
   - field: 'effective_enablement'
   - field: 'enablement'
+  - field: 'inherited'
+  - field: 'inherited_from'
   - field: 'parent'
     provider_only: true

website/docs/r/cloud_quotas_quota_adjuster_settings.html.markdown

@@ -70,11 +70,17 @@ In addition to the arguments listed above, the following computed attributes are
 
 * `effective_container` -
   The resource container that determines if the quota adjuster is set for this project.
-  Expect this field to be empty currently.
 
 * `effective_enablement` -
   Based on the effective container`s setting above, determines Whether this resource container has the quota adjuster enabled.
-  Expect this field to be empty currently.
+
+* `inherited` -
+  Indicates whether the setting is inherited or explicitly specified.
+
+* `inherited_from` -
+  The resource container from which the setting is inherited. This refers to the  nearest ancestor with enablement set (either ENABLED or DISABLED).
+  The value can be `organizations/{organization_id}`, `folders/{folder_id}`, or can be `default` if no ancestor exists with enablement set.
+  The value will be empty when `enablement` is specified on this resource container.
 
 
 ## Timeouts