ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/aws: Support IPSets with 0 descriptors

This commit is contained in:
Radek Simko 2017-04-19 14:05:05 +01:00
parent 01aa3fd76a
commit f33afb7e4e
No known key found for this signature in database
GPG Key ID: 6823F3DCCE01BB19
2 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/providers/aws/resource_aws_waf_ipset.go
View File

@ -100,13 +100,16 @@ func resourceAwsWafIPSetRead(d *schema.ResourceData, meta interface{}) error {
func resourceAwsWafIPSetUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsWafIPSetUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).wafconn conn := meta.(*AWSClient).wafconn
o, n := d.GetChange("ip_set_descriptors") if d.HasChange("ip_set_descriptors") {
oldD, newD := o.(*schema.Set).List(), n.(*schema.Set).List() o, n := d.GetChange("ip_set_descriptors")
oldD, newD := o.(*schema.Set).List(), n.(*schema.Set).List()
err := updateWafIpSetDescriptors(d.Id(), oldD, newD, conn) err := updateWafIpSetDescriptors(d.Id(), oldD, newD, conn)
if err != nil { if err != nil {
return fmt.Errorf("Error Updating WAF IPSet: %s", err) return fmt.Errorf("Error Updating WAF IPSet: %s", err)
}
} }
return resourceAwsWafIPSetRead(d, meta) return resourceAwsWafIPSetRead(d, meta)
} }
@ -114,15 +117,17 @@ func resourceAwsWafIPSetDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).wafconn conn := meta.(*AWSClient).wafconn
oldDescriptors := d.Get("ip_set_descriptors").(*schema.Set).List() oldDescriptors := d.Get("ip_set_descriptors").(*schema.Set).List()
noDescriptors := []interface{}{}
err := updateWafIpSetDescriptors(d.Id(), oldDescriptors, noDescriptors, conn) if len(oldDescriptors) > 0 {
if err != nil { noDescriptors := []interface{}{}
return fmt.Errorf("Error updating IPSetDescriptors: %s", err) err := updateWafIpSetDescriptors(d.Id(), oldDescriptors, noDescriptors, conn)
if err != nil {
return fmt.Errorf("Error updating IPSetDescriptors: %s", err)
}
} }
wr := newWafRetryer(conn, "global") wr := newWafRetryer(conn, "global")
_, err = wr.RetryWithToken(func(token *string) (interface{}, error) { _, err := wr.RetryWithToken(func(token *string) (interface{}, error) {
req := &waf.DeleteIPSetInput{ req := &waf.DeleteIPSetInput{
ChangeToken: token, ChangeToken: token,
IPSetId: aws.String(d.Id()), IPSetId: aws.String(d.Id()),

29
builtin/providers/aws/resource_aws_waf_ipset_test.go
View File

@ -138,6 +138,29 @@ func TestAccAWSWafIPSet_changeDescriptors(t *testing.T) {
}) })
} }
func TestAccAWSWafIPSet_noDescriptors(t *testing.T) {
var ipset waf.IPSet
ipsetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSWafIPSetDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSWafIPSetConfig_noDescriptors(ipsetName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAWSWafIPSetExists("aws_waf_ipset.ipset", &ipset),
resource.TestCheckResourceAttr(
"aws_waf_ipset.ipset", "name", ipsetName),
resource.TestCheckResourceAttr(
"aws_waf_ipset.ipset", "ip_set_descriptors.#", "0"),
),
},
},
})
}
func TestDiffWafIpSetDescriptors(t *testing.T) { func TestDiffWafIpSetDescriptors(t *testing.T) {
testCases := []struct { testCases := []struct {
Old []interface{} Old []interface{}
@ -369,3 +392,9 @@ func testAccAWSWafIPSetConfigChangeIPSetDescriptors(name string) string {
} }
}`, name) }`, name)
} }
func testAccAWSWafIPSetConfig_noDescriptors(name string) string {
return fmt.Sprintf(`resource "aws_waf_ipset" "ipset" {
name = "%s"
}`, name)
}