fix for management resources for external databases

varmax2511 · rashik-bhasin · commit 90caeec39250 · 2021-04-30T15:56:14.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 - Support for Marketplace-Service Catalog
 - Support for Extending DRG with local and cross-tenancy peering added
 
+### Fixed
+- Fixed update and destroy operations for management resources for external databases.
+
 ## 4.24.0 (April 29, 2021)
 
 ### Added
diff --git a/oci/database_external_container_database_management_resource.go b/oci/database_external_container_database_management_resource.go
@@ -75,7 +75,14 @@ func readDatabaseExternalContainerDatabaseManagement(d *schema.ResourceData, m i
 }
 
 func deleteDatabaseExternalContainerDatabaseManagement(d *schema.ResourceData, m interface{}) error {
-	return nil
+	sync := &DatabaseExternalContainerDatabaseManagementResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).databaseClient()
+	sync.workRequestClient = m.(*OracleClients).workRequestClient
+	sync.Res = &DatabaseExternalContainerDatabaseManagementResponse{}
+	sync.DisableNotFoundRetries = true
+
+	return DeleteResource(d, sync)
 }
 
 type DatabaseExternalContainerDatabaseManagementResponse struct {
@@ -167,7 +174,7 @@ func (s *DatabaseExternalContainerDatabaseManagementResourceCrud) Update() error
 	if enableManagement, ok := s.D.GetOkExists("enable_management"); ok {
 		operation = enableManagement.(bool)
 	}
-	operation = false
+
 	if operation {
 		// enable operation
 		request := oci_database.EnableExternalContainerDatabaseDatabaseManagementRequest{}
@@ -229,6 +236,42 @@ func (s *DatabaseExternalContainerDatabaseManagementResourceCrud) Update() error
 	return nil
 }
 
+func (s *DatabaseExternalContainerDatabaseManagementResourceCrud) Delete() error {
+	var operation bool
+	if enableManagement, ok := s.D.GetOkExists("enable_management"); ok {
+		operation = enableManagement.(bool)
+	}
+
+	if !operation {
+		return nil
+	}
+
+	// disable
+	request := oci_database.DisableExternalContainerDatabaseDatabaseManagementRequest{}
+
+	if externalContainerDatabaseId, ok := s.D.GetOkExists("external_container_database_id"); ok {
+		tmp := externalContainerDatabaseId.(string)
+		request.ExternalContainerDatabaseId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
+
+	response, err := s.Client.DisableExternalContainerDatabaseDatabaseManagement(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		_, err = WaitForWorkRequestWithErrorHandling(s.workRequestClient, workId, "externalContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
+	}
+	s.Res.disableResponse = &response
+	return nil
+}
+
 func (s *DatabaseExternalContainerDatabaseManagementResourceCrud) SetData() error {
 	return nil
 }
diff --git a/oci/database_external_container_database_management_test.go b/oci/database_external_container_database_management_test.go
@@ -78,6 +78,15 @@ func TestDatabaseExternalContainerDatabaseManagementResource_basic(t *testing.T)
 			{
 				Config: config + compartmentIdVariableStr + ExternalContainerDatabaseManagementResourceDependencies,
 			},
+			// verify update (Enable Database Management)
+			{
+				Config: config + compartmentIdVariableStr + ExternalContainerDatabaseManagementResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_external_container_database_management", "test_external_container_database_management", Optional, Create, externalContainerDatabaseManagementRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "external_container_database_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "external_database_connector_id"),
+				),
+			},
 			// verify update (Disable Database Management)
 			{
 				Config: config + compartmentIdVariableStr + ExternalContainerDatabaseManagementResourceDependencies +
diff --git a/oci/database_external_non_container_database_management_resource.go b/oci/database_external_non_container_database_management_resource.go
@@ -75,7 +75,14 @@ func readDatabaseExternalNonContainerDatabaseManagement(d *schema.ResourceData,
 }
 
 func deleteDatabaseExternalNonContainerDatabaseManagement(d *schema.ResourceData, m interface{}) error {
-	return nil
+	sync := &DatabaseExternalNonContainerDatabaseManagementResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).databaseClient()
+	sync.workRequestClient = m.(*OracleClients).workRequestClient
+	sync.Res = &DatabaseExternalNonContainerDatabaseManagementResponse{}
+	sync.DisableNotFoundRetries = true
+
+	return DeleteResource(d, sync)
 }
 
 type DatabaseExternalNonContainerDatabaseManagementResponse struct {
@@ -167,7 +174,7 @@ func (s *DatabaseExternalNonContainerDatabaseManagementResourceCrud) Update() er
 	if enableManagement, ok := s.D.GetOkExists("enable_management"); ok {
 		operation = enableManagement.(bool)
 	}
-	operation = false
+
 	if operation {
 		// enable database management
 		request := oci_database.EnableExternalNonContainerDatabaseDatabaseManagementRequest{}
@@ -229,6 +236,41 @@ func (s *DatabaseExternalNonContainerDatabaseManagementResourceCrud) Update() er
 	return nil
 }
 
+func (s *DatabaseExternalNonContainerDatabaseManagementResourceCrud) Delete() error {
+	var operation bool
+	if enableManagement, ok := s.D.GetOkExists("enable_management"); ok {
+		operation = enableManagement.(bool)
+	}
+
+	if !operation {
+		return nil
+	}
+	// disable database management
+	request := oci_database.DisableExternalNonContainerDatabaseDatabaseManagementRequest{}
+
+	if externalNonContainerDatabaseId, ok := s.D.GetOkExists("external_non_container_database_id"); ok {
+		tmp := externalNonContainerDatabaseId.(string)
+		request.ExternalNonContainerDatabaseId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
+
+	response, err := s.Client.DisableExternalNonContainerDatabaseDatabaseManagement(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		_, err = WaitForWorkRequestWithErrorHandling(s.workRequestClient, workId, "externalNonContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
+	}
+	s.Res.disableResponse = &response
+	return nil
+}
+
 func (s *DatabaseExternalNonContainerDatabaseManagementResourceCrud) SetData() error {
 	return nil
 }
diff --git a/oci/database_external_non_container_database_management_test.go b/oci/database_external_non_container_database_management_test.go
@@ -70,6 +70,15 @@ func TestDatabaseExternalNonContainerDatabaseManagementResource_basic(t *testing
 			{
 				Config: config + compartmentIdVariableStr + ExternalNonContainerDatabaseManagementResourceDependencies,
 			},
+			// verify update (Enable Database Management)
+			{
+				Config: config + compartmentIdVariableStr + ExternalNonContainerDatabaseManagementResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_external_non_container_database_management", "test_external_non_container_database_management", Optional, Create, externalNonContainerDatabaseManagementRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "external_non_container_database_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "external_database_connector_id"),
+				),
+			},
 			// verify update (Disable Database Management)
 			{
 				Config: config + compartmentIdVariableStr + ExternalNonContainerDatabaseManagementResourceDependencies +
diff --git a/oci/database_external_pluggable_database_management_resource.go b/oci/database_external_pluggable_database_management_resource.go
@@ -68,7 +68,14 @@ func readDatabaseExternalPluggableDatabaseManagement(d *schema.ResourceData, m i
 }
 
 func deleteDatabaseExternalPluggableDatabaseManagement(d *schema.ResourceData, m interface{}) error {
-	return nil
+	sync := &DatabaseExternalPluggableDatabaseManagementResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).databaseClient()
+	sync.workRequestClient = m.(*OracleClients).workRequestClient
+	sync.Res = &DatabaseExternalPluggableDatabaseManagementResponse{}
+	sync.DisableNotFoundRetries = true
+
+	return DeleteResource(d, sync)
 }
 
 type DatabaseExternalPluggableDatabaseManagementResponse struct {
@@ -157,7 +164,7 @@ func (s *DatabaseExternalPluggableDatabaseManagementResourceCrud) Update() error
 	if enableManagement, ok := s.D.GetOkExists("enable_management"); ok {
 		operation = enableManagement.(bool)
 	}
-	operation = false
+
 	if operation {
 		// Enable Database Management
 		request := oci_database.EnableExternalPluggableDatabaseDatabaseManagementRequest{}
@@ -215,6 +222,41 @@ func (s *DatabaseExternalPluggableDatabaseManagementResourceCrud) Update() error
 	return nil
 }
 
+func (s *DatabaseExternalPluggableDatabaseManagementResourceCrud) Delete() error {
+	var operation bool
+	if enableManagement, ok := s.D.GetOkExists("enable_management"); ok {
+		operation = enableManagement.(bool)
+	}
+
+	if !operation {
+		return nil
+	}
+	// Disable Database Management
+	request := oci_database.DisableExternalPluggableDatabaseDatabaseManagementRequest{}
+
+	if externalPluggableDatabaseId, ok := s.D.GetOkExists("external_pluggable_database_id"); ok {
+		tmp := externalPluggableDatabaseId.(string)
+		request.ExternalPluggableDatabaseId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
+
+	response, err := s.Client.DisableExternalPluggableDatabaseDatabaseManagement(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		_, err = WaitForWorkRequestWithErrorHandling(s.workRequestClient, workId, "externalPluggableDatabase", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
+	}
+	s.Res.disableResponse = &response
+	return nil
+}
+
 func (s *DatabaseExternalPluggableDatabaseManagementResourceCrud) SetData() error {
 	return nil
 }
diff --git a/oci/database_external_pluggable_database_management_test.go b/oci/database_external_pluggable_database_management_test.go
@@ -94,6 +94,30 @@ func TestDatabaseExternalPluggableDatabaseManagementResource_basic(t *testing.T)
 			{
 				Config: config + compartmentIdVariableStr + ExternalPluggableDatabaseManagementResourceDependencies,
 			},
+			// Enablement of parent CDB
+			{
+				Config: config + compartmentIdVariableStr + ExternalPluggableDatabaseManagementResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_external_container_database_management", "test_external_container_database_management", Optional, Create, externalContainerDatabaseManagementRepresentation),
+			},
+			// Enablement of PDB
+			{
+				Config: config + compartmentIdVariableStr + ExternalPluggableDatabaseManagementResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_external_container_database_management", "test_external_container_database_management", Optional, Create, externalContainerDatabaseManagementRepresentation) +
+					generateResourceFromRepresentationMap("oci_database_external_pluggable_database_management", "test_external_pluggable_database_management", Optional, Create, externalPluggableDatabaseManagementRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "external_pluggable_database_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "external_database_connector_id"),
+				),
+			},
+			// Verify Enablement of PDB
+			{
+				Config: config + compartmentIdVariableStr + ExternalPluggableDatabaseManagementResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_external_container_database_management", "test_external_container_database_management", Optional, Create, externalContainerDatabaseManagementRepresentation) +
+					generateResourceFromRepresentationMap("oci_database_external_pluggable_database_management", "test_external_pluggable_database_management", Optional, Create, externalPluggableDatabaseManagementRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourcePDB, "database_management_config.0.database_management_status", "ENABLED"),
+				),
+			},
 			// Disablement of parent CDB
 			{
 				Config: config + compartmentIdVariableStr + ExternalPluggableDatabaseManagementResourceDependencies +
