Ensure scheduler configuration is disabled when the argument is removed

Author: tabito-hara

internal/service/emrserverless/application.go

@@ -232,7 +232,6 @@ func resourceApplication() *schema.Resource {
 			"scheduler_configuration": {
 				Type:     schema.TypeList,
 				Optional: true,
-				Computed: true,
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -379,7 +378,7 @@ func resourceApplicationRead(ctx context.Context, d *schema.ResourceData, meta a
 		return sdkdiag.AppendErrorf(diags, "setting network_configuration: %s", err)
 	}
 
-	if err := d.Set("scheduler_configuration", []any{flattenSchedulerConfiguration(application.SchedulerConfiguration)}); err != nil {
+	if err := d.Set("scheduler_configuration", flattenSchedulerConfiguration(application.SchedulerConfiguration)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "setting scheduler_configuration: %s", err)
 	}
 
@@ -432,6 +431,8 @@ func resourceApplicationUpdate(ctx context.Context, d *schema.ResourceData, meta
 
 		if v, ok := d.GetOk("scheduler_configuration"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil {
 			input.SchedulerConfiguration = expandSchedulerConfiguration(v.([]any)[0].(map[string]any))
+		} else {
+			input.SchedulerConfiguration = &types.SchedulerConfiguration{}
 		}
 
 		if v, ok := d.GetOk("release_label"); ok {
@@ -915,7 +916,7 @@ func expandSchedulerConfiguration(tfMap map[string]any) *types.SchedulerConfigur
 	return apiObject
 }
 
-func flattenSchedulerConfiguration(apiObject *types.SchedulerConfiguration) map[string]any {
+func flattenSchedulerConfiguration(apiObject *types.SchedulerConfiguration) []any {
 	if apiObject == nil {
 		return nil
 	}
@@ -928,5 +929,5 @@ func flattenSchedulerConfiguration(apiObject *types.SchedulerConfiguration) map[
 	if v := apiObject.QueueTimeoutMinutes; v != nil {
 		tfMap["queue_timeout_minutes"] = aws.ToInt32(v)
 	}
-	return tfMap
+	return []any{tfMap}
 }

internal/service/emrserverless/application_test.go

@@ -483,13 +483,11 @@ func TestAccEMRServerlessApplication_schedulerConfiguration(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "scheduler_configuration.0.queue_timeout_minutes", "120"),
 				),
 			},
-			{
+			{ // When `scheduler_configuration` is removed,  scheduler configuration is disabled
 				Config: testAccApplicationConfig_basic(rName, "emr-7.1.0"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckApplicationExists(ctx, t, resourceName, &application),
-					resource.TestCheckResourceAttr(resourceName, "scheduler_configuration.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "scheduler_configuration.0.max_concurrent_runs", "20"),
-					resource.TestCheckResourceAttr(resourceName, "scheduler_configuration.0.queue_timeout_minutes", "120"),
+					resource.TestCheckResourceAttr(resourceName, "scheduler_configuration.#", "0"),
 				),
 			},
 		},