r/waf_rule_group - refactor to use keyvaluetags

aws/resource_aws_waf_rule_group.go

@@ -68,6 +68,10 @@ func resourceAwsWafRuleGroup() *schema.Resource {
 				},
 			},
 			"tags": tagsSchema(),
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -95,7 +99,18 @@ func resourceAwsWafRuleGroupCreate(d *schema.ResourceData, meta interface{}) err
 	}
 	resp := out.(*waf.CreateRuleGroupOutput)
 	d.SetId(*resp.RuleGroup.RuleGroupId)
-	return resourceAwsWafRuleGroupUpdate(d, meta)
+
+	activatedRules := d.Get("activated_rule").(*schema.Set).List()
+	if len(activatedRules) > 0 {
+		noActivatedRules := []interface{}{}
+
+		err := updateWafRuleGroupResource(d.Id(), noActivatedRules, activatedRules, conn)
+		if err != nil {
+			return fmt.Errorf("Error Updating WAF Rule Group: %s", err)
+		}
+	}
+
+	return resourceAwsWafRuleGroupRead(d, meta)
 }
 
 func resourceAwsWafRuleGroupRead(d *schema.ResourceData, meta interface{}) error {
@@ -107,7 +122,7 @@ func resourceAwsWafRuleGroupRead(d *schema.ResourceData, meta interface{}) error
 
 	resp, err := conn.GetRuleGroup(params)
 	if err != nil {
-		if isAWSErr(err, "WAFNonexistentItemException", "") {
+		if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") {
 			log.Printf("[WARN] WAF Rule Group (%s) not found, removing from state", d.Id())
 			d.SetId("")
 			return nil
@@ -129,14 +144,13 @@ func resourceAwsWafRuleGroupRead(d *schema.ResourceData, meta interface{}) error
 		AccountID: meta.(*AWSClient).accountid,
 		Resource:  fmt.Sprintf("rulegroup/%s", d.Id()),
 	}.String()
+	d.Set("arn", arn)
 
-	tagList, err := conn.ListTagsForResource(&waf.ListTagsForResourceInput{
-		ResourceARN: aws.String(arn),
-	})
+	tags, err := keyvaluetags.WafListTags(conn, arn)
 	if err != nil {
-		return fmt.Errorf("Failed to get WAF Rule Group parameter tags for %s: %s", d.Get("name"), err)
+		return fmt.Errorf("error listing tags for WAF Rule Group (%s): %s", arn, err)
 	}
-	if err := d.Set("tags", keyvaluetags.WafKeyValueTags(tagList.TagInfoForResource.TagList).IgnoreAws().Map()); err != nil {
+	if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil {
 		return fmt.Errorf("error setting tags: %s", err)
 	}
 
@@ -163,14 +177,7 @@ func resourceAwsWafRuleGroupUpdate(d *schema.ResourceData, meta interface{}) err
 	if d.HasChange("tags") {
 		o, n := d.GetChange("tags")
 
-		arn := arn.ARN{
-			Partition: meta.(*AWSClient).partition,
-			Service:   "waf",
-			AccountID: meta.(*AWSClient).accountid,
-			Resource:  fmt.Sprintf("rulegroup/%s", d.Id()),
-		}.String()
-
-		if err := keyvaluetags.WafUpdateTags(conn, arn, o, n); err != nil {
+		if err := keyvaluetags.WafUpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
 			return fmt.Errorf("error updating tags: %s", err)
 		}
 	}

aws/resource_aws_waf_rule_group_test.go

@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"log"
+	"regexp"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -88,6 +89,7 @@ func TestAccAWSWafRuleGroup_basic(t *testing.T) {
 					testCheckResourceAttrWithIndexesAddr(resourceName, "activated_rule.%d.action.0.type", &idx, "COUNT"),
 					testCheckResourceAttrWithIndexesAddr(resourceName, "activated_rule.%d.priority", &idx, "50"),
 					testCheckResourceAttrWithIndexesAddr(resourceName, "activated_rule.%d.type", &idx, waf.WafRuleTypeRegular),
+					testAccMatchResourceAttrGlobalARN(resourceName, "arn", "waf", regexp.MustCompile(`rulegroup/.+`)),
 				),
 			},
 			{
@@ -385,7 +387,7 @@ func testAccCheckAWSWafRuleGroupDestroy(s *terraform.State) error {
 			}
 		}
 
-		if isAWSErr(err, "WAFNonexistentItemException", "") {
+		if isAWSErr(err, waf.ErrCodeNonexistentItemException, "") {
 			return nil
 		}
 

website/docs/r/waf_rule_group.html.markdown

@@ -58,6 +58,7 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The ID of the WAF rule group.
+* `arn` - The ARN of the WAF rule group.
 
 ## Import