Support for Non-Rolling patch mode added to database_maintenance_run_resource

Author: govindrao55

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Support for Generic Artifacts Service
 - Support Update `DrgAttachment` of types `Virtual_Circuit`, `RPC` and `IPSec`
 - Support for E3 Flex Notebooks added to `datascience`
+- Support for Non-Rolling patch mode added to `database_maintenance_run_resource`
 
 ## 4.27.0 (May 19, 2021)
 

oci/database_maintenance_run_data_source.go

@@ -88,10 +88,16 @@ func (s *DatabaseMaintenanceRunDataSourceCrud) SetData() error {
 
 	s.D.Set("maintenance_type", s.Res.MaintenanceType)
 
+	if s.Res.PatchFailureCount != nil {
+		s.D.Set("patch_failure_count", *s.Res.PatchFailureCount)
+	}
+
 	if s.Res.PatchId != nil {
 		s.D.Set("patch_id", *s.Res.PatchId)
 	}
 
+	s.D.Set("patching_mode", s.Res.PatchingMode)
+
 	if s.Res.PeerMaintenanceRunId != nil {
 		s.D.Set("peer_maintenance_run_id", *s.Res.PeerMaintenanceRunId)
 	}

oci/database_maintenance_run_resource.go

@@ -51,6 +51,11 @@ func DatabaseMaintenanceRunResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"patching_mode": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"time_scheduled": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -83,6 +88,10 @@ func DatabaseMaintenanceRunResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"patch_failure_count": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"peer_maintenance_run_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -146,6 +155,10 @@ type DatabaseMaintenanceRunResourceCrud struct {
 	DisableNotFoundRetries bool
 }
 
+type DatabaseMaintenanceUpdateResource struct {
+	Details *oci_database.UpdateMaintenanceRunDetails
+}
+
 func (s *DatabaseMaintenanceRunResourceCrud) ID() string {
 	return *s.Res.Id
 }
@@ -201,6 +214,10 @@ func (s *DatabaseMaintenanceRunResourceCrud) Create() error {
 		request.PatchId = &tmp
 	}
 
+	if patchingMode, ok := s.D.GetOkExists("patching_mode"); ok {
+		request.PatchingMode = oci_database.UpdateMaintenanceRunDetailsPatchingModeEnum(patchingMode.(string))
+	}
+
 	if timeScheduled, ok := s.D.GetOkExists("time_scheduled"); ok {
 		tmp, err := time.Parse(time.RFC3339, timeScheduled.(string))
 		if err != nil {
@@ -243,26 +260,31 @@ func (s *DatabaseMaintenanceRunResourceCrud) Get() error {
 }
 
 func (s *DatabaseMaintenanceRunResourceCrud) Update() error {
+
 	request := oci_database.UpdateMaintenanceRunRequest{}
 
-	if isEnabled, ok := s.D.GetOkExists("is_enabled"); ok {
+	if isEnabled, ok := s.D.GetOkExists("is_enabled"); ok && s.D.HasChange("is_enabled") {
 		tmp := isEnabled.(bool)
 		request.IsEnabled = &tmp
 	}
 
-	if isPatchNowEnabled, ok := s.D.GetOkExists("is_patch_now_enabled"); ok {
+	if isPatchNowEnabled, ok := s.D.GetOkExists("is_patch_now_enabled"); ok && s.D.HasChange("is_patch_now_enabled") {
 		tmp := isPatchNowEnabled.(bool)
 		request.IsPatchNowEnabled = &tmp
 	}
 
 	tmp := s.D.Id()
 	request.MaintenanceRunId = &tmp
 
-	if patchId, ok := s.D.GetOkExists("patch_id"); ok {
+	if patchId, ok := s.D.GetOkExists("patch_id"); ok && s.D.HasChange("patchId") {
 		tmp := patchId.(string)
 		request.PatchId = &tmp
 	}
 
+	if patchingMode, ok := s.D.GetOkExists("patching_mode"); ok && s.D.HasChange("patching_mode") {
+		request.PatchingMode = oci_database.UpdateMaintenanceRunDetailsPatchingModeEnum(patchingMode.(string))
+	}
+
 	if timeScheduled, ok := s.D.GetOkExists("time_scheduled"); ok {
 		tmp, err := time.Parse(time.RFC3339, timeScheduled.(string))
 		if err != nil {
@@ -273,13 +295,18 @@ func (s *DatabaseMaintenanceRunResourceCrud) Update() error {
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
 
-	response, err := s.Client.UpdateMaintenanceRun(context.Background(), request)
+	_, err := s.Client.UpdateMaintenanceRun(context.Background(), request)
 	if err != nil {
 		return err
 	}
-
-	s.Res = &response.MaintenanceRun
-	return nil
+	// Workaround: Sleep for some time before polling the configuration. Because update happens asynchronously, polling too
+	// soon may result in service returning stale configuration values.
+	time.Sleep(time.Second * 10)
+
+	// Requests to update may succeed instantly but may not see the actual update take effect
+	// until minutes later. Add polling here to return only when the change has taken effect.
+	maintenanceRunUpdatePatchingModeFunc := func() bool { return s.Res.LifecycleState != oci_database.MaintenanceRunLifecycleStateUpdating }
+	return WaitForResourceCondition(s, maintenanceRunUpdatePatchingModeFunc, s.D.Timeout(schema.TimeoutUpdate))
 }
 
 func (s *DatabaseMaintenanceRunResourceCrud) SetData() error {
@@ -303,10 +330,16 @@ func (s *DatabaseMaintenanceRunResourceCrud) SetData() error {
 
 	s.D.Set("maintenance_type", s.Res.MaintenanceType)
 
+	if s.Res.PatchFailureCount != nil {
+		s.D.Set("patch_failure_count", *s.Res.PatchFailureCount)
+	}
+
 	if s.Res.PatchId != nil {
 		s.D.Set("patch_id", *s.Res.PatchId)
 	}
 
+	s.D.Set("patching_mode", s.Res.PatchingMode)
+
 	if s.Res.PeerMaintenanceRunId != nil {
 		s.D.Set("peer_maintenance_run_id", *s.Res.PeerMaintenanceRunId)
 	}

oci/database_maintenance_run_test.go

@@ -31,10 +31,11 @@ var (
 
 	maintenanceRunRepresentation = map[string]interface{}{
 		"maintenance_run_id":   Representation{repType: Required, create: `${var.maintenance_run_id}`},
-		"is_enabled":           Representation{repType: Required, create: `false`, update: `true`},
-		"is_patch_now_enabled": Representation{repType: Optional, update: `true`},
+		"is_enabled":           Representation{repType: Required, create: `true`},
+		"is_patch_now_enabled": Representation{repType: Optional},
 		"patch_id":             Representation{repType: Optional, create: `${var.maintenance_run_patch_id}`},
-		"time_scheduled":       Representation{repType: Optional, create: mrTimeScheduledCreate.Format(time.RFC3339Nano), update: mrTimeScheduledUpdate.Format(time.RFC3339Nano)},
+		"patching_mode":        Representation{repType: Optional, create: `ROLLING`, update: `NONROLLING`},
+		"time_scheduled":       Representation{repType: Required, create: mrTimeScheduledCreate.Format(time.RFC3339Nano), update: mrTimeScheduledUpdate.Format(time.RFC3339Nano)},
 	}
 
 	MaintenanceRunResourceDependencies = ""
@@ -90,6 +91,7 @@ func TestDatabaseMaintenanceRunResource_basic(t *testing.T) {
 			{
 				Config: config + compartmentIdVariableStr + maintenanceRunIdVariableStr + patchIdVariableStr + MaintenanceRunResourceDependencies,
 			},
+
 			// verify create with optionals
 			{
 				Config: config + compartmentIdVariableStr + maintenanceRunIdVariableStr + patchIdVariableStr + MaintenanceRunResourceDependencies +
@@ -98,9 +100,10 @@ func TestDatabaseMaintenanceRunResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "display_name"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "is_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 					resource.TestCheckResourceAttrSet(resourceName, "maintenance_run_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "patch_id"),
+					resource.TestCheckResourceAttr(resourceName, "patching_mode", "ROLLING"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttr(resourceName, "time_scheduled", mrTimeScheduledCreate.Format(time.RFC3339Nano)),
 
@@ -128,8 +131,9 @@ func TestDatabaseMaintenanceRunResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "is_patch_now_enabled", "true"),
 					resource.TestCheckResourceAttrSet(resourceName, "maintenance_run_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "patch_id"),
+					resource.TestCheckResourceAttr(resourceName, "patching_mode", "NONROLLING"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
-					resource.TestCheckResourceAttr(resourceName, "time_scheduled", mrTimeScheduledUpdate.Format(time.RFC3339Nano)),
+					resource.TestCheckResourceAttrSet(resourceName, "time_scheduled"),
 
 					func(s *terraform.State) (err error) {
 						resId2, err = fromInstanceState(s, resourceName, "id")
@@ -154,6 +158,9 @@ func TestDatabaseMaintenanceRunResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "maintenance_subtype"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "maintenance_type"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "patch_failure_count"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "patching_mode", "NONROLLING"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "peer_maintenance_run_id"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "target_resource_type"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_scheduled"),

oci/database_maintenance_runs_data_source.go

@@ -157,10 +157,16 @@ func (s *DatabaseMaintenanceRunsDataSourceCrud) SetData() error {
 
 		maintenanceRun["maintenance_type"] = r.MaintenanceType
 
+		if r.PatchFailureCount != nil {
+			maintenanceRun["patch_failure_count"] = *r.PatchFailureCount
+		}
+
 		if r.PatchId != nil {
 			maintenanceRun["patch_id"] = *r.PatchId
 		}
 
+		maintenanceRun["patching_mode"] = r.PatchingMode
+
 		if r.PeerMaintenanceRunId != nil {
 			maintenanceRun["peer_maintenance_run_id"] = *r.PeerMaintenanceRunId
 		}

website/docs/d/database_autonomous_database.html.markdown

@@ -96,7 +96,7 @@ The following attributes are exported:
 * `private_endpoint_label` - The private endpoint label for the resource.
 * `refreshable_mode` - The refresh mode of the clone. AUTOMATIC indicates that the clone is automatically being refreshed with data from the source Autonomous Database.
 * `refreshable_status` - The refresh status of the clone. REFRESHING indicates that the clone is currently being refreshed with data from the source Autonomous Database.
-* `role` - The Data Guard role of the Autonomous Container Database, if Autonomous Data Guard is enabled. 
+* `role` - The Data Guard role of the Autonomous Container Database, if Autonomous Data Guard is enabled.
 * `service_console_url` - The URL of the Service Console for the Autonomous Database.
 * `source_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the source Autonomous Database that was cloned to create the current Autonomous Database.
 * `standby_db` - Autonomous Data Guard standby database details. 

website/docs/d/database_autonomous_databases.html.markdown

@@ -122,8 +122,7 @@ The following attributes are exported:
 * `private_endpoint_label` - The private endpoint label for the resource.
 * `refreshable_mode` - The refresh mode of the clone. AUTOMATIC indicates that the clone is automatically being refreshed with data from the source Autonomous Database.
 * `refreshable_status` - The refresh status of the clone. REFRESHING indicates that the clone is currently being refreshed with data from the source Autonomous Database.
-* `role` - The Data Guard role of the Autonomous Container Database, if Autonomous Data Guard is enabled. 
-* `service_console_url` - The URL of the Service Console for the Autonomous Database.
+* `role` - The Data Guard role of the Autonomous Container Database, if Autonomous Data Guard is enabled.
 * `source_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the source Autonomous Database that was cloned to create the current Autonomous Database.
 * `standby_db` - Autonomous Data Guard standby database details. 
 	* `lag_time_in_seconds` - The amount of time, in seconds, that the data of the standby database lags the data of the primary database. Can be used to determine the potential data loss in the event of a failover.

website/docs/d/database_autonomous_databases_clones.html.markdown

@@ -112,7 +112,7 @@ The following attributes are exported:
 * `private_endpoint_label` - The private endpoint label for the resource. Setting this to an empty string, after the private endpoint database gets created, will change the same private endpoint database to the public endpoint database.
 * `refreshable_mode` - The refresh mode of the clone. AUTOMATIC indicates that the clone is automatically being refreshed with data from the source Autonomous Database.
 * `refreshable_status` - The refresh status of the clone. REFRESHING indicates that the clone is currently being refreshed with data from the source Autonomous Database.
-* `role` - The Data Guard role of the Autonomous Container Database, if Autonomous Data Guard is enabled. 
+* `role` - The Data Guard role of the Autonomous Container Database, if Autonomous Data Guard is enabled.
 * `service_console_url` - The URL of the Service Console for the Autonomous Database.
 * `source_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the source Autonomous Database that was cloned to create the current Autonomous Database.
 * `standby_db` - Autonomous Data Guard standby database details. 

website/docs/d/database_maintenance_run.html.markdown

@@ -39,7 +39,9 @@ The following attributes are exported:
 * `lifecycle_details` - Additional information about the current lifecycle state.
 * `maintenance_subtype` - Maintenance sub-type.
 * `maintenance_type` - Maintenance type.
+* `patch_failure_count` - Contain the patch failure count.
 * `patch_id` - The unique identifier of the patch. The identifier string includes the patch type, the Oracle Database version, and the patch creation date (using the format YYMMDD). For example, the identifier `ru_patch_19.9.0.0_201030` is used for an RU patch for Oracle Database 19.9.0.0 that was released October 30, 2020.
+* `patching_mode` - Maintenance method, it will be either "ROLLING" or "NONROLLING". Default value is ROLLING.
 * `peer_maintenance_run_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the maintenance run for the Autonomous Data Guard association's peer container database.
 * `state` - The current state of the maintenance run. For Autonomous Database on shared Exadata infrastructure, valid states are IN_PROGRESS, SUCCEEDED and FAILED. 
 * `target_resource_id` - The ID of the target resource on which the maintenance run occurs.

website/docs/d/database_maintenance_runs.html.markdown

@@ -58,7 +58,9 @@ The following attributes are exported:
 * `lifecycle_details` - Additional information about the current lifecycle state.
 * `maintenance_subtype` - Maintenance sub-type.
 * `maintenance_type` - Maintenance type.
+* `patch_failure_count` - Contain the patch failure count.
 * `patch_id` - The unique identifier of the patch. The identifier string includes the patch type, the Oracle Database version, and the patch creation date (using the format YYMMDD). For example, the identifier `ru_patch_19.9.0.0_201030` is used for an RU patch for Oracle Database 19.9.0.0 that was released October 30, 2020.
+* `patching_mode` - Maintenance method, it will be either "ROLLING" or "NONROLLING". Default value is ROLLING.
 * `peer_maintenance_run_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the maintenance run for the Autonomous Data Guard association's peer container database.
 * `state` - The current state of the maintenance run. For Autonomous Database on shared Exadata infrastructure, valid states are IN_PROGRESS, SUCCEEDED and FAILED. 
 * `target_resource_id` - The ID of the target resource on which the maintenance run occurs.