From a464c5e6e1827d812c52992a8b7f9dc88f27defb Mon Sep 17 00:00:00 2001
From: The Magician <magic-modules@google.com>
Date: Thu, 24 Jan 2019 10:27:46 -0800
Subject: [PATCH] Add more descriptive error message for conflict errors.
 (#2921)

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 google/iam.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google/iam.go b/google/iam.go
index 4c16988b..869bdb60 100644
--- a/google/iam.go
+++ b/google/iam.go
@@ -113,7 +113,7 @@ func iamPolicyReadModifyWrite(updater ResourceIamUpdater, modify iamPolicyModify
 			time.Sleep(backoff)
 			backoff = backoff * 2
 			if backoff > 30*time.Second {
-				return fmt.Errorf("Error applying IAM policy to %s: too many concurrent policy changes.\n", updater.DescribeResource())
+				return errwrap.Wrapf(fmt.Sprintf("Error applying IAM policy to %s: Too many conflicts.  Latest error: {{err}}", updater.DescribeResource()), err)
 			}
 			continue
 		}