service/ec2: Refactor aws_network_interface(s) data sources and resou…

…rce to use keyvaluetags package (#11912) Reference: #10688 Output from acceptance testing: ``` --- PASS: TestAccAWSENI_computedIPs (40.42s) --- PASS: TestAccAWSENI_disappears (41.08s) --- PASS: TestAccAWSENI_sourceDestCheck (41.52s) --- PASS: TestAccAWSENI_basic (44.39s) --- PASS: TestAccAWSENI_updatedDescription (71.87s) --- PASS: TestAccAWSENI_PrivateIpsCount (110.97s) --- PASS: TestAccAWSENI_ignoreExternalAttachment (113.13s) --- PASS: TestAccAWSENI_attached (241.64s) --- PASS: TestAccDataSourceAwsNetworkInterface_filters (44.99s) --- PASS: TestAccDataSourceAwsNetworkInterface_basic (45.00s) --- PASS: TestAccDataSourceAwsNetworkInterfaces_Filter (41.65s) --- PASS: TestAccDataSourceAwsNetworkInterfaces_Tags (41.69s) ```
hashicorp · Feb 26, 2020 · 73b1032 · 73b1032
1 parent e301765
commit 73b1032
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/aws/data_source_aws_network_interface.go b/aws/data_source_aws_network_interface.go
@@ -7,6 +7,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 dataSourceAwsNetworkInterface() *schema.Resource {
@@ -180,6 +181,10 @@ func dataSourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{})
 	d.Set("requester_id", eni.RequesterId)
 	d.Set("subnet_id", eni.SubnetId)
 	d.Set("vpc_id", eni.VpcId)
-	d.Set("tags", tagsToMap(eni.TagSet))
+
+	if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().Map()); err != nil {
+		return fmt.Errorf("error setting tags: %s", err)
+	}
+
 	return nil
 }
diff --git a/aws/data_source_aws_network_interfaces.go b/aws/data_source_aws_network_interfaces.go
@@ -9,6 +9,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 dataSourceAwsNetworkInterfaces() *schema.Resource {
@@ -40,7 +41,7 @@ func dataSourceAwsNetworkInterfacesRead(d *schema.ResourceData, meta interface{}
 
 	if tagsOk {
 		req.Filters = buildEC2TagFilterList(
-			tagsFromMap(tags.(map[string]interface{})),
+			keyvaluetags.New(tags.(map[string]interface{})).Ec2Tags(),
 		)
 	}
 

diff --git a/aws/resource_aws_network_interface.go b/aws/resource_aws_network_interface.go
@@ -14,6 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
 	"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 resourceAwsNetworkInterface() *schema.Resource {
@@ -199,7 +200,7 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e
 	d.Set("source_dest_check", eni.SourceDestCheck)
 	d.Set("subnet_id", eni.SubnetId)
 
-	if err := d.Set("tags", tagsToMap(eni.TagSet)); err != nil {
+	if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(eni.TagSet).IgnoreAws().Map()); err != nil {
 		return fmt.Errorf("error setting tags: %s", err)
 	}
 
@@ -416,10 +417,12 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{})
 		d.SetPartial("description")
 	}
 
-	if err := setTags(conn, d); err != nil {
-		return err
-	} else {
-		d.SetPartial("tags")
+	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 EC2 Network Interface (%s) tags: %s", d.Id(), err)
+		}
 	}
 
 	d.Partial(false)