Merge pull request #4816 from saravanan30erd/wafregional_ipset

add arn to aws_wafregional_ipset
hashicorp · Jun 12, 2018 · 14df762 · 14df762
2 parents c8af574 + de9f282
commit 14df762
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/aws/resource_aws_wafregional_ipset.go b/aws/resource_aws_wafregional_ipset.go
@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/waf"
 	"github.com/aws/aws-sdk-go/service/wafregional"
@@ -24,6 +25,10 @@ func resourceAwsWafRegionalIPSet() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"arn": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"ip_set_descriptor": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -85,6 +90,15 @@ func resourceAwsWafRegionalIPSetRead(d *schema.ResourceData, meta interface{}) e
 	d.Set("ip_set_descriptor", flattenWafIpSetDescriptorWR(resp.IPSet.IPSetDescriptors))
 	d.Set("name", resp.IPSet.Name)
 
+	arn := arn.ARN{
+		Partition: meta.(*AWSClient).partition,
+		Service:   "waf-regional",
+		Region:    meta.(*AWSClient).region,
+		AccountID: meta.(*AWSClient).accountid,
+		Resource:  fmt.Sprintf("ipset/%s", d.Id()),
+	}
+	d.Set("arn", arn.String())
+
 	return nil
 }
 

diff --git a/aws/resource_aws_wafregional_ipset_test.go b/aws/resource_aws_wafregional_ipset_test.go
@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"reflect"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -34,6 +35,8 @@ func TestAccAWSWafRegionalIPSet_basic(t *testing.T) {
 						"aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.type", "IPV4"),
 					resource.TestCheckResourceAttr(
 						"aws_wafregional_ipset.ipset", "ip_set_descriptor.4037960608.value", "192.0.7.0/24"),
+					resource.TestMatchResourceAttr("aws_wafregional_ipset.ipset", "arn",
+						regexp.MustCompile(`^arn:[\w-]+:waf-regional:[^:]+:\d{12}:ipset/.+$`)),
 				),
 			},
 		},

diff --git a/website/docs/r/wafregional_ipset.html.markdown b/website/docs/r/wafregional_ipset.html.markdown
@@ -52,3 +52,4 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The ID of the WAF IPSet.
+* `arn` - The ARN of the WAF IPSet.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,3 +52,4 @@ The following arguments are supported:
		In addition to all arguments above, the following attributes are exported:

		* `id` - The ID of the WAF IPSet.
		* `arn` - The ARN of the WAF IPSet.