Changed Update to read from API

Author: Cristina Sánchez Sánchez

internal/service/clouduserprojectassignment/model.go

@@ -50,11 +50,8 @@ func NewProjectUserReq(ctx context.Context, plan *TFModel) (*admin.GroupUserRequ
 	return &addProjectUserReq, nil
 }
 
-func NewAtlasUpdateReq(ctx context.Context, plan, state *TFModel) (addRequests, removeRequests []*admin.AddOrRemoveGroupRole, diags diag.Diagnostics) {
-	var currentRoles, desiredRoles []string
-	if !state.Roles.IsNull() && !state.Roles.IsUnknown() {
-		currentRoles = conversion.TypesSetToString(ctx, state.Roles)
-	}
+func NewAtlasUpdateReq(ctx context.Context, plan *TFModel, currentRoles []string) (addRequests, removeRequests []*admin.AddOrRemoveGroupRole, diags diag.Diagnostics) {
+	var desiredRoles []string
 	if !plan.Roles.IsNull() && !plan.Roles.IsUnknown() {
 		desiredRoles = conversion.TypesSetToString(ctx, plan.Roles)
 	}

internal/service/clouduserprojectassignment/model_test.go

@@ -260,10 +260,9 @@ func TestNewAtlasUpdateReq(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			stateRoles, _ := types.SetValueFrom(ctx, types.StringType, tt.args.stateRoles)
 			planRoles, _ := types.SetValueFrom(ctx, types.StringType, tt.args.planRoles)
 
-			state := &clouduserprojectassignment.TFModel{Roles: stateRoles}
+			state := tt.args.stateRoles
 			plan := &clouduserprojectassignment.TFModel{Roles: planRoles}
 
 			addReqs, removeReqs, diags := clouduserprojectassignment.NewAtlasUpdateReq(ctx, plan, state)

internal/service/clouduserprojectassignment/resource.go

@@ -140,6 +140,7 @@ func (r *rs) Read(ctx context.Context, req resource.ReadRequest, resp *resource.
 func (r *rs) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	var plan TFModel
 	var state TFModel
+	var err error
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
 	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
 	if resp.Diagnostics.HasError() {
@@ -151,7 +152,13 @@ func (r *rs) Update(ctx context.Context, req resource.UpdateRequest, resp *resou
 	userID := plan.UserId.ValueString()
 	username := plan.Username.ValueString()
 
-	addRequests, removeRequests, diags := NewAtlasUpdateReq(ctx, &plan, &state)
+	userInfo, _, err := connV2.MongoDBCloudUsersApi.GetProjectUser(ctx, projectID, userID).Execute() // Fetch current user roles from API (more reliable than state)
+	if err != nil {
+		resp.Diagnostics.AddError(fmt.Sprintf("error fetching user(%s) from ProjectID(%s):", username, projectID), err.Error())
+		return
+	}
+
+	addRequests, removeRequests, diags := NewAtlasUpdateReq(ctx, &plan, userInfo.GetRoles())
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -180,7 +187,7 @@ func (r *rs) Update(ctx context.Context, req resource.UpdateRequest, resp *resou
 	}
 
 	var userResp *admin.GroupUserResponse
-	var err error
+
 	if !state.UserId.IsNull() && state.UserId.ValueString() != "" {
 		userID := state.UserId.ValueString()
 		userResp, _, err = connV2.MongoDBCloudUsersApi.GetProjectUser(ctx, projectID, userID).Execute()