Merge branch 'CLOUDP-320243-dev-2.0.0' into CLOUDP-334357

Author: oarbusi

.changelog/3539.txt

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

.changelog/3544.txt

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

.changelog/3570.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_push_based_log_export: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+```

.changelog/3571.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/mongodbatlas_stream_processor: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+```
+
+```release-note:enhancement
+resource/mongodbatlas_stream_processor: Adds `timeouts` attribute for create operation
+```

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

@@ -323,6 +323,7 @@ jobs:
             - 'internal/service/projectapikey/*.go'
             - 'internal/service/rolesorgid/*.go'
             - 'internal/service/team/*.go'
+            - 'internal/service/teamprojectassignment/*.go'
             - 'internal/service/thirdpartyintegration/*.go'
           encryption:
             - 'internal/service/encryptionatrest/*.go' 
@@ -616,6 +617,7 @@ jobs:
           MONGODB_ATLAS_TEAMS_IDS: ${{ inputs.mongodb_atlas_teams_ids }}
           MONGODB_ATLAS_PROJECT_OWNER_ID: ${{ inputs.mongodb_atlas_project_owner_id }}
           MONGODB_ATLAS_ORG_ID: ${{ inputs.mongodb_atlas_org_id }}
+          MONGODB_ATLAS_USERNAME: ${{ vars.MONGODB_ATLAS_USERNAME }}
           ACCTEST_PACKAGES: |
             ./internal/service/clouduserorgassignment
             ./internal/service/clouduserteamassignment
@@ -710,6 +712,7 @@ jobs:
             ./internal/service/apikey
             ./internal/service/rolesorgid
             ./internal/service/team
+            ./internal/service/teamprojectassignment
             ./internal/service/thirdpartyintegration
         run: make testacc
 

docs/guides/2.0.0-upgrade-guide.md

@@ -21,7 +21,9 @@ The Terraform MongoDB Atlas Provider version 2.0.0 has the following new feature
   - `mongodbatlas_online_archive`
   - `mongodbatlas_privatelink_endpoint`
   - `mongodbatlas_privatelink_endpoint_service`
+  - `mongodbatlas_push_based_log_export`
   - `mongodbatlas_search_deployment`
+  - `mongodbatlas_stream_processor`
 
 ## Breaking Changes
 

docs/resources/push_based_log_export.md

@@ -59,6 +59,7 @@ output "test" {
 
 ### Optional
 
+- `delete_on_create_timeout` (Boolean) Indicates whether to delete the resource being created if a timeout is reached when waiting for completion. When set to `true` and timeout occurs, it triggers the deletion and returns immediately without waiting for deletion to complete. When set to `false`, the timeout will not trigger resource deletion. If you suspect a transient error when the value is `true`, wait before retrying to allow resource deletion to finish. Default is `true`.
 - `prefix_path` (String) S3 directory in which vector writes in order to store the logs. An empty string denotes the root directory.
 - `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
 

docs/resources/stream_processor.md

@@ -132,10 +132,12 @@ output "stream_processors_results" {
 
 ### Optional
 
+- `delete_on_create_timeout` (Boolean) Indicates whether to delete the resource being created if a timeout is reached when waiting for completion. When set to `true` and timeout occurs, it triggers the deletion and returns immediately without waiting for deletion to complete. When set to `false`, the timeout will not trigger resource deletion. If you suspect a transient error when the value is `true`, wait before retrying to allow resource deletion to finish. Default is `true`.
 - `options` (Attributes) Optional configuration for the stream processor. (see [below for nested schema](#nestedatt--options))
 - `state` (String) The state of the stream processor. Commonly occurring states are 'CREATED', 'STARTED', 'STOPPED' and 'FAILED'. Used to start or stop the Stream Processor. Valid values are `CREATED`, `STARTED` or `STOPPED`. When a Stream Processor is created without specifying the state, it will default to `CREATED` state. When a Stream Processor is updated without specifying the state, it will default to the Previous state. 
 
 **NOTE** When a Stream Processor is updated without specifying the state, it is stopped and then restored to previous state upon update completion.
+- `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
 
 ### Read-Only
 
@@ -158,6 +160,15 @@ Required:
 - `connection_name` (String) Name of the connection to write DLQ messages to. Must be an Atlas connection.
 - `db` (String) Name of the database to use for the DLQ.
 
+
+
+<a id="nestedatt--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `create` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours).
+
 ## Import 
 Stream Processor resource can be imported using the Project ID, Stream Instance name and Stream Processor name, in the format `INSTANCE_NAME-PROJECT_ID-PROCESSOR_NAME`, e.g.
 ```

internal/provider/provider.go

@@ -50,6 +50,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/streaminstance"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/streamprivatelinkendpoint"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/streamprocessor"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/teamprojectassignment"
 	"github.com/mongodb/terraform-provider-mongodbatlas/version"
 )
 
@@ -463,6 +464,7 @@ func (p *MongodbtlasProvider) DataSources(context.Context) []func() datasource.D
 		resourcepolicy.PluralDataSource,
 		clouduserorgassignment.DataSource,
 		clouduserteamassignment.DataSource,
+		teamprojectassignment.DataSource,
 		apikeyprojectassignment.DataSource,
 		apikeyprojectassignment.PluralDataSource,
 	}
@@ -491,6 +493,7 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou
 		resourcepolicy.Resource,
 		clouduserorgassignment.Resource,
 		apikeyprojectassignment.Resource,
+		teamprojectassignment.Resource,
 		clouduserteamassignment.Resource,
 	}
 	if config.PreviewProviderV2AdvancedCluster() {

internal/service/clouduserteamassignment/resource_migration_test.go

@@ -1,12 +1,95 @@
 package clouduserteamassignment_test
 
 import (
+	"fmt"
+	"os"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mig"
 )
 
+const (
+	resourceTeamName           = "mongodbatlas_team.test"
+	resourceTeamAssignmentName = "mongodbatlas_cloud_user_team_assignment.test"
+)
+
 func TestMigCloudUserTeamAssignmentRS_basic(t *testing.T) {
 	mig.SkipIfVersionBelow(t, "2.0.0") // when resource 1st released
 	mig.CreateAndRunTest(t, basicTestCase(t))
 }
+
+func TestMigCloudUserTeamAssignmentRS_migrationJourney(t *testing.T) {
+	var (
+		orgID    = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		teamName = fmt.Sprintf("team-test-%s", acc.RandomName())
+		username = os.Getenv("MONGODB_ATLAS_USERNAME")
+	)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { acc.PreCheckBasic(t); acc.PreCheckAtlasUsername(t) },
+		CheckDestroy: checkDestroy,
+		Steps: []resource.TestStep{
+			{
+				// NOTE: 'usernames' attribute (available v1.39.0, deprecated in v2.0.0) is used in this test in team resource,
+				// which may be removed in future versions. This could cause the test to break - keep for version tracking.
+				ExternalProviders: mig.ExternalProviders(),
+				Config:            configTeamWithUsernamesFirst(orgID, teamName, username),
+			},
+			{
+				ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
+				Config:                   configWithTeamAssignmentsSecond(orgID, teamName, username), // expected to see 1 import in the plan
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceTeamName, "name", teamName),
+
+					resource.TestCheckResourceAttrSet(resourceTeamAssignmentName, "user_id"),
+					resource.TestCheckResourceAttr(resourceTeamAssignmentName, "username", username),
+				),
+			},
+			mig.TestStepCheckEmptyPlan(configWithTeamAssignmentsSecond(orgID, teamName, username)),
+		},
+	})
+}
+
+// Step 1: Original configuration with usernames attribute
+func configTeamWithUsernamesFirst(orgID, teamName, username string) string {
+	return fmt.Sprintf(`
+	resource "mongodbatlas_team" "test" {
+		org_id    = %[2]q
+		name      = %[3]q
+		usernames = [%[1]q]
+	}
+	`, username, orgID, teamName)
+}
+
+// Step 2: Configuration with team assignments using import blocks
+
+// NOTE: Using static resource assignment instead of for_each with multiple usernames
+// due to a known limitation in Terraform's acceptance testing framework with indexed resources.
+// The actual migration using for_each works correctly (verified locally).
+func configWithTeamAssignmentsSecond(orgID, teamName, username string) string {
+	return fmt.Sprintf(`
+	resource "mongodbatlas_team" "test" {
+		org_id    = %[1]q
+		name      = %[2]q
+	}
+
+	data "mongodbatlas_team" "test" {
+		org_id = %[1]q
+		team_id = mongodbatlas_team.test.team_id
+	}
+ 
+	resource "mongodbatlas_cloud_user_team_assignment" "test" {
+		org_id   = %[1]q
+		team_id  = mongodbatlas_team.test.team_id
+		user_id  = data.mongodbatlas_team.test.users[0].id
+	}
+
+	import {
+		to = mongodbatlas_cloud_user_team_assignment.test
+		id = "%[1]s/${mongodbatlas_team.test.team_id}/${data.mongodbatlas_team.test.users[0].id}"
+	}
+
+	`, orgID, teamName)
+}