From f094b3be8506ba98dd00811ce50dc99774e83f1b Mon Sep 17 00:00:00 2001
From: Matthew Hooker <mwhooker@gmail.com>
Date: Thu, 5 Apr 2018 16:32:03 -0700
Subject: [PATCH] update changelog

---
 CHANGELOG.md                                 | 7 +++++++
 builder/amazon/common/step_deregister_ami.go | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aabaee88..1d20a9f6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 ## (UNRELEASED)
 
 ### BUG FIXES:
+
 * post-processor/vagrant: Large VMDKs should no longer show a 0-byte size on OS X. [GH-6084]
 
+### IMPROVEMENTS:
+
+* builder/amazon: Setting `force_delete` will only delete AMIs owned by the
+  user. This should prevent failures where we try to delete an AMI with
+  a matching name, but owned by someone else. [GH-6111]
+
 ## 1.2.2 (March 26, 2018)
 
 ### BUG FIXES:
diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go
index eb8b957b5..8a82d7c7e 100644
--- a/builder/amazon/common/step_deregister_ami.go
+++ b/builder/amazon/common/step_deregister_ami.go
@@ -44,7 +44,7 @@ func (s *StepDeregisterAMI) Run(_ context.Context, state multistep.StateBag) mul
 			Owners: aws.StringSlice([]string{"self"}),
 			Filters: []*ec2.Filter{{
 				Name:   aws.String("name"),
-				Values: []*string{aws.String(s.AMIName)},
+				Values: aws.StringSlice([]string{s.AMIName}),
 			}}})
 
 		if err != nil {