chore: Update mongodbatlas_cloud_user_team_assignment resource to use new query param user_id (#3574)

* Updated SDK

* Revert "Updated SDK"

This reverts commit f8d2d0a.

* Added userId as param to filter

* Changed to sequential test

* Fix

* Refactored Read method in resource and datasource

* Fixed CheckDestroy

* Removed redundant `found`parameter

* Fixed checkDestroy

---------

Co-authored-by: Cristina Sánchez Sánchez <[email protected]>

Author: csanx

internal/service/clouduserteamassignment/data_source.go

@@ -2,11 +2,9 @@ package clouduserteamassignment
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
-	"go.mongodb.org/atlas-sdk/v20250312006/admin"
 )
 
 var _ datasource.DataSource = &cloudUserTeamAssignmentDS{}
@@ -46,50 +44,13 @@ func (d *cloudUserTeamAssignmentDS) Read(ctx context.Context, req datasource.Rea
 		return
 	}
 
-	var userListResp *admin.PaginatedOrgUser
-	var userResp *admin.OrgUserResponse
-	var err error
-
-	if userID != "" {
-		userListResp, _, err = connV2.MongoDBCloudUsersApi.ListTeamUsers(ctx, orgID, teamID).Execute()
-		if err != nil {
-			resp.Diagnostics.AddError(fmt.Sprintf("error retrieving resource by user_id: %s", userID), err.Error())
-			return
-		}
-
-		if userListResp == nil || len(userListResp.GetResults()) == 0 {
-			resp.Diagnostics.AddError("resource not found", "no user found with the specified user_id")
-			return
-		}
-		results := userListResp.GetResults()
-		for i := range results {
-			if results[i].GetId() == userID {
-				userResp = &results[i]
-				break
-			}
-		}
-	} else if username != "" {
-		params := &admin.ListTeamUsersApiParams{
-			OrgId:    orgID,
-			TeamId:   teamID,
-			Username: &username,
-		}
-		userListResp, _, err = connV2.MongoDBCloudUsersApi.ListTeamUsersWithParams(ctx, params).Execute()
-		if err != nil {
-			resp.Diagnostics.AddError(fmt.Sprintf("error retrieving resource by username: %s", username), err.Error())
-			return
-		}
-
-		if userListResp == nil || len(userListResp.GetResults()) == 0 {
-			resp.Diagnostics.AddError("resource not found", "no user found with the specified username")
-			return
-		}
-
-		userResp = &(userListResp.GetResults())[0]
+	userResp, err := fetchTeamUser(ctx, connV2, orgID, teamID, &userID, &username)
+	if err != nil {
+		resp.Diagnostics.AddError("error retrieving user", err.Error())
+		return
 	}
-
 	if userResp == nil {
-		resp.State.RemoveResource(ctx)
+		resp.Diagnostics.AddError("resource not found", "no user found with the specified identifier")
 		return
 	}
 

internal/service/clouduserteamassignment/resource.go

@@ -3,7 +3,6 @@ package clouduserteamassignment
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"regexp"
 
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -17,8 +16,7 @@ import (
 const (
 	resourceName             = "cloud_user_team_assignment"
 	warnUnsupportedOperation = "Operation not supported"
-	errorReadingByUserID     = "Error getting team users by user_id"
-	errorReadingByUsername   = "Error getting team users by username"
+	errorReadingUsers        = "Error retrieving team users"
 	invalidImportID          = "Invalid import ID format"
 )
 
@@ -73,72 +71,60 @@ func (r *rs) Create(ctx context.Context, req resource.CreateRequest, resp *resou
 	resp.Diagnostics.Append(resp.State.Set(ctx, newUserTeamAssignmentModel)...)
 }
 
+func fetchTeamUser(ctx context.Context, connV2 *admin.APIClient, orgID, teamID string, userID, username *string) (*admin.OrgUserResponse, error) {
+	var params admin.ListTeamUsersApiParams
+	if userID != nil && *userID != "" {
+		params = admin.ListTeamUsersApiParams{
+			UserId: userID,
+			OrgId:  orgID,
+			TeamId: teamID,
+		}
+	} else if username != nil && *username != "" {
+		params = admin.ListTeamUsersApiParams{
+			Username: username,
+			OrgId:    orgID,
+			TeamId:   teamID,
+		}
+	}
+
+	userListResp, httpResp, err := connV2.MongoDBCloudUsersApi.ListTeamUsersWithParams(ctx, &params).Execute()
+	if err != nil {
+		if validate.StatusNotFound(httpResp) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	if userListResp == nil || len(userListResp.GetResults()) == 0 {
+		return nil, nil
+	}
+	userResp := userListResp.GetResults()[0]
+	return &userResp, nil
+}
+
 func (r *rs) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
 	var state TFUserTeamAssignmentModel
 	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
+
 	connV2 := r.Client.AtlasV2
 	orgID := state.OrgId.ValueString()
 	teamID := state.TeamId.ValueString()
 
-	var userListResp *admin.PaginatedOrgUser
-	var httpResp *http.Response
-	var err error
-
-	var userResp *admin.OrgUserResponse
+	var userID, username *string
 	if !state.UserId.IsNull() && state.UserId.ValueString() != "" {
-		userID := state.UserId.ValueString()
-		userListResp, httpResp, err = connV2.MongoDBCloudUsersApi.ListTeamUsers(ctx, orgID, teamID).Execute()
-
-		if err != nil {
-			if validate.StatusNotFound(httpResp) {
-				resp.State.RemoveResource(ctx)
-				return
-			}
-			resp.Diagnostics.AddError(errorReadingByUserID, err.Error())
-			return
-		}
-		if userListResp != nil {
-			if len(userListResp.GetResults()) == 0 {
-				resp.State.RemoveResource(ctx)
-				return
-			}
-			results := userListResp.GetResults()
-			for i := range results {
-				if results[i].GetId() == userID {
-					userResp = &results[i]
-					break
-				}
-			}
-		}
-	} else if !state.Username.IsNull() && state.Username.ValueString() != "" { // required for import
-		username := state.Username.ValueString()
-		params := &admin.ListTeamUsersApiParams{
-			Username: &username,
-			OrgId:    orgID,
-			TeamId:   teamID,
-		}
-		userListResp, httpResp, err = connV2.MongoDBCloudUsersApi.ListTeamUsersWithParams(ctx, params).Execute()
-
-		if err != nil {
-			if validate.StatusNotFound(httpResp) {
-				resp.State.RemoveResource(ctx)
-				return
-			}
-			resp.Diagnostics.AddError(errorReadingByUsername, err.Error())
-			return
-		}
-		if userListResp != nil {
-			if len(userListResp.GetResults()) == 0 {
-				resp.State.RemoveResource(ctx)
-				return
-			}
-			userResp = &(userListResp.GetResults())[0]
-		}
+		userID = state.UserId.ValueStringPointer()
+	} else if !state.Username.IsNull() && state.Username.ValueString() != "" {
+		username = state.Username.ValueStringPointer()
 	}
 
+	userResp, err := fetchTeamUser(ctx, connV2, orgID, teamID, userID, username)
+	if err != nil {
+		resp.Diagnostics.AddError(errorReadingUsers, err.Error())
+		return
+	}
 	if userResp == nil {
 		resp.State.RemoveResource(ctx)
 		return

internal/service/clouduserteamassignment/resource_test.go

@@ -4,24 +4,20 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
+	"go.mongodb.org/atlas-sdk/v20250312006/admin"
 )
 
 var resourceName = "mongodbatlas_cloud_user_team_assignment.test"
 var dataSourceName1 = "data.mongodbatlas_cloud_user_team_assignment.test1"
 var dataSourceName2 = "data.mongodbatlas_cloud_user_team_assignment.test2"
 
 func TestAccCloudUserTeamAssignment_basic(t *testing.T) {
-	resource.ParallelTest(t, *basicTestCase(t))
-}
-
-func TestAccCloudUserTeamAssignmentDS_error(t *testing.T) {
-	resource.ParallelTest(t, *errorTestCase(t))
+	resource.Test(t, *basicTestCase(t))
 }
 
 func basicTestCase(t *testing.T) *resource.TestCase {
@@ -70,24 +66,6 @@ func basicTestCase(t *testing.T) *resource.TestCase {
 	}
 }
 
-func errorTestCase(t *testing.T) *resource.TestCase {
-	t.Helper()
-
-	orgID := os.Getenv("MONGODB_ATLAS_ORG_ID")
-	teamName := acc.RandomName()
-
-	return &resource.TestCase{
-		PreCheck:                 func() { acc.PreCheckBasic(t) },
-		ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
-		Steps: []resource.TestStep{
-			{
-				Config:      configError(orgID, teamName),
-				ExpectError: regexp.MustCompile("either username or user_id must be provided"),
-			},
-		},
-	}
-}
-
 func configBasic(orgID, userID, teamName string) string {
 	return fmt.Sprintf(` 
 		resource "mongodbatlas_team" "test" {
@@ -114,21 +92,6 @@ func configBasic(orgID, userID, teamName string) string {
 		orgID, userID, teamName)
 }
 
-func configError(orgID, teamName string) string {
-	return fmt.Sprintf(`
-		resource "mongodbatlas_team" "test" {
-			org_id     = %[1]q
-			name       = %[2]q
-		}
-
-
-		data "mongodbatlas_cloud_user_team_assignment" "test" {
-		org_id  = %[1]q
-		team_id = mongodbatlas_team.test.team_id
-		}
-		`, orgID, teamName)
-}
-
 func checks(orgID, userID string) resource.TestCheckFunc {
 	return resource.ComposeAggregateTestCheckFunc(
 		resource.TestCheckResourceAttr(resourceName, "org_id", orgID),
@@ -156,23 +119,18 @@ func checkDestroy(s *terraform.State) error {
 		orgID := rs.Primary.Attributes["org_id"]
 		teamID := rs.Primary.Attributes["team_id"]
 		userID := rs.Primary.Attributes["user_id"]
-		username := rs.Primary.Attributes["username"]
 		conn := acc.ConnV2()
+		ctx := context.Background()
 
-		userListResp, _, err := conn.MongoDBCloudUsersApi.ListTeamUsers(context.Background(), orgID, teamID).Execute()
-		if err != nil {
-			continue
-		}
-
-		if userListResp != nil && userListResp.Results != nil {
-			results := *userListResp.Results
-			for i := range results {
-				if userID != "" && results[i].GetId() == userID {
-					return fmt.Errorf("cloud user team assignment for user (%s) in team (%s) still exists", userID, teamID)
-				}
-				if username != "" && results[i].GetUsername() == username {
-					return fmt.Errorf("cloud user team assignment for user (%s) in team (%s) still exists", username, teamID)
-				}
+		if userID != "" {
+			userIDParams := &admin.ListTeamUsersApiParams{
+				UserId: &userID,
+				OrgId:  orgID,
+				TeamId: teamID,
+			}
+			userListUserID, _, err := conn.MongoDBCloudUsersApi.ListTeamUsersWithParams(ctx, userIDParams).Execute()
+			if userListUserID.HasResults() {
+				return fmt.Errorf("cloud user team assignment for user (%s) in team (%s) still exists %s", userID, teamID, err)
 			}
 		}
 	}