From bfe7fe3614383037e567286508fcb92dd91b7459 Mon Sep 17 00:00:00 2001
From: DrFaust92 <ilia.lazebnik@gmail.com>
Date: Fri, 14 Feb 2020 21:53:40 +0200
Subject: [PATCH] missing keyvaluetags for read

---
 aws/resource_aws_ami.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go
index 556ea9930a38..878453433082 100644
--- a/aws/resource_aws_ami.go
+++ b/aws/resource_aws_ami.go
@@ -417,7 +417,9 @@ func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("ebs_block_device", ebsBlockDevs)
 	d.Set("ephemeral_block_device", ephemeralBlockDevs)
 
-	d.Set("tags", tagsToMap(image.Tags))
+	if err := d.Set("tags", keyvaluetags.Ec2KeyValueTags(image.Tags).IgnoreAws().Map()); err != nil {
+		return fmt.Errorf("error setting tags: %s", err)
+	}
 
 	return nil
 }