Add 'TestAccCognitoIDPManagedLoginBranding_updateSettings'.

Author: ewbankkit

internal/service/cognitoidp/managed_login_branding.go

@@ -30,7 +30,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/framework"
 	fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
 	fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
-	tfjson "github.com/hashicorp/terraform-provider-aws/internal/json"
 	tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	inttypes "github.com/hashicorp/terraform-provider-aws/internal/types"
@@ -312,38 +311,17 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou
 		return
 	}
 
-	if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); newSettings != oldSettings {
-		if oldSettings == "" {
-			var err error
-			input.Settings, err = tfsmithy.DocumentFromJSONString(newSettings, document.NewLazyDocument)
+	if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); newSettings != oldSettings && newSettings != "" {
+		var err error
+		input.Settings, err = tfsmithy.DocumentFromJSONString(newSettings, document.NewLazyDocument)
 
-			if err != nil {
-				response.Diagnostics.AddError("creating Smithy document", err.Error())
-
-				return
-			}
-
-			input.UseCognitoProvidedValues = false
-		} else if newSettings != "" {
-			// Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api.
-			patch, err := tfjson.CreateMergePatchFromStrings(oldSettings, newSettings)
-
-			if err != nil {
-				response.Diagnostics.AddError("creating JSON merge patch", err.Error())
-
-				return
-			}
-
-			input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument)
-
-			if err != nil {
-				response.Diagnostics.AddError("creating Smithy document", err.Error())
-
-				return
-			}
+		if err != nil {
+			response.Diagnostics.AddError("creating Smithy document", err.Error())
 
-			input.UseCognitoProvidedValues = false
+			return
 		}
+
+		input.UseCognitoProvidedValues = false
 	}
 
 	_, err := conn.UpdateManagedLoginBranding(ctx, &input)

internal/service/cognitoidp/managed_login_branding_test.go

@@ -138,7 +138,7 @@ func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) {
 		CheckDestroy:             testAccCheckManagedLoginBrandingDestroy(ctx),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccManagedLoginBrandingConfig_settings(rName),
+				Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v),
 				),
@@ -191,7 +191,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateFromBasic(t *testing.T) {
 				},
 			},
 			{
-				Config: testAccManagedLoginBrandingConfig_settings(rName),
+				Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v),
 				),
@@ -222,7 +222,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateToBasic(t *testing.T) {
 		CheckDestroy:             testAccCheckManagedLoginBrandingDestroy(ctx),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccManagedLoginBrandingConfig_settings(rName),
+				Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v),
 				),
@@ -255,6 +255,52 @@ func TestAccCognitoIDPManagedLoginBranding_updateToBasic(t *testing.T) {
 	})
 }
 
+func TestAccCognitoIDPManagedLoginBranding_updateSettings(t *testing.T) {
+	ctx := acctest.Context(t)
+	var v awstypes.ManagedLoginBrandingType
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	resourceName := "aws_cognito_managed_login_branding.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, names.CognitoIDPServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckManagedLoginBrandingDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v),
+				),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate),
+					},
+				},
+				ConfigStateChecks: []statecheck.StateCheck{
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)),
+				},
+			},
+			{
+				Config: testAccManagedLoginBrandingConfig_settings(rName, "DARK"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v),
+				),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
+					},
+				},
+				ConfigStateChecks: []statecheck.StateCheck{
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)),
+				},
+			},
+		},
+	})
+}
+
 func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx)
@@ -345,8 +391,8 @@ resource "aws_cognito_managed_login_branding" "test" {
 `)
 }
 
-func testAccManagedLoginBrandingConfig_settings(rName string) string {
-	return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), `
+func testAccManagedLoginBrandingConfig_settings(rName, colorScheme string) string {
+	return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), fmt.Sprintf(`
 resource "aws_cognito_managed_login_branding" "test" {
   client_id    = aws_cognito_user_pool_client.test.id
   user_pool_id = aws_cognito_user_pool.test.id
@@ -387,7 +433,7 @@ resource "aws_cognito_managed_login_branding" "test" {
         "sessionTimerDisplay" : "NONE"
       },
       "global" : {
-        "colorSchemeMode" : "LIGHT",
+        "colorSchemeMode" : %[1]q,
         "pageFooter" : {
           "enabled" : false
         },
@@ -804,5 +850,5 @@ resource "aws_cognito_managed_login_branding" "test" {
     }
   })
 }
-`)
+`, colorScheme))
 }