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

Feature/add support resource import for aws wafregional geo match set resource #9620

Merged
merged 2 commits into from
Aug 6, 2019
+84 −42
Merged

Feature/add support resource import for aws wafregional geo match set resource #9620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c91bc0f
refactor error handling
teraken0509 Aug 4, 2019
c0829ea
Add support import for aws_wafregional_geo_match_set resource
teraken0509 Aug 4, 2019
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
31 changes: 20 additions & 11 deletions aws/resource_aws_wafregional_geo_match_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ func resourceAwsWafRegionalGeoMatchSet() *schema.Resource {
Read: resourceAwsWafRegionalGeoMatchSetRead,
Update: resourceAwsWafRegionalGeoMatchSetUpdate,
Delete: resourceAwsWafRegionalGeoMatchSetDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"name": {
Expand Down Expand Up @@ -76,16 +79,14 @@ func resourceAwsWafRegionalGeoMatchSetRead(d *schema.ResourceData, meta interfac
}

resp, err := conn.GetGeoMatchSet(params)
if err != nil {
// TODO: Replace with constant once it's available
// See https://github.com/aws/aws-sdk-go/issues/1856
if isAWSErr(err, "WAFNonexistentItemException", "") {
log.Printf("[WARN] WAF WAF Regional Geo Match Set (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}

return err
if isAWSErr(err, wafregional.ErrCodeWAFNonexistentItemException, "") {
log.Printf("[WARN] WAF WAF Regional Geo Match Set (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}
if err != nil {
return fmt.Errorf("Error getting WAF Regional Geo Match Set (%s): %s", d.Id(), err)
}

d.Set("name", resp.GeoMatchSet.Name)
Expand All @@ -103,8 +104,13 @@ func resourceAwsWafRegionalGeoMatchSetUpdate(d *schema.ResourceData, meta interf
oldConstraints, newConstraints := o.(*schema.Set).List(), n.(*schema.Set).List()

err := updateGeoMatchSetResourceWR(d.Id(), oldConstraints, newConstraints, conn, region)
if isAWSErr(err, wafregional.ErrCodeWAFNonexistentItemException, "") {
log.Printf("[WARN] WAF WAF Regional Geo Match Set (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}
if err != nil {
return fmt.Errorf("Failed updating WAF Regional Geo Match Set: %s", err)
return fmt.Errorf("Failed updating WAF Regional Geo Match Set(%s): %s", d.Id(), err)
}
}

Expand Down Expand Up @@ -133,8 +139,11 @@ func resourceAwsWafRegionalGeoMatchSetDelete(d *schema.ResourceData, meta interf

return conn.DeleteGeoMatchSet(req)
})
if isAWSErr(err, wafregional.ErrCodeWAFNonexistentItemException, "") {
return nil
}
if err != nil {
return fmt.Errorf("Failed deleting WAF Regional Geo Match Set: %s", err)
return fmt.Errorf("Failed deleting WAF Regional Geo Match Set(%s): %s", d.Id(), err)
}

return nil
Expand Down
87 changes: 56 additions & 31 deletions aws/resource_aws_wafregional_geo_match_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

func TestAccAWSWafRegionalGeoMatchSet_basic(t *testing.T) {
var v waf.GeoMatchSet
resourceName := "aws_wafregional_geo_match_set.test"
geoMatchSet := fmt.Sprintf("tfacc-%s", acctest.RandString(5))

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -23,27 +24,33 @@ func TestAccAWSWafRegionalGeoMatchSet_basic(t *testing.T) {
{
Config: testAccAWSWafRegionalGeoMatchSetConfig(geoMatchSet),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &v),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "name", geoMatchSet),
resourceName, "name", geoMatchSet),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.#", "2"),
resourceName, "geo_match_constraint.#", "2"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.384465307.type", "Country"),
resourceName, "geo_match_constraint.384465307.type", "Country"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.384465307.value", "US"),
resourceName, "geo_match_constraint.384465307.value", "US"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.1991628426.type", "Country"),
resourceName, "geo_match_constraint.1991628426.type", "Country"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.1991628426.value", "CA"),
resourceName, "geo_match_constraint.1991628426.value", "CA"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSWafRegionalGeoMatchSet_changeNameForceNew(t *testing.T) {
var before, after waf.GeoMatchSet
resourceName := "aws_wafregional_geo_match_set.test"
geoMatchSet := fmt.Sprintf("tfacc-%s", acctest.RandString(5))
geoMatchSetNewName := fmt.Sprintf("geoMatchSetNewName-%s", acctest.RandString(5))

Expand All @@ -55,30 +62,36 @@ func TestAccAWSWafRegionalGeoMatchSet_changeNameForceNew(t *testing.T) {
{
Config: testAccAWSWafRegionalGeoMatchSetConfig(geoMatchSet),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &before),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &before),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "name", geoMatchSet),
resourceName, "name", geoMatchSet),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.#", "2"),
resourceName, "geo_match_constraint.#", "2"),
),
},
{
Config: testAccAWSWafRegionalGeoMatchSetConfigChangeName(geoMatchSetNewName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &after),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &after),
testAccCheckAWSWafGeoMatchSetIdDiffers(&before, &after),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "name", geoMatchSetNewName),
resourceName, "name", geoMatchSetNewName),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.#", "2"),
resourceName, "geo_match_constraint.#", "2"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSWafRegionalGeoMatchSet_disappears(t *testing.T) {
var v waf.GeoMatchSet
resourceName := "aws_wafregional_geo_match_set.test"
geoMatchSet := fmt.Sprintf("tfacc-%s", acctest.RandString(5))

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -89,7 +102,7 @@ func TestAccAWSWafRegionalGeoMatchSet_disappears(t *testing.T) {
{
Config: testAccAWSWafRegionalGeoMatchSetConfig(geoMatchSet),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &v),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &v),
testAccCheckAWSWafRegionalGeoMatchSetDisappears(&v),
),
ExpectNonEmptyPlan: true,
Expand All @@ -100,6 +113,7 @@ func TestAccAWSWafRegionalGeoMatchSet_disappears(t *testing.T) {

func TestAccAWSWafRegionalGeoMatchSet_changeConstraints(t *testing.T) {
var before, after waf.GeoMatchSet
resourceName := "aws_wafregional_geo_match_set.test"
setName := fmt.Sprintf("tfacc-%s", acctest.RandString(5))

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -110,45 +124,51 @@ func TestAccAWSWafRegionalGeoMatchSet_changeConstraints(t *testing.T) {
{
Config: testAccAWSWafRegionalGeoMatchSetConfig(setName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &before),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &before),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "name", setName),
resourceName, "name", setName),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.#", "2"),
resourceName, "geo_match_constraint.#", "2"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.384465307.type", "Country"),
resourceName, "geo_match_constraint.384465307.type", "Country"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.384465307.value", "US"),
resourceName, "geo_match_constraint.384465307.value", "US"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.1991628426.type", "Country"),
resourceName, "geo_match_constraint.1991628426.type", "Country"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.1991628426.value", "CA"),
resourceName, "geo_match_constraint.1991628426.value", "CA"),
),
},
{
Config: testAccAWSWafRegionalGeoMatchSetConfig_changeConstraints(setName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &after),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &after),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "name", setName),
resourceName, "name", setName),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.#", "2"),
resourceName, "geo_match_constraint.#", "2"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.1174390936.type", "Country"),
resourceName, "geo_match_constraint.1174390936.type", "Country"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.1174390936.value", "RU"),
resourceName, "geo_match_constraint.1174390936.value", "RU"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.4046309957.type", "Country"),
resourceName, "geo_match_constraint.4046309957.type", "Country"),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.4046309957.value", "CN"),
resourceName, "geo_match_constraint.4046309957.value", "CN"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSWafRegionalGeoMatchSet_noConstraints(t *testing.T) {
var ipset waf.GeoMatchSet
resourceName := "aws_wafregional_geo_match_set.test"
setName := fmt.Sprintf("tfacc-%s", acctest.RandString(5))

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -159,13 +179,18 @@ func TestAccAWSWafRegionalGeoMatchSet_noConstraints(t *testing.T) {
{
Config: testAccAWSWafRegionalGeoMatchSetConfig_noConstraints(setName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAWSWafRegionalGeoMatchSetExists("aws_wafregional_geo_match_set.test", &ipset),
testAccCheckAWSWafRegionalGeoMatchSetExists(resourceName, &ipset),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "name", setName),
resourceName, "name", setName),
resource.TestCheckResourceAttr(
"aws_wafregional_geo_match_set.test", "geo_match_constraint.#", "0"),
resourceName, "geo_match_constraint.#", "0"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/wafregional_geo_match_set.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,11 @@ The following arguments are supported:
In addition to all arguments above, the following attributes are exported:

* `id` - The ID of the WAF Regional Geo Match Set.

## Import

WAF Regional Geo Match Set can be imported using the id, e.g.

```
$ terraform import aws_wafregional_geo_match_set.geo_match_set a1b2c3d4-d5f6-7777-8888-9999aaaabbbbcccc
```