From f68d5e82f358a0ca877afeca78907d5f2b2c1092 Mon Sep 17 00:00:00 2001 From: Masayuki Morita Date: Mon, 7 Nov 2016 19:37:32 +0900 Subject: [PATCH] provider/aws: Fix bug #9863 destroying aws_iam_user with force_destroy does not work (#9900) --- builtin/providers/aws/resource_aws_iam_user.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/providers/aws/resource_aws_iam_user.go b/builtin/providers/aws/resource_aws_iam_user.go index 761d9d85a6..55f0b2a5de 100644 --- a/builtin/providers/aws/resource_aws_iam_user.go +++ b/builtin/providers/aws/resource_aws_iam_user.go @@ -197,10 +197,9 @@ func resourceAwsIamUserDelete(d *schema.ResourceData, meta interface{}) error { UserName: aws.String(d.Id()), }) if err != nil { - if iamerr, ok := err.(awserr.Error); ok && iamerr.Code() == "NoSuchEntity" { - return nil + if iamerr, ok := err.(awserr.Error); !ok || iamerr.Code() != "NoSuchEntity" { + return fmt.Errorf("Error deleting Account Login Profile: %s", err) } - return fmt.Errorf("Error deleting Account Login Profile: %s", err) } }