Merge pull request #23253 from hashicorp/b-backport-22978

Backport of #22978 to `release/3.x`
hashicorp · Feb 17, 2022 · 297c504 · 297c504
2 parents 4723139 + 25c8515
commit 297c504
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.changelog/22978.txt b/.changelog/22978.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_waf_rule_group: Prevent panic when expanding the rule group's set of `activated_rule`
+```
+
+```release-note:bug
+resource/aws_wafregional_rule_group: Prevent panic when expanding the rule group's set of `activated_rule`
+```
diff --git a/internal/service/waf/helpers.go b/internal/service/waf/helpers.go
@@ -271,7 +271,7 @@ func FlattenActivatedRules(activatedRules []*waf.ActivatedRule) []interface{} {
 
 func ExpandActivatedRule(rule map[string]interface{}) *waf.ActivatedRule {
 	r := &waf.ActivatedRule{
-		Priority: aws.Int64(rule["priority"].(int64)),
+		Priority: aws.Int64(int64(rule["priority"].(int))),
 		RuleId:   aws.String(rule["rule_id"].(string)),
 		Type:     aws.String(rule["type"].(string)),
 	}