Skip to content

Commit 74aca0d

Browse files
committed
feat(compute): Promote request_body_inspection_size to GA in google_compute_security_policy
This change promotes the request_body_inspection_size field from Beta to GA in the google_compute_security_policy resource. The GA Compute API (v1) now supports this field with values: 8KB, 16KB, 32KB, 48KB, and 64KB for WAF request body inspection configuration. Changes: - Removed version guards from schema definition - Removed version guards from expand/flatten functions - Updated ForceSendFields to include field for all versions - Removed [Beta] marker from documentation - Enabled tests for GA provider ```release-note:enhancement compute: promoted `request_body_inspection_size` to GA in `google_compute_security_policy` ```
1 parent 1b91938 commit 74aca0d

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

mmv1/third_party/terraform/services/compute/resource_compute_security_policy.go.tmpl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -536,15 +536,13 @@ func ResourceComputeSecurityPolicy() *schema.Resource {
536536
Description: `An optional list of case-insensitive request header names to use for resolving the callers client IP address.`,
537537
Elem: &schema.Schema{Type: schema.TypeString},
538538
},
539-
{{- if ne $.TargetVersionName "ga" }}
540539
"request_body_inspection_size": {
541540
Type: schema.TypeString,
542541
Optional: true,
543542
Computed: true,
544543
ValidateFunc: validation.StringInSlice([]string{"8KB", "16KB", "32KB", "48KB", "64KB"}, false),
545544
Description: `The maximum request size chosen by the customer with Waf enabled. Values supported are "8KB", "16KB, "32KB", "48KB" and "64KB". Values are case insensitive.`,
546545
},
547-
{{- end }}
548546
},
549547
},
550548
},
@@ -985,11 +983,7 @@ func resourceComputeSecurityPolicyUpdate(d *schema.ResourceData, meta interface{
985983

986984
if d.HasChange("advanced_options_config") {
987985
securityPolicy.AdvancedOptionsConfig = expandSecurityPolicyAdvancedOptionsConfig(d.Get("advanced_options_config").([]interface{}))
988-
{{ if eq $.TargetVersionName `ga` }}
989-
securityPolicy.ForceSendFields = append(securityPolicy.ForceSendFields, "AdvancedOptionsConfig", "advancedOptionsConfig.jsonParsing", "advancedOptionsConfig.jsonCustomConfig", "advancedOptionsConfig.logLevel")
990-
{{- else }}
991986
securityPolicy.ForceSendFields = append(securityPolicy.ForceSendFields, "AdvancedOptionsConfig", "advancedOptionsConfig.jsonParsing", "advancedOptionsConfig.jsonCustomConfig", "advancedOptionsConfig.logLevel", "advancedOptionsConfig.requestBodyInspectionSize")
992-
{{- end }}
993987
securityPolicy.ForceSendFields = append(securityPolicy.ForceSendFields, "advanceOptionConfig.userIpRequestHeaders")
994988
if len(securityPolicy.AdvancedOptionsConfig.UserIpRequestHeaders) == 0 {
995989
// to clean this list we must send the updateMask of this field on the request.
@@ -1481,9 +1475,7 @@ func expandSecurityPolicyAdvancedOptionsConfig(configured []interface{}) *comput
14811475
JsonCustomConfig: expandSecurityPolicyAdvancedOptionsConfigJsonCustomConfig(data["json_custom_config"].([]interface{})),
14821476
LogLevel: data["log_level"].(string),
14831477
UserIpRequestHeaders: tpgresource.ConvertStringArr(data["user_ip_request_headers"].(*schema.Set).List()),
1484-
{{- if ne $.TargetVersionName "ga" }}
14851478
RequestBodyInspectionSize: data["request_body_inspection_size"].(string),
1486-
{{- end }}
14871479
}
14881480
}
14891481

@@ -1497,9 +1489,7 @@ func flattenSecurityPolicyAdvancedOptionsConfig(conf *compute.SecurityPolicyAdva
14971489
"json_custom_config": flattenSecurityPolicyAdvancedOptionsConfigJsonCustomConfig(conf.JsonCustomConfig),
14981490
"log_level": conf.LogLevel,
14991491
"user_ip_request_headers": schema.NewSet(schema.HashString, tpgresource.ConvertStringArrToInterface(conf.UserIpRequestHeaders)),
1500-
{{- if ne $.TargetVersionName "ga" }}
15011492
"request_body_inspection_size": conf.RequestBodyInspectionSize,
1502-
{{- end }}
15031493
}
15041494

15051495
return []map[string]interface{}{data}

mmv1/third_party/terraform/services/compute/resource_compute_security_policy_test.go.tmpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ func TestAccComputeSecurityPolicy_withAdvancedOptionsConfig(t *testing.T) {
295295
ImportState: true,
296296
ImportStateVerify: true,
297297
},
298-
{{- if ne $.TargetVersionName "ga" }}
299298
// Add request_body_inspection_size value
300299
{
301300
Config: testAccComputeSecurityPolicy_withAdvancedOptionsConfig_update4(spName),
@@ -305,7 +304,6 @@ func TestAccComputeSecurityPolicy_withAdvancedOptionsConfig(t *testing.T) {
305304
ImportState: true,
306305
ImportStateVerify: true,
307306
},
308-
{{- end }}
309307
{
310308
Config: testAccComputeSecurityPolicy_basic(spName, "CLOUD_ARMOR"),
311309
},
@@ -1517,13 +1515,10 @@ resource "google_compute_security_policy" "policy" {
15171515
`, spName)
15181516
}
15191517

1520-
{{- if ne $.TargetVersionName "ga" }}
15211518
func testAccComputeSecurityPolicy_withAdvancedOptionsConfig_update4(spName string) string {
15221519
return fmt.Sprintf(`
15231520
resource "google_compute_security_policy" "policy" {
15241521
name = "%s"
1525-
description = "updated description changing json_parsing to STANDARD_WITH_GRAPHQL"
1526-
15271522
advanced_options_config {
15281523
json_parsing = "STANDARD_WITH_GRAPHQL"
15291524
json_custom_config {
@@ -1539,7 +1534,6 @@ resource "google_compute_security_policy" "policy" {
15391534
}
15401535
`, spName)
15411536
}
1542-
{{- end }}
15431537

15441538
func testAccComputeSecurityPolicy_withoutAdaptiveProtection(spName string) string {
15451539
return fmt.Sprintf(`

mmv1/third_party/terraform/website/docs/r/compute_security_policy.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ The following arguments are supported:
217217

218218
* `user_ip_request_headers` - (Optional) An optional list of case-insensitive request header names to use for resolving the callers client IP address.
219219

220-
* `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.
220+
* `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.
221221

222222
<a name="nested_json_custom_config"></a>The `json_custom_config` block supports:
223223

0 commit comments

Comments
 (0)