fix: IAM Policy 409 concurrent changes error - take 2 (#15995)

Author: tamir-deep

mmv1/third_party/terraform/tpgresource/utils.go

@@ -196,6 +196,11 @@ func IsConflictError(err error) bool {
 		if e.Code == 409 || e.Code == 412 {
 			return true
 		}
+	} else if gErr := (*googleapi.Error)(nil); errors.As(err, &gErr) {
+		// For cases where the error is not wrapped by errwrap such in 409 IAM concurrency errors.
+		if gErr.Code == 409 || gErr.Code == 412 {
+			return true
+		}
 	}
 	return false
 }

mmv1/third_party/terraform/tpgresource/utils_test.go

@@ -973,7 +973,10 @@ func TestConflictError(t *testing.T) {
 		t.Error("did not find that a 409 was a conflict error.")
 	}
 	if !tpgresource.IsConflictError(errwrap.Wrapf("wrap", confErr)) {
-		t.Error("did not find that a wrapped 409 was a conflict error.")
+		t.Error("did not find that a wrapped (errwrap) 409 was a conflict error.")
+	}
+	if !tpgresource.IsConflictError(fmt.Errorf("wrap: %w", confErr)) {
+		t.Error("did not find that a wrapped (fmt.Errorf) 409 was a conflict error.")
 	}
 	confErr = &googleapi.Error{
 		Code: 412,
@@ -984,6 +987,9 @@ func TestConflictError(t *testing.T) {
 	if !tpgresource.IsConflictError(errwrap.Wrapf("wrap", confErr)) {
 		t.Error("did not find that a wrapped 412 was a conflict error.")
 	}
+	if !tpgresource.IsConflictError(fmt.Errorf("wrap: %w", confErr)) {
+		t.Error("did not find that a wrapped (fmt.Errorf) 412 was a conflict error.")
+	}
 	// skipping negative tests as other cases may be added later.
 }