diff --git a/.changelog/16094.txt b/.changelog/16094.txt new file mode 100644 index 0000000000..17eec3415c --- /dev/null +++ b/.changelog/16094.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +compute: promoted `request_body_inspection_size` to GA in `google_compute_security_policy` resource (ga) +``` \ No newline at end of file diff --git a/google-beta/services/compute/resource_compute_security_policy.go b/google-beta/services/compute/resource_compute_security_policy.go index e98ab78d46..92862ba017 100644 --- a/google-beta/services/compute/resource_compute_security_policy.go +++ b/google-beta/services/compute/resource_compute_security_policy.go @@ -992,7 +992,6 @@ func resourceComputeSecurityPolicyUpdate(d *schema.ResourceData, meta interface{ if d.HasChange("advanced_options_config") { securityPolicy.AdvancedOptionsConfig = expandSecurityPolicyAdvancedOptionsConfig(d.Get("advanced_options_config").([]interface{})) - securityPolicy.ForceSendFields = append(securityPolicy.ForceSendFields, "AdvancedOptionsConfig", "advancedOptionsConfig.jsonParsing", "advancedOptionsConfig.jsonCustomConfig", "advancedOptionsConfig.logLevel", "advancedOptionsConfig.requestBodyInspectionSize") securityPolicy.ForceSendFields = append(securityPolicy.ForceSendFields, "advanceOptionConfig.userIpRequestHeaders") if len(securityPolicy.AdvancedOptionsConfig.UserIpRequestHeaders) == 0 { diff --git a/google-beta/services/compute/resource_compute_security_policy_meta.yaml b/google-beta/services/compute/resource_compute_security_policy_meta.yaml index 2e42539861..c681c6cff0 100644 --- a/google-beta/services/compute/resource_compute_security_policy_meta.yaml +++ b/google-beta/services/compute/resource_compute_security_policy_meta.yaml @@ -123,4 +123,4 @@ fields: - api_field: 'selfLink' - field: 'terraform_labels' provider_only: true - - api_field: 'type' + - api_field: 'type' \ No newline at end of file diff --git a/google-beta/services/compute/resource_compute_security_policy_test.go b/google-beta/services/compute/resource_compute_security_policy_test.go index 650a42030f..d1b0eff483 100644 --- a/google-beta/services/compute/resource_compute_security_policy_test.go +++ b/google-beta/services/compute/resource_compute_security_policy_test.go @@ -1526,12 +1526,11 @@ resource "google_compute_security_policy" "policy" { } `, spName) } + func testAccComputeSecurityPolicy_withAdvancedOptionsConfig_update4(spName string) string { return fmt.Sprintf(` resource "google_compute_security_policy" "policy" { name = "%s" - description = "updated description changing json_parsing to STANDARD_WITH_GRAPHQL" - advanced_options_config { json_parsing = "STANDARD_WITH_GRAPHQL" json_custom_config { diff --git a/website/docs/r/compute_security_policy.html.markdown b/website/docs/r/compute_security_policy.html.markdown index 50584521df..0081ee66f7 100644 --- a/website/docs/r/compute_security_policy.html.markdown +++ b/website/docs/r/compute_security_policy.html.markdown @@ -231,7 +231,7 @@ The following arguments are supported: * `user_ip_request_headers` - (Optional) An optional list of case-insensitive request header names to use for resolving the callers client IP address. -* `request_body_inspection_size` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) The maximum request size chosen by the customer with Waf enabled. Values supported are "8KB", "16KB, "32KB", "48KB" and "64KB". Values are case insensitive. +* `request_body_inspection_size` - (Optional) The maximum request size chosen by the customer with Waf enabled. Values supported are "8KB", "16KB, "32KB", "48KB" and "64KB". Values are case insensitive. The `json_custom_config` block supports: