Skip to content

Commit

Permalink
Revert "Fix cloud_identity_group_membership to properly handle 403 re…
Browse files Browse the repository at this point in the history
…sponses when membership does not exist (GoogleCloudPlatform#6999)" (GoogleCloudPlatform#7032)

This reverts commit 927d9e9.
  • Loading branch information
melinath authored and i-laird committed Jan 10, 2023
1 parent b64610c commit 8364d57
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 110 deletions.
1 change: 0 additions & 1 deletion mmv1/products/cloudidentity/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
post_create: templates/terraform/post_create/set_computed_name.erb
custom_import: templates/terraform/custom_import/set_id_name_with_slashes.go.erb
GroupMembership: !ruby/object:Overrides::Terraform::ResourceOverride
read_error_transform: "transformCloudIdentityGroupMembershipReadError"
docs: !ruby/object:Provider::Terraform::Docs
warning: |
If you are using User ADCs (Application Default Credentials) with this resource,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"google.golang.org/api/iam/v1"
)

func TestAccCloudIdentityGroupMembership_update(t *testing.T) {
Expand Down Expand Up @@ -177,87 +176,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)
}

<% unless version == 'ga' -%>
func TestAccCloudIdentityGroupMembership_cloudIdentityGroupMembershipWithMemberKey(t *testing.T) {
t.Parallel()
Expand Down

This file was deleted.

0 comments on commit 8364d57

Please sign in to comment.