From c5372af4d04bf76837ee8515ae4689e3908a5778 Mon Sep 17 00:00:00 2001
From: Jarrett Spiker <jarrett.spiker@hashicorp.com>
Date: Mon, 9 Jan 2023 12:02:37 -0500
Subject: [PATCH] Handle slashes in email addresses for tfe_org_member import

---
 tfe/resource_tfe_organization_membership.go      | 9 ++-------
 tfe/resource_tfe_organization_membership_test.go | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tfe/resource_tfe_organization_membership.go b/tfe/resource_tfe_organization_membership.go
index c514e5e4f..208071428 100644
--- a/tfe/resource_tfe_organization_membership.go
+++ b/tfe/resource_tfe_organization_membership.go
@@ -124,13 +124,8 @@ func resourceTFEOrganizationMembershipImporter(ctx context.Context, d *schema.Re
 	// Import formats:
 	//  - <ORGANIZATION MEMBERSHIP ID>
 	//  - <organization name>/<user email>
-	s := strings.Split(d.Id(), "/")
-	if len(s) >= 3 {
-		return nil, fmt.Errorf(
-			"invalid organization membership input format: %s (expected <ORGANIZATION>/<USER EMAIL> or <ORGANIZATION MEMBERSHIP ID>)",
-			d.Id(),
-		)
-	} else if len(s) == 2 {
+	s := strings.SplitN(d.Id(), "/", 2)
+	if len(s) == 2 {
 		org := s[0]
 		email := s[1]
 		orgMembership, err := fetchOrganizationMemberByNameOrEmail(ctx, config.Client, org, "", email)
diff --git a/tfe/resource_tfe_organization_membership_test.go b/tfe/resource_tfe_organization_membership_test.go
index 5f1848568..a24b948a8 100644
--- a/tfe/resource_tfe_organization_membership_test.go
+++ b/tfe/resource_tfe_organization_membership_test.go
@@ -106,7 +106,7 @@ func TestAccTFEOrganizationMembershipImport_invalidImportId(t *testing.T) {
 				ResourceName:  "tfe_organization_membership.foobar",
 				ImportState:   true,
 				ImportStateId: fmt.Sprintf("%s/%s/someOtherString", orgName, email),
-				ExpectError:   regexp.MustCompile("invalid organization membership input format"),
+				ExpectError:   regexp.MustCompile(fmt.Sprintf("error retrieving user with email %s/someOtherString from organization %s", email, orgName)),
 			},
 			{
 				ResourceName:  "tfe_organization_membership.foobar",