r/aws_wafv2_web_acl: Remove statement.managed_rule_group_statement.excluded_rule and statement.rule_group_reference_statement.excluded_rule

.changelog/31374.txt

@@ -0,0 +1,7 @@
+```release-note:breaking-change
+resource/aws_wafv2_web_acl: The `statement.managed_rule_group_statement.excluded_rule` and `statement.rule_group_reference_statement.excluded_rule` attributes have been removed
+```
+
+```release-note:enhancement
+resource/aws_wafv2_web_acl: Support `rule_action_override` on `rule_group_reference_statement`
+```

internal/service/wafv2/flex.go

@@ -1016,7 +1016,6 @@ func expandManagedRuleGroupStatement(l []interface{}) *wafv2.ManagedRuleGroupSta
 
 	m := l[0].(map[string]interface{})
 	r := &wafv2.ManagedRuleGroupStatement{
-		ExcludedRules:       expandExcludedRules(m["excluded_rule"].([]interface{})),
 		Name:                aws.String(m["name"].(string)),
 		RuleActionOverrides: expandRuleActionOverrides(m["rule_action_override"].([]interface{})),
 		VendorName:          aws.String(m["vendor_name"].(string)),
@@ -1260,35 +1259,8 @@ func expandRuleGroupReferenceStatement(l []interface{}) *wafv2.RuleGroupReferenc
 	m := l[0].(map[string]interface{})
 
 	return &wafv2.RuleGroupReferenceStatement{
-		ARN:           aws.String(m["arn"].(string)),
-		ExcludedRules: expandExcludedRules(m["excluded_rule"].([]interface{})),
-	}
-}
-
-func expandExcludedRules(l []interface{}) []*wafv2.ExcludedRule {
-	if len(l) == 0 || l[0] == nil {
-		return nil
-	}
-
-	rules := make([]*wafv2.ExcludedRule, 0)
-
-	for _, rule := range l {
-		if rule == nil {
-			continue
-		}
-		rules = append(rules, expandExcludedRule(rule.(map[string]interface{})))
-	}
-
-	return rules
-}
-
-func expandExcludedRule(m map[string]interface{}) *wafv2.ExcludedRule {
-	if m == nil {
-		return nil
-	}
-
-	return &wafv2.ExcludedRule{
-		Name: aws.String(m["name"].(string)),
+		ARN:                 aws.String(m["arn"].(string)),
+		RuleActionOverrides: expandRuleActionOverrides(m["rule_action_override"].([]interface{})),
 	}
 }
 
@@ -2176,10 +2148,6 @@ func flattenManagedRuleGroupStatement(apiObject *wafv2.ManagedRuleGroupStatement
 
 	tfMap := map[string]interface{}{}
 
-	if apiObject.ExcludedRules != nil {
-		tfMap["excluded_rule"] = flattenExcludedRules(apiObject.ExcludedRules)
-	}
-
 	if apiObject.Name != nil {
 		tfMap["name"] = aws.StringValue(apiObject.Name)
 	}
@@ -2410,28 +2378,20 @@ func flattenRateBasedStatement(apiObject *wafv2.RateBasedStatement) interface{}
 	return []interface{}{tfMap}
 }
 
-func flattenRuleGroupReferenceStatement(r *wafv2.RuleGroupReferenceStatement) interface{} {
-	if r == nil {
+func flattenRuleGroupReferenceStatement(apiObject *wafv2.RuleGroupReferenceStatement) interface{} {
+	if apiObject == nil {
 		return []interface{}{}
 	}
 
-	m := map[string]interface{}{
-		"excluded_rule": flattenExcludedRules(r.ExcludedRules),
-		"arn":           aws.StringValue(r.ARN),
+	tfMap := map[string]interface{}{
+		"arn": aws.StringValue(apiObject.ARN),
 	}
 
-	return []interface{}{m}
-}
-
-func flattenExcludedRules(r []*wafv2.ExcludedRule) interface{} {
-	out := make([]map[string]interface{}, len(r))
-	for i, rule := range r {
-		m := make(map[string]interface{})
-		m["name"] = aws.StringValue(rule.Name)
-		out[i] = m
+	if apiObject.RuleActionOverrides != nil {
+		tfMap["rule_action_override"] = flattenRuleActionOverrides(apiObject.RuleActionOverrides)
 	}
 
-	return out
+	return []interface{}{tfMap}
 }
 
 func flattenRuleActionOverrides(r []*wafv2.RuleActionOverride) interface{} {

internal/service/wafv2/schemas.go

@@ -873,15 +873,14 @@ func managedRuleGroupStatementSchema(level int) *schema.Schema {
 		MaxItems: 1,
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
-				"excluded_rule": excludedRuleSchema(),
+				"managed_rule_group_configs": managedRuleGroupConfigSchema(),
 				"name": {
 					Type:         schema.TypeString,
 					Required:     true,
 					ValidateFunc: validation.StringLenBetween(1, 128),
 				},
-				"rule_action_override":       ruleActionOverrideSchema(),
-				"managed_rule_group_configs": managedRuleGroupConfigSchema(),
-				"scope_down_statement":       scopeDownStatementSchema(level - 1),
+				"rule_action_override": ruleActionOverrideSchema(),
+				"scope_down_statement": scopeDownStatementSchema(level - 1),
 				"vendor_name": {
 					Type:         schema.TypeString,
 					Required:     true,
@@ -897,23 +896,6 @@ func managedRuleGroupStatementSchema(level int) *schema.Schema {
 	}
 }
 
-func excludedRuleSchema() *schema.Schema {
-	return &schema.Schema{
-		Type:     schema.TypeList,
-		Optional: true,
-		Elem: &schema.Resource{
-			Schema: map[string]*schema.Schema{
-				"name": {
-					Type:         schema.TypeString,
-					Required:     true,
-					ValidateFunc: validation.StringLenBetween(1, 128),
-				},
-			},
-		},
-		Deprecated: "Use rule_action_override instead",
-	}
-}
-
 func rateBasedStatementSchema(level int) *schema.Schema {
 	return &schema.Schema{
 		Type:     schema.TypeList,
@@ -1100,7 +1082,7 @@ func ruleGroupReferenceStatementSchema() *schema.Schema {
 					Required:     true,
 					ValidateFunc: verify.ValidARN,
 				},
-				"excluded_rule": excludedRuleSchema(),
+				"rule_action_override": ruleActionOverrideSchema(),
 			},
 		},
 	}