From 99a6e3bbebc4cb21b075398dabb6a67c7134c6ac Mon Sep 17 00:00:00 2001
From: Brian Flad <bflad417@gmail.com>
Date: Mon, 7 Oct 2019 15:49:48 -0400
Subject: [PATCH] resource/aws_vpc: Implement provider ignore_tags support

Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/7926

Output from acceptance testing:

```
--- PASS: TestAccAWSVpc_ignoreTags (31.81s)
--- PASS: TestAccAWSVpc_tags (43.32s)
```
---
 aws/resource_aws_vpc.go      |  3 ++-
 aws/resource_aws_vpc_test.go | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/aws/resource_aws_vpc.go b/aws/resource_aws_vpc.go
index 42d5f85e959f..f1fa5dc1d699 100644
--- a/aws/resource_aws_vpc.go
+++ b/aws/resource_aws_vpc.go
@@ -266,6 +266,7 @@ func resourceAwsVpcCreate(d *schema.ResourceData, meta interface{}) error {
 
 func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).ec2conn
+	ignoreTags := meta.(*AWSClient).ignoreTags
 
 	// Refresh the VPC state
 	vpcRaw, _, err := VPCStateRefreshFunc(conn, d.Id())()
@@ -294,7 +295,7 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 	}.String()
 	d.Set("arn", arn)
 
-	if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpc.Tags).IgnoreAws().Map()); err != nil {
+	if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(vpc.Tags).IgnoreAws().Ignore(ignoreTags).Map()); err != nil {
 		return fmt.Errorf("error setting tags: %s", err)
 	}
 
diff --git a/aws/resource_aws_vpc_test.go b/aws/resource_aws_vpc_test.go
index 6bcf727f7e2c..6466e9169a4a 100644
--- a/aws/resource_aws_vpc_test.go
+++ b/aws/resource_aws_vpc_test.go
@@ -11,7 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"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/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
 )
 
 // add sweeper to delete known test vpcs
@@ -142,6 +144,32 @@ func TestAccAWSVpc_disappears(t *testing.T) {
 	})
 }
 
+func TestAccAWSVpc_ignoreTags(t *testing.T) {
+	var providers []*schema.Provider
+	var vpc ec2.Vpc
+	resourceName := "aws_vpc.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviderFactories(&providers),
+		CheckDestroy:      testAccCheckVpcDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccVpcConfigTags,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVpcExists(resourceName, &vpc),
+					testAccCheckEc2UpdateTags(&vpc, nil, map[string]string{"ignorekey1": "ignorevalue1"}),
+				),
+				ExpectNonEmptyPlan: true,
+			},
+			{
+				Config:   testAccProviderConfigIgnoreTags1("ignorekey1") + testAccVpcConfigTags,
+				PlanOnly: true,
+			},
+		},
+	})
+}
+
 func TestAccAWSVpc_AssignGeneratedIpv6CidrBlock(t *testing.T) {
 	var vpc ec2.Vpc
 	resourceName := "aws_vpc.test"
@@ -332,6 +360,14 @@ func testAccCheckVpcDestroy(s *terraform.State) error {
 	return nil
 }
 
+func testAccCheckEc2UpdateTags(vpc *ec2.Vpc, oldTags, newTags map[string]string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		conn := testAccProvider.Meta().(*AWSClient).ec2conn
+
+		return keyvaluetags.Ec2UpdateTags(conn, aws.StringValue(vpc.VpcId), oldTags, newTags)
+	}
+}
+
 func testAccCheckVpcCidr(vpc *ec2.Vpc, expected string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if aws.StringValue(vpc.CidrBlock) != expected {