Revert "Fix cloud_identity_group_membership to properly handle 403 re…

…sponses when membership does not exist (#6999)" (#7032) (#5023) This reverts commit 927d9e93ddc2fe8a28c4fcc6eb50c009dea86174. Signed-off-by: Modular Magician <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Dec 22, 2022 · 3b3b167 · 3b3b167
1 parent 71f4db6
commit 3b3b167
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 110 deletions.
diff --git a/.changelog/7032.txt b/.changelog/7032.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/google-beta/cloud_identity_group_membership_utils.go b/google-beta/cloud_identity_group_membership_utils.go
diff --git a/google-beta/resource_cloud_identity_group_membership.go b/google-beta/resource_cloud_identity_group_membership.go
@@ -274,7 +274,7 @@ func resourceCloudIdentityGroupMembershipRead(d *schema.ResourceData, meta inter
 
 	res, err := sendRequest(config, "GET", billingProject, url, userAgent, nil)
 	if err != nil {
-		return handleNotFoundError(transformCloudIdentityGroupMembershipReadError(err), d, fmt.Sprintf("CloudIdentityGroupMembership %q", d.Id()))
+		return handleNotFoundError(err, d, fmt.Sprintf("CloudIdentityGroupMembership %q", d.Id()))
 	}
 
 	if err := d.Set("name", flattenCloudIdentityGroupMembershipName(res["name"], d, config)); err != nil {

diff --git a/google-beta/resource_cloud_identity_group_membership_test.go b/google-beta/resource_cloud_identity_group_membership_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"google.golang.org/api/iam/v1"
 )
 
 func TestAccCloudIdentityGroupMembership_update(t *testing.T) {
@@ -176,87 +175,6 @@ resource "google_cloud_identity_group_membership" "basic" {
 `, context)
 }
 
-func TestAccCloudIdentityGroupMembership_membershipDoesNotExist(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"org_domain":    getTestOrgDomainFromEnv(t),
-		"cust_id":       getTestCustIdFromEnv(t),
-		"random_suffix": randString(t, 10),
-	}
-
-	saId := "tf-test-sa-" + randString(t, 10)
-	project := getTestProjectFromEnv()
-	config := BootstrapConfig(t)
-
-	r := &iam.CreateServiceAccountRequest{
-		AccountId:      saId,
-		ServiceAccount: &iam.ServiceAccount{},
-	}
-
-	sa, err := config.NewIamClient(config.userAgent).Projects.ServiceAccounts.Create("projects/"+project, r).Do()
-	if err != nil {
-		t.Errorf("Error creating service account: %s", err)
-	}
-
-	context["member_id"] = sa.Email
-
-	vcrTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckCloudIdentityGroupMembershipDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccCloudIdentityGroupMembership_dne(context),
-			},
-			{
-				PreConfig: func() {
-					config := googleProviderConfig(t)
-
-					_, err := config.NewIamClient(config.userAgent).Projects.ServiceAccounts.Delete(sa.Name).Do()
-					if err != nil {
-						t.Errorf("cannot delete service account %s: %v", sa.Name, err)
-						return
-					}
-				},
-				Config:             testAccCloudIdentityGroupMembership_dne(context),
-				PlanOnly:           true,
-				ExpectNonEmptyPlan: true,
-			},
-		},
-	})
-}
-
-func testAccCloudIdentityGroupMembership_dne(context map[string]interface{}) string {
-	return Nprintf(`
-resource "google_cloud_identity_group" "group" {
-  display_name = "tf-test-my-identity-group-%{random_suffix}"
-
-  parent = "customers/%{cust_id}"
-
-  group_key {
-    id = "tf-test-my-identity-group-%{random_suffix}@%{org_domain}"
-  }
-
-  labels = {
-    "cloudidentity.googleapis.com/groups.discussion_forum" = ""
-  }
-}
-
-resource "google_cloud_identity_group_membership" "basic" {
-  group = google_cloud_identity_group.group.id
-
-  preferred_member_key {
-    id = "%{member_id}"
-  }
-
-  roles {
-    name = "MEMBER"
-  }
-}
-`, context)
-}
-
 func TestAccCloudIdentityGroupMembership_cloudIdentityGroupMembershipWithMemberKey(t *testing.T) {
 	t.Parallel()