BugFix Scheduled Operations optional computed value removal

karthikoracle1993 · ravinitp · commit 4cd924110768 · 2025-04-25T16:04:19.000+05:30
diff --git a/internal/integrationtest/database_autonomous_database_resource_test.go b/internal/integrationtest/database_autonomous_database_resource_test.go
@@ -4687,7 +4687,7 @@ func TestDatabaseAutonomousDatabaseResource_DeveloperDatabases(t *testing.T) {
 		t.Skip("Skipping TestDatabaseAutonomousDatabase_opsi_dbms test.\n" + "Current TF_VAR_should_skip_adbs_test=" + shouldSkipADBStest)
 	}
 
-	httpreplay.SetScenario("TestDatabaseAutonomousDatabaseResource_scheduledOperations")
+	httpreplay.SetScenario("TestDatabaseAutonomousDatabaseResource_DeveloperDatabases")
 	defer httpreplay.SaveScenario()
 
 	config := acctest.ProviderTestConfig()
@@ -5011,6 +5011,46 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
 				},
 			),
 		},
+		//test to verify if the plan fails.
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
+					acctest.RepresentationCopyWithNewProperties(autonomousDatabaseRepresentationForScheduledOperations,
+						map[string]interface{}{
+							"enable_delete_scheduled_operations": acctest.Representation{RepType: acctest.Optional, Create: `true`},
+						})),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
+				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				// verify computed field db_workload to be defaulted to OLTP
+				resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
+				func(s *terraform.State) (err error) {
+					_, err = acctest.FromInstanceState(s, resourceName, "id")
+					return err
+				},
+			),
+		},
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
+					acctest.RepresentationCopyWithNewProperties(autonomousDatabaseRepresentationForScheduledOperations,
+						map[string]interface{}{
+							"enable_delete_scheduled_operations": acctest.Representation{RepType: acctest.Optional, Create: `true`},
+							"cpu_core_count":                     acctest.Representation{RepType: acctest.Optional, Create: `10`},
+						})),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
+				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				// verify computed field db_workload to be defaulted to OLTP
+				resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
+				resource.TestCheckResourceAttr(resourceName, "scheduled_operations.#", "0"),
+				resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "10"),
+				func(s *terraform.State) (err error) {
+					_, err = acctest.FromInstanceState(s, resourceName, "id")
+					return err
+				},
+			),
+		},
 	})
 }
 
@@ -5021,7 +5061,7 @@ func TestDatabaseAutonomousDatabaseResource_dbTools(t *testing.T) {
 		t.Skip("Skipping TestDatabaseAutonomousDatabaseResource_dbTools test.\n" + "Current TF_VAR_should_skip_adbs_test=" + shouldSkipADBStest)
 	}
 
-	httpreplay.SetScenario("TestDatabaseAutonomousDatabaseResource_scheduledOperations")
+	httpreplay.SetScenario("TestDatabaseAutonomousDatabaseResource_dbTools")
 	defer httpreplay.SaveScenario()
 
 	config := acctest.ProviderTestConfig()
diff --git a/internal/service/database/database_autonomous_database_resource.go b/internal/service/database/database_autonomous_database_resource.go
@@ -222,6 +222,11 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
 					},
 				},
 			},
+			// Optional
+			"enable_delete_scheduled_operations": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 			"db_version": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -518,16 +523,17 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
 				},
 			},
 			"scheduled_operations": {
-				Type:     schema.TypeSet,
-				Set:      scheduledOperationsForSets,
-				Optional: true,
-				Computed: true,
+				Type:             schema.TypeSet,
+				Set:              scheduledOperationsForSets,
+				Optional:         true,
+				Computed:         true,
+				DiffSuppressFunc: tfresource.ScheduledOperationDbSuppressfunc,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						// Required
 						"day_of_week": {
 							Type:     schema.TypeList,
-							Required: true,
+							Optional: true,
 							MaxItems: 1,
 							MinItems: 1,
 							Elem: &schema.Resource{
@@ -2153,6 +2159,12 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) Update() error {
 			request.ScheduledOperations = tmp
 		}
 	}
+	if enableDeleteScheduledOps, ok := s.D.GetOkExists("enable_delete_scheduled_operations"); ok && s.D.HasChange("enable_delete_scheduled_operations") {
+		_, scheduledOpsOk := s.D.GetOkExists("scheduled_operations")
+		if enableDeleteScheduledOps == true && scheduledOpsOk {
+			request.ScheduledOperations = []oci_database.ScheduledOperationDetails{}
+		}
+	}
 
 	if dbToolsDetails, ok := s.D.GetOkExists("db_tools_details"); ok && s.D.HasChange("db_tools_details") {
 		set := dbToolsDetails.(*schema.Set)
diff --git a/internal/tfresource/crud_helpers.go b/internal/tfresource/crud_helpers.go
@@ -1461,3 +1461,10 @@ func ValidateBoolInSlice(valid []bool) schema.SchemaValidateFunc {
 		return
 	}
 }
+func ScheduledOperationDbSuppressfunc(k string, old, new string, d *schema.ResourceData) bool {
+	enableSchduledOpDelete, _ := d.GetOkExists("enable_delete_scheduled_operations")
+	if enableSchduledOpDelete.(bool) {
+		return true
+	}
+	return false
+}
diff --git a/website/docs/d/database_autonomous_database.html.markdown b/website/docs/d/database_autonomous_database.html.markdown
@@ -262,7 +262,8 @@ AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8
 * `resource_pool_summary` - The configuration details for resource pool
     * `is_disabled` - Indicates if the resource pool should be deleted for the Autonomous Database.  
     * `pool_size` - Resource pool size.
-* `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled. 
+* `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled.
+* `enable_delete_scheduled_operations` - If omitted or set to false the provider will not delete scheduled_operations from the Autonomous Database. If set to true, provider will delete scheduled_operations from the Autonomous Database. 
 * `scheduled_operations` - The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime.
 
 	This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. 
diff --git a/website/docs/d/database_autonomous_databases.html.markdown b/website/docs/d/database_autonomous_databases.html.markdown
@@ -293,6 +293,7 @@ AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8
 	* `is_disabled` - Indicates if the resource pool should be deleted for the Autonomous Database.
 	* `pool_size` - Resource pool size.
 * `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled.
+* `enable_delete_scheduled_operations` - If omitted or set to false the provider will not delete scheduled_operations from the Autonomous Database. If set to true, provider will delete scheduled_operations from the Autonomous Database.
 * `scheduled_operations` - The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime.
 
   This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier.
diff --git a/website/docs/d/database_autonomous_databases_clones.html.markdown b/website/docs/d/database_autonomous_databases_clones.html.markdown
@@ -282,6 +282,7 @@ AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8
 	* `is_disabled` - Indicates if the resource pool should be deleted for the Autonomous Database.
 	* `pool_size` - Resource pool size.
 * `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled.
+* `enable_delete_scheduled_operations` - If omitted or set to false the provider will not delete scheduled_operations from the Autonomous Database. If set to true, provider will delete scheduled_operations from the Autonomous Database.
 * `scheduled_operations` - The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime.
 
   This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier.
diff --git a/website/docs/r/database_autonomous_database.html.markdown b/website/docs/r/database_autonomous_database.html.markdown
@@ -280,6 +280,7 @@ The following arguments are supported:
 * `resource_pool_summary` - (Optional) (Updatable) The configuration details for resource pool
 	* `is_disabled` - (Optional) (Updatable) Indicates if the resource pool should be deleted for the Autonomous Database.  
 	* `pool_size` - (Optional) (Updatable) Resource pool size.
+* `enable_delete_scheduled_operations` - If omitted or set to false the provider will not delete scheduled_operations from the Autonomous Database. If set to true, provider will delete scheduled_operations from the Autonomous Database.
 * `scheduled_operations` - (Optional) (Updatable) The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime.
 
 	This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. 
@@ -579,6 +580,7 @@ AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8
     * `is_snapshot_standby` - Indicates if user wants to convert to a snapshot standby. For example, true would set a standby database to snapshot standby database. False would set a snapshot standby database back to regular standby database. 
     * `time_snapshot_standby_enabled_till` - Time and date stored as an RFC 3339 formatted timestamp string. For example, 2022-01-01T12:00:00.000Z would set a limit for the snapshot standby to be converted back to a cross-region standby database.
 * `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled. 
+* `enable_delete_scheduled_operations` - If omitted or set to false the provider will not delete scheduled_operations from the Autonomous Database. If set to true, provider will delete scheduled_operations from the Autonomous Database.
 * `scheduled_operations` - The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime.
 
 	This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. 
diff --git a/website/docs/r/database_autonomous_database_saas_admin_user.html.markdown b/website/docs/r/database_autonomous_database_saas_admin_user.html.markdown
@@ -246,7 +246,8 @@ The following attributes are exported:
 * `resource_pool_summary` - The configuration details for resource pool
 	* `is_disabled` - Indicates if the resource pool should be deleted for the Autonomous Database.  
 	* `pool_size` - Resource pool size.
-* `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled. 
+* `role` - The Data Guard role of the Autonomous Container Database or Autonomous Database, if Autonomous Data Guard is enabled.
+* `enable_delete_scheduled_operations` - If omitted or set to false the provider will not delete scheduled_operations from the Autonomous Database. If set to true, provider will delete scheduled_operations from the Autonomous Database.
 * `scheduled_operations` - The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime.
 
 	This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. 

Original file line number	Diff line number	Diff line change
`@@ -1461,3 +1461,10 @@ func ValidateBoolInSlice(valid []bool) schema.SchemaValidateFunc {`
`1461`	`1461`	`return`
`1462`	`1462`	`}`
`1463`	`1463`	`}`
	`1464`	`+func ScheduledOperationDbSuppressfunc(k string, old, new string, d *schema.ResourceData) bool {`
	`1465`	`+ enableSchduledOpDelete, _ := d.GetOkExists("enable_delete_scheduled_operations")`
	`1466`	`+ if enableSchduledOpDelete.(bool) {`
	`1467`	`+ return true`
	`1468`	`+ }`
	`1469`	`+ return false`
	`1470`	`+}`