refactor

internal/provider/provider.go

@@ -797,7 +797,7 @@ func Provider() *schema.Provider {
 			"aws_appstream_fleet":                  appstream.ResourceFleet(),
 			"aws_appstream_image_builder":          appstream.ResourceImageBuilder(),
 			"aws_appstream_stack":                  appstream.ResourceStack(),
-			"aws_appstream_stack_user_association": appstream.ResourceUserStackAssociation(),
+			"aws_appstream_user_stack_association": appstream.ResourceUserStackAssociation(),
 			"aws_appstream_user":                   appstream.ResourceUser(),
 
 			"aws_appsync_api_key":     appsync.ResourceAPIKey(),

internal/service/appstream/status.go

@@ -72,6 +72,6 @@ func statusUserAvailable(ctx context.Context, conn *appstream.AppStream, usernam
 			return nil, "", err
 		}
 
-		return user, "AVAILABLE", nil
+		return user, userAvailable, nil
 	}
 }

internal/service/appstream/user.go

@@ -58,9 +58,9 @@ func ResourceUser() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: validation.StringLenBetween(0, 2048),
 			},
-			"status": {
-				Type:     schema.TypeString,
-				Computed: true,
+			"send_email_notification": {
+				Type:     schema.TypeBool,
+				Optional: true,
 			},
 			"user_name": {
 				Type:         schema.TypeString,
@@ -91,46 +91,40 @@ func resourceUserCreate(ctx context.Context, d *schema.ResourceData, meta interf
 		input.LastName = aws.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("message_action"); ok {
-		input.MessageAction = aws.String(v.(string))
+	if v, ok := d.GetOk("send_email_notification"); ok {
+		if !v.(bool) {
+			input.MessageAction = aws.String(appstream.MessageActionSuppress)
+		}
 	}
 
 	_, err := conn.CreateUserWithContext(ctx, input)
 
+	id := EncodeUserID(userName, authType)
+
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error creating AppStream User (%s): %w", d.Id(), err))
+		return diag.FromErr(fmt.Errorf("error creating AppStream User (%s): %w", id, err))
 	}
 
 	if _, err = waitUserAvailable(ctx, conn, userName, authType); err != nil {
-		return diag.FromErr(fmt.Errorf("error waiting for AppStream User (%s) to be available: %w", d.Id(), err))
+		return diag.FromErr(fmt.Errorf("error waiting for AppStream User (%s) to be available: %w", id, err))
 	}
 
 	// Enabling/disabling workflow
-	if v, ok := d.GetOk("enabled"); ok {
-		if v.(bool) {
-			input := &appstream.EnableUserInput{
-				AuthenticationType: aws.String(authType),
-				UserName:           aws.String(userName),
-			}
-
-			_, err = conn.EnableUserWithContext(ctx, input)
-			if err != nil {
-				return diag.FromErr(fmt.Errorf("error enabling AppStream User (%s): %w", d.Id(), err))
-			}
-		} else {
+	if v, ok := d.GetOkExists("enabled"); ok {
+		if !v.(bool) {
 			input := &appstream.DisableUserInput{
 				AuthenticationType: aws.String(authType),
 				UserName:           aws.String(userName),
 			}
 
 			_, err = conn.DisableUserWithContext(ctx, input)
 			if err != nil {
-				return diag.FromErr(fmt.Errorf("error disabling AppStream User (%s): %w", d.Id(), err))
+				return diag.FromErr(fmt.Errorf("error disabling AppStream User (%s): %w", id, err))
 			}
 		}
 	}
 
-	d.SetId(EncodeUserID(userName, authType))
+	d.SetId(id)
 
 	return resourceUserRead(ctx, d, meta)
 }
@@ -160,7 +154,6 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, meta interfac
 	d.Set("first_name", user.FirstName)
 
 	d.Set("last_name", user.LastName)
-	d.Set("status", user.Status)
 	d.Set("user_name", user.UserName)
 
 	return nil
@@ -196,7 +189,6 @@ func resourceUserUpdate(ctx context.Context, d *schema.ResourceData, meta interf
 				return diag.FromErr(fmt.Errorf("error disabling AppStream User (%s): %w", d.Id(), err))
 			}
 		}
-
 	}
 
 	return nil

internal/service/appstream/stack_user_association.go → internal/service/appstream/user_stack_association.go

@@ -20,6 +20,7 @@ func ResourceUserStackAssociation() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceUserStackAssociationCreate,
 		ReadWithoutTimeout:   resourceUserStackAssociationRead,
+		UpdateWithoutTimeout: schema.NoopContext,
 		DeleteWithoutTimeout: resourceUserStackAssociationDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
@@ -31,6 +32,10 @@ func ResourceUserStackAssociation() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: validation.StringInSlice(appstream.AuthenticationType_Values(), false),
 			},
+			"send_email_notification": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 			"stack_name": {
 				Type:         schema.TypeString,
 				Required:     true,
@@ -55,33 +60,40 @@ func resourceUserStackAssociationCreate(ctx context.Context, d *schema.ResourceD
 		UserName:           aws.String(d.Get("user_name").(string)),
 	}
 
-	var output *appstream.BatchAssociateUserStackOutput
+	if v, ok := d.GetOk("send_email_notification"); ok {
+		input.SendEmailNotification = aws.Bool(v.(bool))
+	}
+
+	id := EncodeStackUserID(d.Get("stack_name").(string), d.Get("user_name").(string), d.Get("authentication_type").(string))
+
 	output, err := conn.BatchAssociateUserStackWithContext(ctx, &appstream.BatchAssociateUserStackInput{
 		UserStackAssociations: []*appstream.UserStackAssociation{input},
 	})
 
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error creating Appstream Stack User Association (%s): %w", d.Id(), err))
+		return diag.FromErr(fmt.Errorf("error creating AppStream User Stack Association (%s): %w", id, err))
 	}
 	if len(output.Errors) > 0 {
 		var errs *multierror.Error
 
 		for _, err := range output.Errors {
 			errs = multierror.Append(errs, fmt.Errorf("%s: %s", aws.StringValue(err.ErrorCode), aws.StringValue(err.ErrorMessage)))
 		}
+		return diag.FromErr(fmt.Errorf("error creating AppStream User Stack Association (%s): %w", id, errs))
+
 	}
 
-	d.SetId(EncodeStackUserID(d.Get("stack_name").(string), d.Get("user_name").(string), d.Get("authentication_type").(string)))
+	d.SetId(id)
 
 	return resourceUserStackAssociationRead(ctx, d, meta)
 }
 
 func resourceUserStackAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	conn := meta.(*conns.AWSClient).AppStreamConn
 
-	stackName, userName, authType, err := DecodeStackUserID(d.Id())
+	userName, stackName, authType, err := DecodeStackUserID(d.Id())
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error decoding id Appstream Stack User Association (%s): %w", d.Id(), err))
+		return diag.FromErr(fmt.Errorf("error decoding id AppStream User Stack Association (%s): %w", d.Id(), err))
 	}
 
 	resp, err := conn.DescribeUserStackAssociationsWithContext(ctx,
@@ -92,13 +104,13 @@ func resourceUserStackAssociationRead(ctx context.Context, d *schema.ResourceDat
 		})
 
 	if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, appstream.ErrCodeResourceNotFoundException) {
-		log.Printf("[WARN] Appstream Stack User Association (%s) not found, removing from state", d.Id())
+		log.Printf("[WARN] AppStream User Stack Association (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil
 	}
 
 	if len(resp.UserStackAssociations) == 0 {
-		log.Printf("[WARN] Appstream User (%s) not found, removing from state", d.Id())
+		log.Printf("[WARN] AppStream User Stack Association (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil
 	}
@@ -115,9 +127,9 @@ func resourceUserStackAssociationRead(ctx context.Context, d *schema.ResourceDat
 func resourceUserStackAssociationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	conn := meta.(*conns.AWSClient).AppStreamConn
 
-	stackName, userName, authType, err := DecodeStackUserID(d.Id())
+	userName, stackName, authType, err := DecodeStackUserID(d.Id())
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error decoding id Appstream Stack User Association (%s): %w", d.Id(), err))
+		return diag.FromErr(fmt.Errorf("error decoding id AppStream User Stack Association (%s): %w", d.Id(), err))
 	}
 
 	input := &appstream.UserStackAssociation{
@@ -134,19 +146,19 @@ func resourceUserStackAssociationDelete(ctx context.Context, d *schema.ResourceD
 		if tfawserr.ErrCodeEquals(err, appstream.ErrCodeResourceNotFoundException) {
 			return nil
 		}
-		return diag.FromErr(fmt.Errorf("error deleting Appstream Stack User Association (%s): %w", d.Id(), err))
+		return diag.FromErr(fmt.Errorf("error deleting AppStream User Stack Association (%s): %w", d.Id(), err))
 	}
 	return nil
 }
 
 func EncodeStackUserID(stackName, userName, authType string) string {
-	return fmt.Sprintf("%s/%s/%s", stackName, userName, authType)
+	return fmt.Sprintf("%s/%s/%s", userName, stackName, authType)
 }
 
 func DecodeStackUserID(id string) (string, string, string, error) {
 	idParts := strings.SplitN(id, "/", 3)
 	if len(idParts) != 3 {
-		return "", "", "", fmt.Errorf("expected ID in format StackName/UserName/AuthenticationType, received: %s", id)
+		return "", "", "", fmt.Errorf("expected ID in format UserName/StackName/AuthenticationType, received: %s", id)
 	}
 	return idParts[0], idParts[1], idParts[2], nil
 }

internal/service/appstream/stack_user_association_test.go → internal/service/appstream/user_stack_association_test.go

@@ -17,15 +17,14 @@ import (
 )
 
 func TestAccAppStreamUserStackAssociation_basic(t *testing.T) {
-	resourceName := "aws_appstream_stack_user_association.test"
+	resourceName := "aws_appstream_user_stack_association.test"
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 	authType := "USERPOOL"
 	rEmail := acctest.RandomEmailAddress("hashicorp.com")
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(t)
-			acctest.PreCheckHasIAMRole(t, "AmazonAppStreamServiceAccess")
 		},
 		ProviderFactories: acctest.ProviderFactories,
 		CheckDestroy:      testAccCheckUserStackAssociationDestroy,
@@ -50,15 +49,14 @@ func TestAccAppStreamUserStackAssociation_basic(t *testing.T) {
 }
 
 func TestAccAppStreamUserStackAssociation_disappears(t *testing.T) {
-	resourceName := "aws_appstream_stack_user_association.test"
+	resourceName := "aws_appstream_user_stack_association.test"
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 	authType := "USERPOOL"
 	rEmail := acctest.RandomEmailAddress("hashicorp.com")
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(t)
-			acctest.PreCheckHasIAMRole(t, "AmazonAppStreamServiceAccess")
 		},
 		ProviderFactories: acctest.ProviderFactories,
 		CheckDestroy:      testAccCheckUserStackAssociationDestroy,
@@ -77,7 +75,7 @@ func TestAccAppStreamUserStackAssociation_disappears(t *testing.T) {
 }
 
 func TestAccAppStreamUserStackAssociation_complete(t *testing.T) {
-	resourceName := "aws_appstream_stack_user_association.test"
+	resourceName := "aws_appstream_user_stack_association.test"
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 	authType := "USERPOOL"
 	rEmail := acctest.RandomEmailAddress("hashicorp.com")
@@ -122,7 +120,7 @@ func testAccCheckUserStackAssociationExists(resourceName string) resource.TestCh
 
 		conn := acctest.Provider.Meta().(*conns.AWSClient).AppStreamConn
 
-		stackName, userName, authType, err := tfappstream.DecodeStackUserID(rs.Primary.ID)
+		userName, stackName, authType, err := tfappstream.DecodeStackUserID(rs.Primary.ID)
 		if err != nil {
 			return fmt.Errorf("error decoding id appstream stack user association (%s): %w", rs.Primary.ID, err)
 		}
@@ -149,11 +147,11 @@ func testAccCheckUserStackAssociationDestroy(s *terraform.State) error {
 	conn := acctest.Provider.Meta().(*conns.AWSClient).AppStreamConn
 
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "aws_appstream_stack_user_association" {
+		if rs.Type != "aws_appstream_user_stack_association" {
 			continue
 		}
 
-		stackName, userName, authType, err := tfappstream.DecodeStackUserID(rs.Primary.ID)
+		userName, stackName, authType, err := tfappstream.DecodeStackUserID(rs.Primary.ID)
 		if err != nil {
 			return fmt.Errorf("error decoding id appstream stack user association (%s): %w", rs.Primary.ID, err)
 		}
@@ -191,7 +189,7 @@ resource "aws_appstream_user" "test" {
   user_name           = %[3]q
 }
 
-resource "aws_appstream_stack_user_association" "test" {
+resource "aws_appstream_user_stack_association" "test" {
   authentication_type = aws_appstream_user.test.authentication_type
   stack_name          = aws_appstream_stack.test.name
   user_name           = aws_appstream_user.test.user_name

internal/service/appstream/user_test.go

@@ -25,7 +25,6 @@ func TestAccAppStreamUser_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(t)
-			acctest.PreCheckHasIAMRole(t, "AmazonAppStreamServiceAccess")
 		},
 		ProviderFactories: acctest.ProviderFactories,
 		CheckDestroy:      testAccCheckUserDestroy,
@@ -39,7 +38,6 @@ func TestAccAppStreamUser_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "user_name", rEmail),
 					acctest.CheckResourceAttrRFC3339(resourceName, "created_time"),
 					resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "status", "FORCE_CHANGE_PASSWORD"),
 				),
 			},
 			{
@@ -61,7 +59,6 @@ func TestAccAppStreamUser_disappears(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(t)
-			acctest.PreCheckHasIAMRole(t, "AmazonAppStreamServiceAccess")
 		},
 		ProviderFactories: acctest.ProviderFactories,
 		CheckDestroy:      testAccCheckUserDestroy,
@@ -98,14 +95,13 @@ func TestAccAppStreamUser_complete(t *testing.T) {
 		ErrorCheck:        acctest.ErrorCheck(t, appstream.EndpointsID),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccUserCompleteConfig(authType, rEmail, firstName, lastName, true),
+				Config: testAccUserCompleteConfig(authType, rEmail, firstName, lastName, false),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckUserExists(resourceName, &userOutput),
 					resource.TestCheckResourceAttr(resourceName, "authentication_type", authType),
 					resource.TestCheckResourceAttr(resourceName, "user_name", rEmail),
 					acctest.CheckResourceAttrRFC3339(resourceName, "created_time"),
-					resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "status", "FORCE_CHANGE_PASSWORD"),
+					resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
 				),
 			},
 			{
@@ -116,7 +112,16 @@ func TestAccAppStreamUser_complete(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "user_name", rEmail),
 					acctest.CheckResourceAttrRFC3339(resourceName, "created_time"),
 					resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "status", "FORCE_CHANGE_PASSWORD"),
+				),
+			},
+			{
+				Config: testAccUserCompleteConfig(authType, rEmail, firstName, lastName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckUserExists(resourceName, &userOutput),
+					resource.TestCheckResourceAttr(resourceName, "authentication_type", authType),
+					resource.TestCheckResourceAttr(resourceName, "user_name", rEmail),
+					acctest.CheckResourceAttrRFC3339(resourceName, "created_time"),
+					resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
 				),
 			},
 			{

internal/service/appstream/wait.go

@@ -25,6 +25,7 @@ const (
 	imageBuilderStateTimeout = 60 * time.Minute
 	// userOperationTimeout Maximum amount of time to wait for User operation eventual consistency
 	userOperationTimeout = 4 * time.Minute
+	userAvailable        = "AVAILABLE"
 )
 
 // waitStackStateDeleted waits for a deleted stack
@@ -169,7 +170,7 @@ func waitImageBuilderStateDeleted(ctx context.Context, conn *appstream.AppStream
 // waitUserAvailable waits for a user be available
 func waitUserAvailable(ctx context.Context, conn *appstream.AppStream, username, authType string) (*appstream.User, error) {
 	stateConf := &resource.StateChangeConf{
-		Target:  []string{"AVAILABLE"},
+		Target:  []string{userAvailable},
 		Refresh: statusUserAvailable(ctx, conn, username, authType),
 		Timeout: userOperationTimeout,
 	}

website/docs/r/appstream_user.html.markdown

@@ -33,6 +33,7 @@ The following arguments are optional:
 * `enabled` - (Optional) Specifies whether the user in the user pool is enabled.
 * `first_name` - (Optional) First name, or given name, of the user.
 * `last_name` - (Optional) Last name, or surname, of the user.
+* `send_email_notification` - (Optional) Send an email notification.
 
 ## Attributes Reference