Add 'TestAccCognitoIDPManagedLoginBranding_updateFromBasic'.

Author: ewbankkit

internal/service/cognitoidp/managed_login_branding.go

@@ -17,7 +17,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
@@ -78,11 +77,9 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou
 				Validators: []validator.Bool{
 					boolvalidator.ExactlyOneOf(
 						path.MatchRoot("settings"),
+						path.MatchRoot("use_cognito_provided_values"),
 					),
 				},
-				PlanModifiers: []planmodifier.Bool{
-					boolplanmodifier.UseStateForUnknown(),
-				},
 			},
 			names.AttrUserPoolID: schema.StringAttribute{
 				Required: true,
@@ -316,13 +313,20 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou
 	}
 
 	// Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api.
-	oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings)
-	patch, err := tfjson.CreateMergePatchFromStrings(oldSettings, newSettings)
+	var patch string
+	var err error
+	if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); oldSettings != "" {
+		patch, err = tfjson.CreateMergePatchFromStrings(oldSettings, newSettings)
 
-	if err != nil {
-		response.Diagnostics.AddError("creating JSON merge patch", err.Error())
+		if err != nil {
+			response.Diagnostics.AddError("creating JSON merge patch", err.Error())
 
-		return
+			return
+		}
+		input.UseCognitoProvidedValues = false
+	} else if newSettings != "" {
+		patch = newSettings
+		input.UseCognitoProvidedValues = false
 	}
 
 	input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument)
@@ -356,6 +360,7 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou
 		return
 	}
 	new.SettingsAll = settingsAll
+	new.UseCognitoProvidedValues = fwflex.BoolValueToFramework(ctx, mlb.UseCognitoProvidedValues)
 
 	response.Diagnostics.Append(response.State.Set(ctx, &new)...)
 }

internal/service/cognitoidp/managed_login_branding_test.go

@@ -163,6 +163,52 @@ func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) {
 	})
 }
 
+func TestAccCognitoIDPManagedLoginBranding_updateFromBasic(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_basic(rName),
+				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.Null()),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(true)),
+				},
+			},
+			{
+				Config: testAccManagedLoginBrandingConfig_settings(rName),
+				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)