Skip to content
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.

Sign up for GitHub

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

Allow WAF web ACL rule import #5337

Merged
merged 2 commits into from
Jul 26, 2018
Merged

Allow WAF web ACL rule import #5337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c88adfc
Allow WAF web ACL rule import
Jul 25, 2018
98acda2
Add import documentation
Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions aws/resource_aws_waf_web_acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ func resourceAwsWafWebAcl() *schema.Resource {
Read: resourceAwsWafWebAclRead,
Update: resourceAwsWafWebAclUpdate,
Delete: resourceAwsWafWebAclDelete,
Importer: &schema.ResourceImporter{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add the ## Import documentation to website/docs/r/waf_web_acl.html.markdown? Thanks! It'd probably also be good to note the rules limitation (for now).

State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"name": &schema.Schema{
Expand Down
109 changes: 71 additions & 38 deletions aws/resource_aws_waf_web_acl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,44 @@ import (
func TestAccAWSWafWebAcl_basic(t *testing.T) {
var v waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_waf_web_acl.waf_acl"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😍


resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSWafWebAclDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccAWSWafWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &v),
testAccCheckAWSWafWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.4234791575.type", "ALLOW"),
resourceName, "default_action.4234791575.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "rules.#", "1"),
resourceName, "rules.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
// The WAF ACL rule resource doesn't GET rules
ImportStateVerifyIgnore: []string{"rules"},
},
},
})
}

func TestAccAWSWafWebAcl_group(t *testing.T) {
var v waf.WebACL
wafAclName := fmt.Sprintf("wafaclgroup%s", acctest.RandString(5))
resourceName := "aws_waf_web_acl.waf_acl"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -54,19 +63,26 @@ func TestAccAWSWafWebAcl_group(t *testing.T) {
resource.TestStep{
Config: testAccAWSWafWebAclGroupConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &v),
testAccCheckAWSWafWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.4234791575.type", "ALLOW"),
resourceName, "default_action.4234791575.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "rules.#", "1"),
resourceName, "rules.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
// The WAF ACL rule resource doesn't GET rules
ImportStateVerifyIgnore: []string{"rules"},
},
},
})
}
Expand All @@ -75,6 +91,7 @@ func TestAccAWSWafWebAcl_changeNameForceNew(t *testing.T) {
var before, after waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
wafAclNewName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_waf_web_acl.waf_acl"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -84,35 +101,42 @@ func TestAccAWSWafWebAcl_changeNameForceNew(t *testing.T) {
{
Config: testAccAWSWafWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &before),
testAccCheckAWSWafWebAclExists(resourceName, &before),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.4234791575.type", "ALLOW"),
resourceName, "default_action.4234791575.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "rules.#", "1"),
resourceName, "rules.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
Config: testAccAWSWafWebAclConfigChangeName(wafAclNewName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &after),
testAccCheckAWSWafWebAclExists(resourceName, &after),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.4234791575.type", "ALLOW"),
resourceName, "default_action.4234791575.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "name", wafAclNewName),
resourceName, "name", wafAclNewName),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "rules.#", "1"),
resourceName, "rules.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "metric_name", wafAclNewName),
resourceName, "metric_name", wafAclNewName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
// The WAF ACL rule resource doesn't GET rules
ImportStateVerifyIgnore: []string{"rules"},
},
},
})
}
Expand All @@ -121,6 +145,7 @@ func TestAccAWSWafWebAcl_changeDefaultAction(t *testing.T) {
var before, after waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
wafAclNewName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_waf_web_acl.waf_acl"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -130,42 +155,50 @@ func TestAccAWSWafWebAcl_changeDefaultAction(t *testing.T) {
{
Config: testAccAWSWafWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &before),
testAccCheckAWSWafWebAclExists(resourceName, &before),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.4234791575.type", "ALLOW"),
resourceName, "default_action.4234791575.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "rules.#", "1"),
resourceName, "rules.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
Config: testAccAWSWafWebAclConfigDefaultAction(wafAclNewName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &after),
testAccCheckAWSWafWebAclExists(resourceName, &after),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "default_action.2267395054.type", "BLOCK"),
resourceName, "default_action.2267395054.type", "BLOCK"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "name", wafAclNewName),
resourceName, "name", wafAclNewName),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "rules.#", "1"),
resourceName, "rules.#", "1"),
resource.TestCheckResourceAttr(
"aws_waf_web_acl.waf_acl", "metric_name", wafAclNewName),
resourceName, "metric_name", wafAclNewName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
// The WAF ACL rule resource doesn't GET rules
ImportStateVerifyIgnore: []string{"rules"},
},
},
})
}

func TestAccAWSWafWebAcl_disappears(t *testing.T) {
var v waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_waf_web_acl.waf_acl"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -175,7 +208,7 @@ func TestAccAWSWafWebAcl_disappears(t *testing.T) {
{
Config: testAccAWSWafWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafWebAclExists("aws_waf_web_acl.waf_acl", &v),
testAccCheckAWSWafWebAclExists(resourceName, &v),
testAccCheckAWSWafWebAclDisappears(&v),
),
ExpectNonEmptyPlan: true,
Expand Down