Bug Fix for MySQL Cross Region Copy Backup Destroy

Author: aid23-tech

internal/service/mysql/helpers_mysql.go

@@ -8,7 +8,7 @@ import (
 )
 
 func (s *MysqlMysqlBackupResourceCrud) createDbBackupClientInRegion(region string) error {
-	if s.DestRegionClient == nil {
+	if s.Client == nil {
 		dbBackupClient, err := oci_mysql.NewDbBackupsClientWithConfigurationProvider(*s.Client.ConfigurationProvider())
 		if err != nil {
 			return fmt.Errorf("cannot Create client for the region: %v", err)
@@ -17,9 +17,9 @@ func (s *MysqlMysqlBackupResourceCrud) createDbBackupClientInRegion(region strin
 		if err != nil {
 			return fmt.Errorf("cannot configure client for the region: %v", err)
 		}
-		s.DestRegionClient = &dbBackupClient
+		s.Client = &dbBackupClient
 	}
-	s.DestRegionClient.SetRegion(region)
+	s.Client.SetRegion(region)
 
 	return nil
 }

internal/service/mysql/mysql_mysql_backup_resource.go

@@ -11,7 +11,6 @@ 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"
 
 	oci_mysql "github.com/oracle/oci-go-sdk/v65/mysql"
 )
@@ -522,7 +521,6 @@ func deleteMysqlMysqlBackup(d *schema.ResourceData, m interface{}) error {
 type MysqlMysqlBackupResourceCrud struct {
 	tfresource.BaseCrud
 	Client                 *oci_mysql.DbBackupsClient
-	DestRegionClient       *oci_mysql.DbBackupsClient
 	Res                    *oci_mysql.Backup
 	DisableNotFoundRetries bool
 }
@@ -681,7 +679,7 @@ func (s *MysqlMysqlBackupResourceCrud) createMysqlBackupCopy() error {
 		return err
 	}
 
-	response, err := s.DestRegionClient.CopyBackup(context.Background(), copyMysqlBackupRequest)
+	response, err := s.Client.CopyBackup(context.Background(), copyMysqlBackupRequest)
 	if err != nil {
 		return err
 	}
@@ -767,11 +765,6 @@ func (s *MysqlMysqlBackupResourceCrud) Delete() error {
 	tmp := s.D.Id()
 	request.BackupId = &tmp
 
-	if s.isBackupCopy() {
-		destinationRegion := utils.GetEnvSettingWithBlankDefault("destination_region")
-		s.Client.SetRegion(destinationRegion)
-	}
-
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "mysql")
 
 	_, err := s.Client.DeleteBackup(context.Background(), request)