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.

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

d/aws_waf_web_acl: Add WAF Web ACL lookup datasource #9320

Merged
merged 5 commits into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
60 changes: 60 additions & 0 deletions aws/data_source_aws_waf_web_acl.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package aws

import (
"fmt"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/waf"
"github.com/hashicorp/terraform/helper/schema"
)

func dataSourceAwsWafWebAcl() *schema.Resource {
return &schema.Resource{
Read: dataSourceAwsWafWebAclRead,

Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
},
},
}
}

func dataSourceAwsWafWebAclRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).wafconn
name := d.Get("name").(string)

acls := make([]*waf.WebACLSummary, 0)
// ListWebACLsInput does not have a name parameter for filtering
input := &waf.ListWebACLsInput{}
for {
output, err := conn.ListWebACLs(input)
if err != nil {
return fmt.Errorf("error reading web ACLs: %s", err)
}
for _, acl := range output.WebACLs {
if aws.StringValue(acl.Name) == name {
acls = append(acls, acl)
}
}

if output.NextMarker == nil {
break
}
input.NextMarker = output.NextMarker
}

if len(acls) == 0 {
return fmt.Errorf("web ACLs not found for name: %s", name)
}

if len(acls) > 1 {
return fmt.Errorf("multiple web ACLs found for name: %s", name)
}

acl := acls[0]

d.SetId(aws.StringValue(acl.WebACLId))

return nil
}
58 changes: 58 additions & 0 deletions aws/data_source_aws_waf_web_acl_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package aws

import (
"fmt"
"github.com/hashicorp/terraform/helper/acctest"
"regexp"
"testing"

"github.com/hashicorp/terraform/helper/resource"
)

func TestAccDataSourceAwsWafWebAcl_Basic(t *testing.T) {
name := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_waf_web_acl.web_acl"
datasourceName := "data.aws_waf_web_acl.web_acl"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccDataSourceAwsWafWebAclConfig_NonExistent,
ExpectError: regexp.MustCompile(`web ACLs not found`),
},
{
Config: testAccDataSourceAwsWafWebAclConfig_Name(name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "id", resourceName, "id"),
resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"),
),
},
},
})
}

func testAccDataSourceAwsWafWebAclConfig_Name(name string) string {
return fmt.Sprintf(`
resource "aws_waf_web_acl" "web_acl" {
name = %[1]q
metric_name = "tfWebACL"

default_action {
type = "ALLOW"
}
}

data "aws_waf_web_acl" "web_acl" {
name = "${aws_waf_web_acl.web_acl.name}"
}

`, name)
}

const testAccDataSourceAwsWafWebAclConfig_NonExistent = `
data "aws_waf_web_acl" "web_acl" {
name = "tf-acc-test-does-not-exist"
}
`
1 change: 1 addition & 0 deletions aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ func Provider() terraform.ResourceProvider {
"aws_vpc_endpoint_service": dataSourceAwsVpcEndpointService(),
"aws_vpc_peering_connection": dataSourceAwsVpcPeeringConnection(),
"aws_vpn_gateway": dataSourceAwsVpnGateway(),
"aws_waf_web_acl": dataSourceAwsWafWebAcl(),
"aws_workspaces_bundle": dataSourceAwsWorkspaceBundle(),

// Adding the Aliases for the ALB -> LB Rename
Expand Down
3 changes: 3 additions & 0 deletions website/aws.erb
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,9 @@
<li>
<a href="/docs/providers/aws/d/vpn_gateway.html">aws_vpn_gateway</a>
</li>
<li>
<a href="/docs/providers/aws/d/waf_web_acl.html">aws_waf_web_acl</a>
</li>
<li>
<a href="/docs/providers/aws/d/workspaces_bundle.html">aws_workspaces_bundle</a>
</li>
Expand Down
30 changes: 30 additions & 0 deletions website/docs/d/waf_web_acl.html.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
layout: "aws"
page_title: "AWS: aws_waf_web_acl"
sidebar_current: "docs-aws-datasource-waf-web-acl"
description: |-
Retrieves a WAF Web ACL id.
---

# Data Source: aws_waf_rule

`aws_waf_rule` Retrieves a WAF Web ACL Resource Id.

## Example Usage

```hcl
data "aws_waf_web_acl" "example" {
name = "tfWAFRule"
}
```

## Argument Reference

The following arguments are supported:

* `name` - (Required) The name of the WAF Web ACL.

## Attributes Reference
In addition to all arguments above, the following attributes are exported:

* `id` - The ID of the WAF WebACL.