Revert "fix: IAM Policy 409 concurrent changes error (#15825)" (#15972)

Author: slevenick

mmv1/third_party/terraform/tpgresource/utils.go

@@ -188,9 +188,13 @@ func IsQuotaError(err error) bool {
 }
 
 func IsConflictError(err error) bool {
-	var gerr *googleapi.Error
-	if errors.As(err, &gerr) {
-		return gerr.Code == 409 || gerr.Code == 412
+	if e, ok := err.(*googleapi.Error); ok && (e.Code == 409 || e.Code == 412) {
+		return true
+	} else if !ok && errwrap.ContainsType(err, &googleapi.Error{}) {
+		e := errwrap.GetType(err, &googleapi.Error{}).(*googleapi.Error)
+		if e.Code == 409 || e.Code == 412 {
+			return true
+		}
 	}
 	return false
 }

mmv1/third_party/terraform/tpgresource/utils_test.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
 	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
@@ -971,7 +972,7 @@ func TestConflictError(t *testing.T) {
 	if !tpgresource.IsConflictError(confErr) {
 		t.Error("did not find that a 409 was a conflict error.")
 	}
-	if !tpgresource.IsConflictError(fmt.Errorf("wrap: %w", confErr)) {
+	if !tpgresource.IsConflictError(errwrap.Wrapf("wrap", confErr)) {
 		t.Error("did not find that a wrapped 409 was a conflict error.")
 	}
 	confErr = &googleapi.Error{
@@ -980,7 +981,7 @@ func TestConflictError(t *testing.T) {
 	if !tpgresource.IsConflictError(confErr) {
 		t.Error("did not find that a 412 was a conflict error.")
 	}
-	if !tpgresource.IsConflictError(fmt.Errorf("wrap: %w", confErr)) {
+	if !tpgresource.IsConflictError(errwrap.Wrapf("wrap", confErr)) {
 		t.Error("did not find that a wrapped 412 was a conflict error.")
 	}
 	// skipping negative tests as other cases may be added later.