-
Notifications
You must be signed in to change notification settings - Fork 9.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New Resource: aws_waf_regex_pattern_set #3913
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/waf" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| ) | ||
|
|
||
| func resourceAwsWafRegexPatternSet() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceAwsWafRegexPatternSetCreate, | ||
| Read: resourceAwsWafRegexPatternSetRead, | ||
| Update: resourceAwsWafRegexPatternSetUpdate, | ||
| Delete: resourceAwsWafRegexPatternSetDelete, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "regex_pattern_strings": { | ||
| Type: schema.TypeSet, | ||
| Optional: true, | ||
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceAwsWafRegexPatternSetCreate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).wafconn | ||
|
|
||
| log.Printf("[INFO] Creating WAF Regex Pattern Set: %s", d.Get("name").(string)) | ||
|
|
||
| wr := newWafRetryer(conn, "global") | ||
| out, err := wr.RetryWithToken(func(token *string) (interface{}, error) { | ||
| params := &waf.CreateRegexPatternSetInput{ | ||
| ChangeToken: token, | ||
| Name: aws.String(d.Get("name").(string)), | ||
| } | ||
| return conn.CreateRegexPatternSet(params) | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed creating WAF Regex Pattern Set: %s", err) | ||
| } | ||
| resp := out.(*waf.CreateRegexPatternSetOutput) | ||
|
|
||
| d.SetId(*resp.RegexPatternSet.RegexPatternSetId) | ||
|
|
||
| return resourceAwsWafRegexPatternSetUpdate(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsWafRegexPatternSetRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).wafconn | ||
| log.Printf("[INFO] Reading WAF Regex Pattern Set: %s", d.Get("name").(string)) | ||
| params := &waf.GetRegexPatternSetInput{ | ||
| RegexPatternSetId: aws.String(d.Id()), | ||
| } | ||
|
|
||
| resp, err := conn.GetRegexPatternSet(params) | ||
| if err != nil { | ||
| // TODO: Replace with a constant once available | ||
| // See https://github.com/aws/aws-sdk-go/issues/1856 | ||
| if isAWSErr(err, "WAFNonexistentItemException", "") { | ||
| log.Printf("[WARN] WAF Regex Pattern Set (%s) not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| d.Set("name", resp.RegexPatternSet.Name) | ||
| d.Set("regex_pattern_strings", aws.StringValueSlice(resp.RegexPatternSet.RegexPatternStrings)) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceAwsWafRegexPatternSetUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).wafconn | ||
|
|
||
| log.Printf("[INFO] Updating WAF Regex Pattern Set: %s", d.Get("name").(string)) | ||
|
|
||
| if d.HasChange("regex_pattern_strings") { | ||
| o, n := d.GetChange("regex_pattern_strings") | ||
| oldPatterns, newPatterns := o.(*schema.Set).List(), n.(*schema.Set).List() | ||
| err := updateWafRegexPatternSetPatternStrings(d.Id(), oldPatterns, newPatterns, conn) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed updating WAF Regex Pattern Set: %s", err) | ||
| } | ||
| } | ||
|
|
||
| return resourceAwsWafRegexPatternSetRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsWafRegexPatternSetDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).wafconn | ||
|
|
||
| oldPatterns := d.Get("regex_pattern_strings").(*schema.Set).List() | ||
| if len(oldPatterns) > 0 { | ||
| noPatterns := []interface{}{} | ||
| err := updateWafRegexPatternSetPatternStrings(d.Id(), oldPatterns, noPatterns, conn) | ||
| if err != nil { | ||
| return fmt.Errorf("Error updating WAF Regex Pattern Set: %s", err) | ||
| } | ||
| } | ||
|
|
||
| wr := newWafRetryer(conn, "global") | ||
| _, err := wr.RetryWithToken(func(token *string) (interface{}, error) { | ||
| req := &waf.DeleteRegexPatternSetInput{ | ||
| ChangeToken: token, | ||
| RegexPatternSetId: aws.String(d.Id()), | ||
| } | ||
| log.Printf("[INFO] Deleting WAF Regex Pattern Set: %s", req) | ||
| return conn.DeleteRegexPatternSet(req) | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed deleting WAF Regex Pattern Set: %s", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func updateWafRegexPatternSetPatternStrings(id string, oldPatterns, newPatterns []interface{}, conn *waf.WAF) error { | ||
| wr := newWafRetryer(conn, "global") | ||
| _, err := wr.RetryWithToken(func(token *string) (interface{}, error) { | ||
| req := &waf.UpdateRegexPatternSetInput{ | ||
| ChangeToken: token, | ||
| RegexPatternSetId: aws.String(id), | ||
| Updates: diffWafRegexPatternSetPatternStrings(oldPatterns, newPatterns), | ||
| } | ||
|
|
||
| return conn.UpdateRegexPatternSet(req) | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed updating WAF Regex Pattern Set: %s", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,231 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/waf" | ||
| "github.com/hashicorp/terraform/helper/acctest" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func TestAccAWSWafRegexPatternSet_basic(t *testing.T) { | ||
| var v waf.RegexPatternSet | ||
| patternSetName := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, | ||
| Steps: []resource.TestStep{ | ||
| resource.TestStep{ | ||
| Config: testAccAWSWafRegexPatternSetConfig(patternSetName), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckAWSWafRegexPatternSetExists("aws_waf_regex_pattern_set.test", &v), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "name", patternSetName), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.#", "2"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.2848565413", "one"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.3351840846", "two"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAWSWafRegexPatternSet_changePatterns(t *testing.T) { | ||
| var before, after waf.RegexPatternSet | ||
| patternSetName := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAWSWafRegexPatternSetConfig(patternSetName), | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testAccCheckAWSWafRegexPatternSetExists("aws_waf_regex_pattern_set.test", &before), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "name", patternSetName), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.#", "2"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.2848565413", "one"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.3351840846", "two"), | ||
| ), | ||
| }, | ||
| { | ||
| Config: testAccAWSWafRegexPatternSetConfig_changePatterns(patternSetName), | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testAccCheckAWSWafRegexPatternSetExists("aws_waf_regex_pattern_set.test", &after), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "name", patternSetName), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.#", "3"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.3351840846", "two"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.2929247714", "three"), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.1294846542", "four"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAWSWafRegexPatternSet_noPatterns(t *testing.T) { | ||
| var patternSet waf.RegexPatternSet | ||
| patternSetName := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAWSWafRegexPatternSetConfig_noPatterns(patternSetName), | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testAccCheckAWSWafRegexPatternSetExists("aws_waf_regex_pattern_set.test", &patternSet), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "name", patternSetName), | ||
| resource.TestCheckResourceAttr("aws_waf_regex_pattern_set.test", "regex_pattern_strings.#", "0"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAWSWafRegexPatternSet_disappears(t *testing.T) { | ||
| var v waf.RegexPatternSet | ||
| patternSetName := fmt.Sprintf("tfacc-%s", acctest.RandString(5)) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSWafRegexPatternSetDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAWSWafRegexPatternSetConfig(patternSetName), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckAWSWafRegexPatternSetExists("aws_waf_regex_pattern_set.test", &v), | ||
| testAccCheckAWSWafRegexPatternSetDisappears(&v), | ||
| ), | ||
| ExpectNonEmptyPlan: true, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func testAccCheckAWSWafRegexPatternSetDisappears(set *waf.RegexPatternSet) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| conn := testAccProvider.Meta().(*AWSClient).wafconn | ||
|
|
||
| wr := newWafRetryer(conn, "global") | ||
| _, err := wr.RetryWithToken(func(token *string) (interface{}, error) { | ||
| req := &waf.UpdateRegexPatternSetInput{ | ||
| ChangeToken: token, | ||
| RegexPatternSetId: set.RegexPatternSetId, | ||
| } | ||
|
|
||
| for _, pattern := range set.RegexPatternStrings { | ||
| update := &waf.RegexPatternSetUpdate{ | ||
| Action: aws.String("DELETE"), | ||
| RegexPatternString: pattern, | ||
| } | ||
| req.Updates = append(req.Updates, update) | ||
| } | ||
|
|
||
| return conn.UpdateRegexPatternSet(req) | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed updating WAF Regex Pattern Set: %s", err) | ||
| } | ||
|
|
||
| _, err = wr.RetryWithToken(func(token *string) (interface{}, error) { | ||
| opts := &waf.DeleteRegexPatternSetInput{ | ||
| ChangeToken: token, | ||
| RegexPatternSetId: set.RegexPatternSetId, | ||
| } | ||
| return conn.DeleteRegexPatternSet(opts) | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed deleting WAF Regex Pattern Set: %s", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testAccCheckAWSWafRegexPatternSetExists(n string, v *waf.RegexPatternSet) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| rs, ok := s.RootModule().Resources[n] | ||
| if !ok { | ||
| return fmt.Errorf("Not found: %s", n) | ||
| } | ||
|
|
||
| if rs.Primary.ID == "" { | ||
| return fmt.Errorf("No WAF Regex Pattern Set ID is set") | ||
| } | ||
|
|
||
| conn := testAccProvider.Meta().(*AWSClient).wafconn | ||
| resp, err := conn.GetRegexPatternSet(&waf.GetRegexPatternSetInput{ | ||
| RegexPatternSetId: aws.String(rs.Primary.ID), | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if *resp.RegexPatternSet.RegexPatternSetId == rs.Primary.ID { | ||
| *v = *resp.RegexPatternSet | ||
| return nil | ||
| } | ||
|
|
||
| return fmt.Errorf("WAF Regex Pattern Set (%s) not found", rs.Primary.ID) | ||
| } | ||
| } | ||
|
|
||
| func testAccCheckAWSWafRegexPatternSetDestroy(s *terraform.State) error { | ||
| for _, rs := range s.RootModule().Resources { | ||
| if rs.Type != "aws_waf_regex_pattern_set" { | ||
| continue | ||
| } | ||
|
|
||
| conn := testAccProvider.Meta().(*AWSClient).wafconn | ||
| resp, err := conn.GetRegexPatternSet(&waf.GetRegexPatternSetInput{ | ||
| RegexPatternSetId: aws.String(rs.Primary.ID), | ||
| }) | ||
|
|
||
| if err == nil { | ||
| if *resp.RegexPatternSet.RegexPatternSetId == rs.Primary.ID { | ||
| return fmt.Errorf("WAF Regex Pattern Set %s still exists", rs.Primary.ID) | ||
| } | ||
| } | ||
|
|
||
| // Return nil if the Regex Pattern Set is already destroyed | ||
| if isAWSErr(err, "WAFNonexistentItemException", "") { | ||
| return nil | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func testAccAWSWafRegexPatternSetConfig(name string) string { | ||
| return fmt.Sprintf(` | ||
| resource "aws_waf_regex_pattern_set" "test" { | ||
| name = "%s" | ||
| regex_pattern_strings = ["one", "two"] | ||
| }`, name) | ||
| } | ||
|
|
||
| func testAccAWSWafRegexPatternSetConfig_changePatterns(name string) string { | ||
| return fmt.Sprintf(` | ||
| resource "aws_waf_regex_pattern_set" "test" { | ||
| name = "%s" | ||
| regex_pattern_strings = ["two", "three", "four"] | ||
| }`, name) | ||
| } | ||
|
|
||
| func testAccAWSWafRegexPatternSetConfig_noPatterns(name string) string { | ||
| return fmt.Sprintf(` | ||
| resource "aws_waf_regex_pattern_set" "test" { | ||
| name = "%s" | ||
| }`, name) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Out of my own curiosity, what error does it throw if you do not empty the patterns before attempting to delete? Maybe we should include it as a comment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WAFNonEmptyEntityException: The referenced entity is not empty.I feel like it's a matter of being a good citizen and cleaning up after myself, rather than avoiding an error 😝