feat: Adds new mongodbatlas_cloud_user_org_assignment resource (#3486)

Author: maastha

.changelog/3486.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+resource/mongodbatlas_cloud_user_org_assignment 
+```

.changelog/3491.txt

@@ -0,0 +1,3 @@
+```release-note:new-datasource
+data-source/mongodbatlas_cloud_user_org_assignment 
+```

.github/workflows/acceptance-tests-runner.yml

@@ -244,6 +244,7 @@ jobs:
       autogen: ${{ steps.filter.outputs.autogen == 'true' || env.mustTrigger == 'true' }}
       backup: ${{ steps.filter.outputs.backup == 'true' || env.mustTrigger == 'true' }}
       control_plane_ip_addresses: ${{ steps.filter.outputs.control_plane_ip_addresses == 'true' || env.mustTrigger == 'true' }}
+      cloud_user: ${{ steps.filter.outputs.cloud_user == 'true' || env.mustTrigger == 'true' }}
       cluster: ${{ steps.filter.outputs.cluster == 'true' || env.mustTrigger == 'true' }}
       cluster_outage_simulation: ${{ steps.filter.outputs.cluster_outage_simulation == 'true' || env.mustTrigger == 'true' }}
       config: ${{ steps.filter.outputs.config == 'true' || env.mustTrigger == 'true' }}
@@ -299,6 +300,8 @@ jobs:
             - 'internal/service/onlinearchive/*.go'
           control_plane_ip_addresses:
             - 'internal/service/controlplaneipaddresses/*.go'
+          cloud_user:
+            - 'internal/service/clouduserorgassignment/*.go'
           cluster:
             - 'internal/service/cluster/*.go'
           cluster_outage_simulation:
@@ -589,6 +592,29 @@ jobs:
           MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
           ACCTEST_PACKAGES: ./internal/service/controlplaneipaddresses
         run: make testacc
+
+  cloud_user:
+    needs: [ change-detection, get-provider-version ]
+    if: ${{ needs.change-detection.outputs.cloud_user == 'true' || inputs.test_group == 'cloud_user' }}
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ inputs.ref || github.ref }}
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        with:
+          go-version-file: 'go.mod'
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
+        with:
+          terraform_version: ${{ inputs.terraform_version }}
+          terraform_wrapper: false  
+      - name: Acceptance Tests
+        env:
+          MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
+          MONGODB_ATLAS_TEAMS_IDS: ${{ inputs.mongodb_atlas_teams_ids }}
+          ACCTEST_PACKAGES: ./internal/service/clouduserorgassignment
+        run: make testacc
 
   cluster:
     needs: [ change-detection, get-provider-version ]

internal/common/conversion/collections.go

@@ -1,6 +1,12 @@
 package conversion
 
-import "reflect"
+import (
+	"context"
+	"reflect"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
 
 // HasElementsSliceOrMap checks if param is a non-empty slice or map
 func HasElementsSliceOrMap(value any) bool {
@@ -22,3 +28,11 @@ func ToAnySlicePointer(value *[]map[string]any) *[]any {
 	}
 	return &ret
 }
+
+func TFSetValueOrNull[T any](ctx context.Context, ptr *[]T, elemType attr.Type) types.Set {
+	if ptr == nil || len(*ptr) == 0 {
+		return types.SetNull(elemType)
+	}
+	set, _ := types.SetValueFrom(ctx, elemType, *ptr)
+	return set
+}

internal/common/conversion/collections_test.go

@@ -3,8 +3,10 @@ package conversion_test
 import (
 	"testing"
 
-	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 )
 
 func TestHasElementsSliceOrMap(t *testing.T) {
@@ -61,3 +63,25 @@ func TestToAnySlicePointer(t *testing.T) {
 		})
 	}
 }
+
+func TestTFSetValueOrNull(t *testing.T) {
+	ctx := t.Context()
+
+	testCases := map[string]*[]string{
+		"nil":       nil,
+		"empty":     {},
+		"populated": {"a", "b", "c"},
+	}
+
+	for name, value := range testCases {
+		t.Run(name, func(t *testing.T) {
+			result := conversion.TFSetValueOrNull(ctx, value, types.StringType)
+			if value == nil || len(*value) == 0 {
+				assert.True(t, result.IsNull())
+			} else {
+				assert.False(t, result.IsNull())
+				assert.Len(t, result.Elements(), len(*value))
+			}
+		})
+	}
+}

internal/common/schemafunc/attr.go

@@ -0,0 +1,11 @@
+package schemafunc
+
+import "github.com/hashicorp/terraform-plugin-go/tftypes"
+
+func GetAttrFromStateObj[T any](rawState map[string]tftypes.Value, attrName string) *T {
+	var ret *T
+	if err := rawState[attrName].As(&ret); err != nil {
+		return nil
+	}
+	return ret
+}

internal/provider/provider.go

@@ -29,6 +29,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/apikeyprojectassignment"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/atlasuser"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/clouduserorgassignment"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/controlplaneipaddresses"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/databaseuser"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/encryptionatrest"
@@ -457,6 +458,7 @@ func (p *MongodbtlasProvider) DataSources(context.Context) []func() datasource.D
 		flexrestorejob.PluralDataSource,
 		resourcepolicy.DataSource,
 		resourcepolicy.PluralDataSource,
+		clouduserorgassignment.DataSource,
 		apikeyprojectassignment.DataSource,
 		apikeyprojectassignment.PluralDataSource,
 	}
@@ -483,6 +485,7 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou
 		streamprivatelinkendpoint.Resource,
 		flexcluster.Resource,
 		resourcepolicy.Resource,
+		clouduserorgassignment.Resource,
 		apikeyprojectassignment.Resource,
 	}
 	if config.PreviewProviderV2AdvancedCluster() {

internal/service/advancedclustertpf/move_upgrade_state.go

@@ -18,6 +18,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/schemafunc"
 )
 
 // MoveState is used with moved block to upgrade from cluster to adv_cluster
@@ -112,17 +113,9 @@ func setStateResponse(ctx context.Context, diags *diag.Diagnostics, stateIn *tfp
 	diags.Append(stateOut.Set(ctx, model)...)
 }
 
-func getAttrFromStateObj[T any](rawState map[string]tftypes.Value, attrName string) *T {
-	var ret *T
-	if err := rawState[attrName].As(&ret); err != nil {
-		return nil
-	}
-	return ret
-}
-
 func getProjectIDNameFromStateObj(diags *diag.Diagnostics, stateObj map[string]tftypes.Value) (projectID, name *string) {
-	projectID = getAttrFromStateObj[string](stateObj, "project_id")
-	name = getAttrFromStateObj[string](stateObj, "name")
+	projectID = schemafunc.GetAttrFromStateObj[string](stateObj, "project_id")
+	name = schemafunc.GetAttrFromStateObj[string](stateObj, "name")
 	if !conversion.IsStringPresent(projectID) || !conversion.IsStringPresent(name) {
 		diags.AddError("Unable to read project_id or name from state", fmt.Sprintf("project_id: %s, name: %s",
 			conversion.SafeString(projectID), conversion.SafeString(name)))
@@ -138,13 +131,13 @@ func getTimeoutFromStateObj(stateObj map[string]tftypes.Value) timeouts.Value {
 		"delete": types.StringType,
 	}
 	nullObj := timeouts.Value{Object: types.ObjectNull(attrTypes)}
-	timeoutState := getAttrFromStateObj[map[string]tftypes.Value](stateObj, "timeouts")
+	timeoutState := schemafunc.GetAttrFromStateObj[map[string]tftypes.Value](stateObj, "timeouts")
 	if timeoutState == nil {
 		return nullObj
 	}
 	timeoutMap := make(map[string]attr.Value)
 	for action := range attrTypes {
-		actionTimeout := getAttrFromStateObj[string](*timeoutState, action)
+		actionTimeout := schemafunc.GetAttrFromStateObj[string](*timeoutState, action)
 		if actionTimeout == nil {
 			timeoutMap[action] = types.StringNull()
 		} else {
@@ -159,16 +152,16 @@ func getTimeoutFromStateObj(stateObj map[string]tftypes.Value) timeouts.Value {
 }
 
 func setOptionalModelAttrs(stateObj map[string]tftypes.Value, model *TFModel) {
-	if retainBackupsEnabled := getAttrFromStateObj[bool](stateObj, "retain_backups_enabled"); retainBackupsEnabled != nil {
+	if retainBackupsEnabled := schemafunc.GetAttrFromStateObj[bool](stateObj, "retain_backups_enabled"); retainBackupsEnabled != nil {
 		model.RetainBackupsEnabled = types.BoolPointerValue(retainBackupsEnabled)
 	}
-	if mongoDBMajorVersion := getAttrFromStateObj[string](stateObj, "mongo_db_major_version"); mongoDBMajorVersion != nil {
+	if mongoDBMajorVersion := schemafunc.GetAttrFromStateObj[string](stateObj, "mongo_db_major_version"); mongoDBMajorVersion != nil {
 		model.MongoDBMajorVersion = types.StringPointerValue(mongoDBMajorVersion)
 	}
 }
 
 func setReplicationSpecNumShardsAttr(ctx context.Context, stateObj map[string]tftypes.Value, model *TFModel) {
-	specsVal := getAttrFromStateObj[[]tftypes.Value](stateObj, "replication_specs")
+	specsVal := schemafunc.GetAttrFromStateObj[[]tftypes.Value](stateObj, "replication_specs")
 	if specsVal == nil {
 		return
 	}

internal/service/clouduserorgassignment/data_source.go

@@ -0,0 +1,85 @@
+package clouduserorgassignment
+
+import (
+	"context"
+	"fmt"
+
+	"go.mongodb.org/atlas-sdk/v20250312005/admin"
+
+	"github.com/hashicorp/terraform-plugin-framework/datasource"
+
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
+)
+
+var _ datasource.DataSource = &cloudUserOrgAssignmentDS{}
+var _ datasource.DataSourceWithConfigure = &cloudUserOrgAssignmentDS{}
+
+func DataSource() datasource.DataSource {
+	return &cloudUserOrgAssignmentDS{
+		DSCommon: config.DSCommon{
+			DataSourceName: resourceName,
+		},
+	}
+}
+
+type cloudUserOrgAssignmentDS struct {
+	config.DSCommon
+}
+
+func (d *cloudUserOrgAssignmentDS) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) {
+	resp.Schema = dataSourceSchema()
+}
+
+func (d *cloudUserOrgAssignmentDS) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
+	var cloudUserOrgAssignmentConfig TFModel
+	resp.Diagnostics.Append(req.Config.Get(ctx, &cloudUserOrgAssignmentConfig)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	connV2 := d.Client.AtlasV2
+	orgID := cloudUserOrgAssignmentConfig.OrgId.ValueString()
+	username := cloudUserOrgAssignmentConfig.Username.ValueString()
+	userID := cloudUserOrgAssignmentConfig.UserId.ValueString()
+
+	if username == "" && userID == "" {
+		resp.Diagnostics.AddError("invalid configuration", "either username or user_id must be provided")
+		return
+	}
+
+	var orgUser *admin.OrgUserResponse
+	var err error
+
+	if userID != "" {
+		orgUser, _, err = connV2.MongoDBCloudUsersApi.GetOrganizationUser(ctx, orgID, userID).Execute()
+		if err != nil {
+			resp.Diagnostics.AddError(fmt.Sprintf("error retrieving resource by user_id: %s", userID), err.Error())
+			return
+		}
+	} else {
+		params := &admin.ListOrganizationUsersApiParams{
+			OrgId:    orgID,
+			Username: &username,
+		}
+		usersResp, _, err := connV2.MongoDBCloudUsersApi.ListOrganizationUsersWithParams(ctx, params).Execute()
+		if err != nil {
+			resp.Diagnostics.AddError(fmt.Sprintf("error retrieving resource by username: %s", username), err.Error())
+			return
+		}
+
+		if usersResp == nil || usersResp.Results == nil || len(*usersResp.Results) == 0 {
+			resp.Diagnostics.AddError("resource not found", "no user found with the specified username")
+			return
+		}
+
+		orgUser = &(*usersResp.Results)[0]
+	}
+
+	tfModel, diags := NewTFModel(ctx, orgUser, cloudUserOrgAssignmentConfig.OrgId.ValueString())
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	resp.Diagnostics.Append(resp.State.Set(ctx, tfModel)...)
+}

internal/service/clouduserorgassignment/main_test.go

@@ -0,0 +1,15 @@
+package clouduserorgassignment_test
+
+import (
+	"os"
+	"testing"
+
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
+)
+
+func TestMain(m *testing.M) {
+	cleanup := acc.SetupSharedResources()
+	exitCode := m.Run()
+	cleanup()
+	os.Exit(exitCode)
+}