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

Jump to bottom

Add support import for aws_wafregional_web_acl resource #9248

Merged
merged 1 commit into from
Jul 5, 2019
Merged

Add support import for aws_wafregional_web_acl resource #9248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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_wafregional_web_acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ func resourceAwsWafRegionalWebAcl() *schema.Resource {
Read: resourceAwsWafRegionalWebAclRead,
Update: resourceAwsWafRegionalWebAclUpdate,
Delete: resourceAwsWafRegionalWebAclDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"arn": {
Expand Down
165 changes: 104 additions & 61 deletions aws/resource_aws_wafregional_web_acl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ func testSweepWafRegionalWebAcls(region string) error {
func TestAccAWSWafRegionalWebAcl_basic(t *testing.T) {
var v waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_wafregional_web_acl.waf_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -128,29 +129,35 @@ func TestAccAWSWafRegionalWebAcl_basic(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccMatchResourceAttrRegionalARN("aws_wafregional_web_acl.waf_acl", "arn", "waf-regional", regexp.MustCompile(`webacl/.+`)),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
testAccMatchResourceAttrRegionalARN(resourceName, "arn", "waf-regional", regexp.MustCompile(`webacl/.+`)),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "logging_configuration.#", "0"),
resourceName, "logging_configuration.#", "0"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

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

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -160,17 +167,17 @@ func TestAccAWSWafRegionalWebAcl_createRateBased(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfigRateBased(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
},
Expand All @@ -180,6 +187,7 @@ func TestAccAWSWafRegionalWebAcl_createRateBased(t *testing.T) {
func TestAccAWSWafRegionalWebAcl_createGroup(t *testing.T) {
var v waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_wafregional_web_acl.waf_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -189,19 +197,24 @@ func TestAccAWSWafRegionalWebAcl_createGroup(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfigGroup(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand All @@ -210,6 +223,7 @@ func TestAccAWSWafRegionalWebAcl_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_wafregional_web_acl.waf_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -219,35 +233,40 @@ func TestAccAWSWafRegionalWebAcl_changeNameForceNew(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &before),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &before),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
Config: testAccAWSWafRegionalWebAclConfig_changeName(wafAclNewName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &after),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &after),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclNewName),
resourceName, "name", wafAclNewName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclNewName),
resourceName, "metric_name", wafAclNewName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand All @@ -256,6 +275,7 @@ func TestAccAWSWafRegionalWebAcl_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_wafregional_web_acl.waf_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -265,42 +285,48 @@ func TestAccAWSWafRegionalWebAcl_changeDefaultAction(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &before),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &before),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclName),
resourceName, "metric_name", wafAclName),
),
},
{
Config: testAccAWSWafRegionalWebAclConfig_changeDefaultAction(wafAclNewName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &after),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &after),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "BLOCK"),
resourceName, "default_action.0.type", "BLOCK"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclNewName),
resourceName, "name", wafAclNewName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "metric_name", wafAclNewName),
resourceName, "metric_name", wafAclNewName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

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

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -310,7 +336,7 @@ func TestAccAWSWafRegionalWebAcl_disappears(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
testAccCheckAWSWafRegionalWebAclDisappears(&v),
),
ExpectNonEmptyPlan: true,
Expand All @@ -322,6 +348,7 @@ func TestAccAWSWafRegionalWebAcl_disappears(t *testing.T) {
func TestAccAWSWafRegionalWebAcl_noRules(t *testing.T) {
var v waf.WebACL
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_wafregional_web_acl.waf_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -331,17 +358,22 @@ func TestAccAWSWafRegionalWebAcl_noRules(t *testing.T) {
{
Config: testAccAWSWafRegionalWebAclConfig_noRules(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "0"),
resourceName, "rule.#", "0"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand All @@ -351,6 +383,7 @@ func TestAccAWSWafRegionalWebAcl_changeRules(t *testing.T) {
var r waf.Rule
var idx int
wafAclName := fmt.Sprintf("wafacl%s", acctest.RandString(5))
resourceName := "aws_wafregional_web_acl.waf_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -361,33 +394,38 @@ func TestAccAWSWafRegionalWebAcl_changeRules(t *testing.T) {
Config: testAccAWSWafRegionalWebAclConfig(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalRuleExists("aws_wafregional_rule.wafrule", &r),
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "1"),
resourceName, "rule.#", "1"),
computeWafRegionalWebAclRuleIndex(&r.RuleId, 1, "REGULAR", "BLOCK", &idx),
testCheckResourceAttrWithIndexesAddr("aws_wafregional_web_acl.waf_acl", "rule.%d.priority", &idx, "1"),
testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.priority", &idx, "1"),
),
},
{
Config: testAccAWSWafRegionalWebAclConfig_changeRules(wafAclName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalWebAclExists("aws_wafregional_web_acl.waf_acl", &v),
testAccCheckAWSWafRegionalWebAclExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.#", "1"),
resourceName, "default_action.#", "1"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "default_action.0.type", "ALLOW"),
resourceName, "default_action.0.type", "ALLOW"),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "name", wafAclName),
resourceName, "name", wafAclName),
resource.TestCheckResourceAttr(
"aws_wafregional_web_acl.waf_acl", "rule.#", "2"),
resourceName, "rule.#", "2"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand Down Expand Up @@ -428,6 +466,11 @@ func TestAccAWSWafRegionalWebAcl_LoggingConfiguration(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "logging_configuration.#", "0"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/wafregional_web_acl.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,11 @@ In addition to all arguments above, the following attributes are exported:

* `arn` - Amazon Resource Name (ARN) of the WAF Regional WebACL.
* `id` - The ID of the WAF Regional WebACL.

## Import

WAF Regional Rule Group can be imported using the id, e.g.
Copy link
Contributor

Choose a reason for hiding this comment

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

Small copy-paste typo 😎

Suggested change
WAF Regional Rule Group can be imported using the id, e.g.
WAF Regional Web ACL can be imported using the id, e.g.


```
$ terraform import aws_wafregional_web_acl.wafacl a1b2c3d4-d5f6-7777-8888-9999aaaabbbbcccc
```