From 27b8dd08e79c37cf0fb5c0604efad3796d46d8d2 Mon Sep 17 00:00:00 2001
From: nextrevision <notarobot@nextrevision.net>
Date: Tue, 22 Dec 2015 11:04:07 -0500
Subject: [PATCH] Check for ecr repository and policy removal

---
 .../aws/resource_aws_ecr_repository_policy.go    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_ecr_repository_policy.go b/builtin/providers/aws/resource_aws_ecr_repository_policy.go
index d2d7d8b34..8932ea557 100644
--- a/builtin/providers/aws/resource_aws_ecr_repository_policy.go
+++ b/builtin/providers/aws/resource_aws_ecr_repository_policy.go
@@ -67,9 +67,14 @@ func resourceAwsEcrRepositoryPolicyRead(d *schema.ResourceData, meta interface{}
 		RepositoryName: aws.String(d.Id()),
 	})
 	if err != nil {
-		if ecrerr, ok := err.(awserr.Error); ok && ecrerr.Code() == "RepositoryPolicyNotFoundException" {
-			d.SetId("")
-			return nil
+		if ecrerr, ok := err.(awserr.Error); ok {
+			switch ecrerr.Code() {
+			case "RepositoryNotFoundException", "RepositoryPolicyNotFoundException":
+				d.SetId("")
+				return nil
+			default:
+				return err
+			}
 		}
 		return err
 	}
@@ -119,9 +124,12 @@ func resourceAwsEcrRepositoryPolicyDelete(d *schema.ResourceData, meta interface
 	})
 	if err != nil {
 		if ecrerr, ok := err.(awserr.Error); ok {
-			if ecrerr.Code() == "RepositoryPolicyNotFoundException" || ecrerr.Code() == "RepositoryNotFoundException" {
+			switch ecrerr.Code() {
+			case "RepositoryNotFoundException", "RepositoryPolicyNotFoundException":
 				d.SetId("")
 				return nil
+			default:
+				return err
 			}
 		}
 		return err