Skip to content

Commit

Permalink
resource/aws_vpc_endpoint: Refactor to use keyvaluetags package (#11730)
Browse files Browse the repository at this point in the history 
Output from acceptance testing:

```
--- PASS: TestAccAWSVpcEndpoint_removed (20.86s)
--- PASS: TestAccAWSVpcEndpoint_gatewayBasic (26.64s)
--- PASS: TestAccAWSVpcEndpointRouteTableAssociation_basic (28.15s)
--- PASS: TestAccAWSVpcEndpoint_interfaceBasic (41.70s)
--- PASS: TestAccAWSVpcEndpoint_gatewayWithRouteTableAndPolicyAndTags (44.93s)
--- PASS: TestAccAWSVpcEndpoint_gatewayPolicy (50.58s)
--- PASS: TestAccAWSVpcEndpointSubnetAssociation_basic (247.20s)
--- PASS: TestAccAWSVpcEndpointConnectionNotification_basic (255.35s)
--- PASS: TestAccAWSVpcEndpointService_basic (264.18s)
--- PASS: TestAccAWSVpcEndpointService_AllowedPrincipalsAndTags (268.65s)
--- PASS: TestAccAWSVpcEndpointServiceAllowedPrincipal_basic (274.74s)
--- PASS: TestAccAWSVpcEndpointService_removed (276.38s)
--- PASS: TestAccAWSVpcEndpoint_interfaceNonAWSService (294.34s)
--- PASS: TestAccAWSVpcEndpoint_interfaceWithSubnetAndSecurityGroup (364.63s)
--- PASS: TestAccAWSVpcEndpointSubnetAssociation_multiple (655.93s)
```
  • Loading branch information
@DrFaust92
DrFaust92 committed Feb 5, 2020
1 parent 3c84f53 commit eced99f
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 28 deletions.
22 changes: 14 additions & 8 deletions aws/resource_aws_vpc_endpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/structure"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)

func resourceAwsVpcEndpoint() *schema.Resource {
Expand Down Expand Up @@ -186,8 +187,10 @@ func resourceAwsVpcEndpointCreate(d *schema.ResourceData, meta interface{}) erro
return err
}

if err := setTags(conn, d); err != nil {
return err
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 resourceAwsVpcEndpointRead(d, meta)
Expand Down Expand Up @@ -271,17 +274,17 @@ func resourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) error
if err != nil {
return fmt.Errorf("error setting subnet_ids: %s", err)
}
err = d.Set("tags", tagsToMap(vpce.Tags))
if err != nil {
return fmt.Errorf("error setting tags: %s", err)
}
// VPC endpoints don't have types in GovCloud, so set type to default if empty
if vpceType := aws.StringValue(vpce.VpcEndpointType); vpceType == "" {
d.Set("vpc_endpoint_type", ec2.VpcEndpointTypeGateway)
} else {
d.Set("vpc_endpoint_type", vpceType)
}

if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpce.Tags).IgnoreAws().Map()); err != nil {
return fmt.Errorf("error setting tags: %s", err)
}

return nil
}

Expand Down Expand Up @@ -328,8 +331,11 @@ func resourceAwsVpcEndpointUpdate(d *schema.ResourceData, meta interface{}) erro
return err
}

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 resourceAwsVpcEndpointRead(d, meta)
Expand Down
57 changes: 37 additions & 20 deletions aws/resource_aws_vpc_endpoint_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func testSweepEc2VpcEndpoints(region string) error {
func TestAccAWSVpcEndpoint_gatewayBasic(t *testing.T) {
var endpoint ec2.VpcEndpoint
resourceName := "aws_vpc_endpoint.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))
rName := acctest.RandomWithPrefix("tf-testacc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -107,6 +107,11 @@ func TestAccAWSVpcEndpoint_gatewayBasic(t *testing.T) {
testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand All @@ -116,7 +121,7 @@ func TestAccAWSVpcEndpoint_gatewayWithRouteTableAndPolicyAndTags(t *testing.T) {
var routeTable ec2.RouteTable
resourceName := "aws_vpc_endpoint.test"
resourceNameRt := "aws_route_table.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))
rName := acctest.RandomWithPrefix("tf-testacc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down Expand Up @@ -205,7 +210,7 @@ func TestAccAWSVpcEndpoint_gatewayPolicy(t *testing.T) {
}
`
resourceName := "aws_vpc_endpoint.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))
rName := acctest.RandomWithPrefix("tf-testacc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down Expand Up @@ -236,7 +241,7 @@ func TestAccAWSVpcEndpoint_gatewayPolicy(t *testing.T) {
func TestAccAWSVpcEndpoint_interfaceBasic(t *testing.T) {
var endpoint ec2.VpcEndpoint
resourceName := "aws_vpc_endpoint.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))
rName := acctest.RandomWithPrefix("tf-testacc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -260,14 +265,19 @@ func TestAccAWSVpcEndpoint_interfaceBasic(t *testing.T) {
testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSVpcEndpoint_interfaceWithSubnetAndSecurityGroup(t *testing.T) {
var endpoint ec2.VpcEndpoint
resourceName := "aws_vpc_endpoint.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))
rName := acctest.RandomWithPrefix("tf-testacc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down Expand Up @@ -321,7 +331,7 @@ func TestAccAWSVpcEndpoint_interfaceWithSubnetAndSecurityGroup(t *testing.T) {
func TestAccAWSVpcEndpoint_interfaceNonAWSService(t *testing.T) {
var endpoint ec2.VpcEndpoint
resourceName := "aws_vpc_endpoint.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))
rName := acctest.RandomWithPrefix("tf-acc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -347,26 +357,20 @@ func TestAccAWSVpcEndpoint_interfaceNonAWSService(t *testing.T) {
testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"auto_accept"},
},
},
})
}

func TestAccAWSVpcEndpoint_removed(t *testing.T) {
var endpoint ec2.VpcEndpoint
resourceName := "aws_vpc_endpoint.test"
rName := fmt.Sprintf("tf-testacc-vpce-%s", acctest.RandStringFromCharSet(16, acctest.CharSetAlphaNum))

// reach out and DELETE the VPC Endpoint outside of Terraform
testDestroy := func(*terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn
input := &ec2.DeleteVpcEndpointsInput{
VpcEndpointIds: []*string{endpoint.VpcEndpointId},
}

_, err := conn.DeleteVpcEndpoints(input)

return err
}
rName := acctest.RandomWithPrefix("tf-testacc-vpce")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -377,14 +381,27 @@ func TestAccAWSVpcEndpoint_removed(t *testing.T) {
Config: testAccVpcEndpointConfig_gatewayWithoutRouteTableOrPolicyOrTags(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckVpcEndpointExists(resourceName, &endpoint),
testDestroy,
testAccCheckVpcEndpointDisappears(&endpoint),
),
ExpectNonEmptyPlan: true,
},
},
})
}

func testAccCheckVpcEndpointDisappears(endpoint *ec2.VpcEndpoint) resource.TestCheckFunc {
return func(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ec2conn
input := &ec2.DeleteVpcEndpointsInput{
VpcEndpointIds: []*string{endpoint.VpcEndpointId},
}

_, err := conn.DeleteVpcEndpoints(input)

return err
}
}

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

Expand Down

0 comments on commit eced99f

Please sign in to comment.