Bug Fix - OS Management Hub: unregister managed instance on resource deletion

Author: Zhigang Wang

internal/integrationtest/os_management_hub_managed_instance_test.go

@@ -20,8 +20,6 @@ import (
 var (
 	OsManagementHubManagedInstanceRequiredOnlyResource = acctest.GenerateResourceFromRepresentationMap("oci_os_management_hub_managed_instance", "test_managed_instance", acctest.Required, acctest.Create, OsManagementHubManagedInstanceRepresentation)
 
-	//OsManagementHubManagedInstanceResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_os_management_hub_managed_instance", "test_managed_instance", acctest.Optional, acctest.Update, OsManagementHubManagedInstanceRepresentation)
-
 	OsManagementHubManagedInstanceSingularDataSourceRepresentation = map[string]interface{}{
 		"managed_instance_id": acctest.Representation{RepType: acctest.Required, Create: utils.GetEnvSettingWithBlankDefault("osmh_managed_instance_ocid")},
 	}
@@ -44,7 +42,7 @@ var (
 		"location_not_equal_to":                   acctest.Representation{RepType: acctest.Optional, Create: []string{`OCI_COMPUTE`}},
 		"managed_instance_id":                     acctest.Representation{RepType: acctest.Optional, Create: utils.GetEnvSettingWithBlankDefault("osmh_managed_instance_ocid")},
 		"os_family":                               acctest.Representation{RepType: acctest.Optional, Create: []string{`ORACLE_LINUX_8`}},
-		"software_source_id":                      acctest.Representation{RepType: acctest.Optional, Create: utils.GetEnvSettingWithBlankDefault("osmh_software_source_ocid")},
+		"software_source_id":                      acctest.Representation{RepType: acctest.Optional, Create: ``},
 		"status":                                  acctest.Representation{RepType: acctest.Optional, Create: []string{`NORMAL`}},
 		"agent_version":                           acctest.Representation{RepType: acctest.Optional, Create: `agentVersion`},
 		"management_station":                      acctest.Representation{RepType: acctest.Optional, Create: []string{`oci_os_management_hub_management_station.test_management_station.id`}},
@@ -115,16 +113,15 @@ func TestOsManagementHubManagedInstanceResource_basic(t *testing.T) {
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
-				"managed_instance_id", "time_last_boot", "time_last_checkin",
+				"managed_instance_id", "time_last_boot", "time_last_checkin", "time_updated",
 			},
 			ResourceName: resourceName,
 		},
-
-		//delete before next Create
+		// delete before next Create
 		{
 			Config: config + compartmentIdVariableStr,
 		},
-		//// verify Create with optionals
+		// verify Create with optionals
 		{
 			Config: config + compartmentIdVariableStr +
 				acctest.GenerateResourceFromRepresentationMap("oci_os_management_hub_managed_instance", "test_managed_instance", acctest.Optional, acctest.Create, OsManagementHubManagedInstanceRepresentation),
@@ -174,8 +171,7 @@ func TestOsManagementHubManagedInstanceResource_basic(t *testing.T) {
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_os_management_hub_managed_instances", "test_managed_instances", acctest.Optional, acctest.Update, OsManagementHubManagedInstanceDataSourceRepresentation) +
-				compartmentIdVariableStr +
-				acctest.GenerateResourceFromRepresentationMap("oci_os_management_hub_managed_instance", "test_managed_instance", acctest.Optional, acctest.Update, OsManagementHubManagedInstanceRepresentation),
+				compartmentIdVariableStr,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(datasourceName, "advisory_name.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "agent_version", "agentVersion"),
@@ -196,7 +192,6 @@ func TestOsManagementHubManagedInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "management_station.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "management_station_not_equal_to.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "os_family.#", "1"),
-				//resource.TestCheckResourceAttrSet(datasourceName, "software_source_id"),
 				resource.TestCheckResourceAttr(datasourceName, "status.#", "1"),
 
 				resource.TestCheckResourceAttr(datasourceName, "managed_instance_collection.#", "1"),
@@ -207,7 +202,7 @@ func TestOsManagementHubManagedInstanceResource_basic(t *testing.T) {
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_os_management_hub_managed_instance", "test_managed_instance", acctest.Required, acctest.Create, OsManagementHubManagedInstanceSingularDataSourceRepresentation) +
-				compartmentIdVariableStr + acctest.GenerateResourceFromRepresentationMap("oci_os_management_hub_management_station", "test_management_station", acctest.Optional, acctest.Create, OsManagementHubManagementStationRepresentation),
+				compartmentIdVariableStr,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "managed_instance_id"),
 

internal/service/os_management_hub/os_management_hub_managed_instance_resource.go

@@ -6,6 +6,7 @@ package os_management_hub
 import (
 	"context"
 	"fmt"
+	"log"
 	"strings"
 	"time"
 
@@ -17,6 +18,7 @@ import (
 
 	"github.com/oracle/terraform-provider-oci/internal/client"
 	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+	"github.com/oracle/terraform-provider-oci/internal/utils"
 )
 
 func OsManagementHubManagedInstanceResource() *schema.Resource {
@@ -332,14 +334,13 @@ func updateOsManagementHubManagedInstance(d *schema.ResourceData, m interface{})
 }
 
 func deleteOsManagementHubManagedInstance(d *schema.ResourceData, m interface{}) error {
-	//sync := &OsManagementHubManagedInstanceResourceCrud{}
-	//sync.D = d
-	//sync.Client = m.(*client.OracleClients).ManagedInstanceClient()
-	//sync.DisableNotFoundRetries = true
-	//sync.WorkRequestClient = m.(*client.OracleClients).OsManagementHubWorkRequestClient()
-	//
-	//return tfresource.DeleteResource(d, sync)
-	return nil
+	sync := &OsManagementHubManagedInstanceResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).ManagedInstanceClient()
+	sync.DisableNotFoundRetries = true
+	sync.WorkRequestClient = m.(*client.OracleClients).OsManagementHubWorkRequestClient()
+
+	return tfresource.DeleteResource(d, sync)
 }
 
 type OsManagementHubManagedInstanceResourceCrud struct {
@@ -404,21 +405,6 @@ func (s *OsManagementHubManagedInstanceResourceCrud) Create() error {
 	return nil
 }
 
-func (s *OsManagementHubManagedInstanceResourceCrud) getManagedInstanceFromWorkRequest(workId *string, retryPolicy *oci_common.RetryPolicy,
-	actionTypeEnum oci_os_management_hub.ActionTypeEnum, timeout time.Duration) error {
-
-	// Wait until it finishes
-	managedInstanceId, err := managedInstanceWaitForWorkRequest(workId, "managedinstance",
-		actionTypeEnum, timeout, s.DisableNotFoundRetries, s.WorkRequestClient)
-
-	if err != nil {
-		return err
-	}
-	s.D.SetId(*managedInstanceId)
-
-	return s.Get()
-}
-
 func managedInstanceWorkRequestShouldRetryFunc(timeout time.Duration) func(response oci_common.OCIOperationResponse) bool {
 	startTime := time.Now()
 	stopTime := startTime.Add(timeout)
@@ -585,24 +571,28 @@ func (s *OsManagementHubManagedInstanceResourceCrud) Update() error {
 }
 
 func (s *OsManagementHubManagedInstanceResourceCrud) Delete() error {
-	//request := oci_os_management_hub.DeleteManagedInstanceRequest{}
-	//
-	//tmp := s.D.Id()
-	//request.ManagedInstanceId = &tmp
-	//
-	//request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "os_management_hub")
-	//
-	//response, err := s.Client.DeleteManagedInstance(context.Background(), request)
-	//if err != nil {
-	//	return err
-	//}
-	//
-	//workId := response.OpcWorkRequestId
-	//// Wait until it finishes
-	//_, delWorkRequestErr := managedInstanceWaitForWorkRequest(workId, "managedinstance",
-	//	oci_os_management_hub.ActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.WorkRequestClient)
-	//return delWorkRequestErr
-	return nil
+	if utils.GetEnvSettingWithBlankDefault("osmh_skip_managed_instance_deletion") == "true" {
+		log.Printf("[INFO] Skipping deletion of managed instance: %s", s.D.Id())
+		return nil
+	}
+
+	request := oci_os_management_hub.DeleteManagedInstanceRequest{}
+
+	tmp := s.D.Id()
+	request.ManagedInstanceId = &tmp
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "os_management_hub")
+
+	response, err := s.Client.DeleteManagedInstance(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	workId := response.OpcWorkRequestId
+	// Wait until it finishes
+	_, delWorkRequestErr := managedInstanceWaitForWorkRequest(workId, "instance",
+		oci_os_management_hub.ActionTypeUpdated, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.WorkRequestClient)
+	return delWorkRequestErr
 }
 
 func (s *OsManagementHubManagedInstanceResourceCrud) SetData() error {