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

rd/vpc_dhcp_options - refactor to use keyvaluetags #11904

Merged
merged 2 commits into from
Feb 5, 2020
Merged

rd/vpc_dhcp_options - refactor to use keyvaluetags #11904

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
3e992e6
refactor to use keyvaluetags
DrFaust92 Feb 5, 2020
6b37af9
refactor to use keyvalue tags - data source
DrFaust92 Feb 5, 2020
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: 2 additions & 1 deletion aws/data_source_aws_vpc_dhcp_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)

func dataSourceAwsVpcDhcpOptions() *schema.Resource {
Expand Down Expand Up @@ -122,7 +123,7 @@ func dataSourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) e
}
}

if err := d.Set("tags", d.Set("tags", tagsToMap(output.DhcpOptions[0].Tags))); err != nil {
if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(output.DhcpOptions[0].Tags).IgnoreAws().Map()); err != nil {
return fmt.Errorf("error setting tags: %s", err)
}
d.Set("owner_id", output.DhcpOptions[0].OwnerId)
Expand Down
22 changes: 17 additions & 5 deletions aws/resource_aws_vpc_dhcp_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)

func resourceAwsVpcDhcpOptions() *schema.Resource {
Expand Down Expand Up @@ -136,7 +137,13 @@ func resourceAwsVpcDhcpOptionsCreate(d *schema.ResourceData, meta interface{}) e
d.Id(), err)
}

return resourceAwsVpcDhcpOptionsUpdate(d, meta)
if v, ok := d.GetOk("tags"); ok {
if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), nil, v.(map[string]interface{})); err != nil {
return fmt.Errorf("error updating tags: %s", err)
}
}

return resourceAwsVpcDhcpOptionsRead(d, meta)
}

func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) error {
Expand All @@ -162,7 +169,9 @@ func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) err
}

opts := resp.DhcpOptions[0]
d.Set("tags", tagsToMap(opts.Tags))
if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(opts.Tags).IgnoreAws().Map()); err != nil {
return fmt.Errorf("error setting tags: %s", err)
}
d.Set("owner_id", opts.OwnerId)

for _, cfg := range opts.DhcpConfigurations {
Expand All @@ -186,8 +195,11 @@ func resourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) err
func resourceAwsVpcDhcpOptionsUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn

if err := setTags(conn, d); err != nil {
return err
if d.HasChange("tags") {
o, n := d.GetChange("tags")
if err := keyvaluetags.Ec2UpdateTags(conn, d.Id(), o, n); err != nil {
return fmt.Errorf("error updating tags: %s", err)
}
}

return resourceAwsVpcDhcpOptionsRead(d, meta)
Expand Down Expand Up @@ -262,7 +274,7 @@ func findVPCsByDHCPOptionsID(conn *ec2.EC2, id string) ([]*ec2.Vpc, error) {

resp, err := conn.DescribeVpcs(req)
if err != nil {
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVpcID.NotFound" {
if isAWSErr(err, "InvalidVpcID.NotFound", "") {
return nil, nil
}
return nil, err
Expand Down
108 changes: 90 additions & 18 deletions aws/resource_aws_vpc_dhcp_options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)
Expand Down Expand Up @@ -90,23 +90,24 @@ func testSweepVpcDhcpOptions(region string) error {
func TestAccAWSDHCPOptions_basic(t *testing.T) {
var d ec2.DhcpOptions
resourceName := "aws_vpc_dhcp_options.test"
rName := acctest.RandString(5)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckDHCPOptionsDestroy,
Steps: []resource.TestStep{
{
Config: testAccDHCPOptionsConfig,
Config: testAccDHCPOptionsConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckDHCPOptionsExists(resourceName, &d),
resource.TestCheckResourceAttr(resourceName, "domain_name", "service.consul"),
resource.TestCheckResourceAttr(resourceName, "domain_name", fmt.Sprintf("service.%s", rName)),
resource.TestCheckResourceAttr(resourceName, "domain_name_servers.0", "127.0.0.1"),
resource.TestCheckResourceAttr(resourceName, "domain_name_servers.1", "10.0.0.2"),
resource.TestCheckResourceAttr(resourceName, "ntp_servers.0", "127.0.0.1"),
resource.TestCheckResourceAttr(resourceName, "netbios_name_servers.0", "127.0.0.1"),
resource.TestCheckResourceAttr(resourceName, "netbios_node_type", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.Name", "test-name"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
),
},
Expand All @@ -122,14 +123,15 @@ func TestAccAWSDHCPOptions_basic(t *testing.T) {
func TestAccAWSDHCPOptions_deleteOptions(t *testing.T) {
var d ec2.DhcpOptions
resourceName := "aws_vpc_dhcp_options.test"
rName := acctest.RandString(5)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckDHCPOptionsDestroy,
Steps: []resource.TestStep{
{
Config: testAccDHCPOptionsConfig,
Config: testAccDHCPOptionsConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckDHCPOptionsExists(resourceName, &d),
testAccCheckDHCPOptionsDelete(resourceName),
Expand All @@ -140,6 +142,50 @@ func TestAccAWSDHCPOptions_deleteOptions(t *testing.T) {
})
}

func TestAccAWSDHCPOptions_tags(t *testing.T) {
var d ec2.DhcpOptions
resourceName := "aws_vpc_dhcp_options.test"
rName := acctest.RandString(5)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckDHCPOptionsDestroy,
Steps: []resource.TestStep{
{
Config: testAccDHCPOptionsConfigTags1(rName, "key1", "value1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckDHCPOptionsExists(resourceName, &d),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccDHCPOptionsConfigTags2(rName, "key1", "value1updated", "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckDHCPOptionsExists(resourceName, &d),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"),
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
),
},
{
Config: testAccDHCPOptionsConfigTags1(rName, "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckDHCPOptionsExists(resourceName, &d),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
),
},
},
})
}

func testAccCheckDHCPOptionsDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn

Expand All @@ -154,7 +200,7 @@ func testAccCheckDHCPOptionsDestroy(s *terraform.State) error {
aws.String(rs.Primary.ID),
},
})
if ae, ok := err.(awserr.Error); ok && ae.Code() == "InvalidDhcpOptionID.NotFound" {
if isAWSErr(err, "InvalidDhcpOptionID.NotFound", "") {
continue
}
if err == nil {
Expand All @@ -165,12 +211,7 @@ func testAccCheckDHCPOptionsDestroy(s *terraform.State) error {
return nil
}

// Verify the error is what we want
ec2err, ok := err.(awserr.Error)
if !ok {
return err
}
if ec2err.Code() != "InvalidDhcpOptionsID.NotFound" {
if !isAWSErr(err, "InvalidDhcpOptionID.NotFound", "") {
return err
}
}
Expand Down Expand Up @@ -228,16 +269,47 @@ func testAccCheckDHCPOptionsDelete(n string) resource.TestCheckFunc {
}
}

const testAccDHCPOptionsConfig = `
func testAccDHCPOptionsConfig(rName string) string {
return fmt.Sprintf(`
resource "aws_vpc_dhcp_options" "test" {
domain_name = "service.consul"
domain_name = "service.%s"
domain_name_servers = ["127.0.0.1", "10.0.0.2"]
ntp_servers = ["127.0.0.1"]
netbios_name_servers = ["127.0.0.1"]
netbios_node_type = 2
}
`, rName)
}

tags = {
Name = "test-name"
}
func testAccDHCPOptionsConfigTags1(rName, tagKey1, tagValue1 string) string {
return fmt.Sprintf(`
resource "aws_vpc_dhcp_options" "test" {
domain_name = "service.%[1]s"
domain_name_servers = ["127.0.0.1", "10.0.0.2"]
ntp_servers = ["127.0.0.1"]
netbios_name_servers = ["127.0.0.1"]
netbios_node_type = 2

tags = {
%[2]q = %[3]q
}
}
`, rName, tagKey1, tagValue1)
}

func testAccDHCPOptionsConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return fmt.Sprintf(`
resource "aws_vpc_dhcp_options" "test" {
domain_name = "service.%[1]s"
domain_name_servers = ["127.0.0.1", "10.0.0.2"]
ntp_servers = ["127.0.0.1"]
netbios_name_servers = ["127.0.0.1"]
netbios_node_type = 2

tags = {
%[2]q = %[3]q
%[4]q = %[5]q
}
}
`, rName, tagKey1, tagValue1, tagKey2, tagValue2)
}
`