Adding client configuration for the source clients

Author: afedorch

oci/helpers_core.go

@@ -77,11 +77,15 @@ func getBackupPolicyId(assetId *string, client *oci_core.BlockstorageClient) (*s
 
 func (s *VolumeBackupResourceCrud) createBlockStorageSourceRegionClient(region string) error {
 	if s.SourceRegionClient == nil {
-		sourceObjectStorageClient, err := oci_core.NewBlockstorageClientWithConfigurationProvider(*s.Client.ConfigurationProvider())
+		sourceBlockStorageClient, err := oci_core.NewBlockstorageClientWithConfigurationProvider(*s.Client.ConfigurationProvider())
 		if err != nil {
 			return fmt.Errorf("cannot create client for the source region: %v", err)
 		}
-		s.SourceRegionClient = &sourceObjectStorageClient
+		err = configureClient(&sourceBlockStorageClient.BaseClient)
+		if err != nil {
+			return fmt.Errorf("cannot configure client for the source region: %v", err)
+		}
+		s.SourceRegionClient = &sourceBlockStorageClient
 	}
 	s.SourceRegionClient.SetRegion(region)
 

oci/helpers_core_test.go

@@ -18,11 +18,19 @@ func createVolumeInRegion(clients *OracleClients, region string) (string, error)
 	if err != nil {
 		return "", fmt.Errorf("cannot create client for the source region %s: %v", region, err)
 	}
+	err = configureClient(&blockStorageClient.BaseClient)
+	if err != nil {
+		return "", fmt.Errorf("cannot configure client for the source region: %v", err)
+	}
 	blockStorageClient.SetRegion(region)
 	identityClient, err := oci_identity.NewIdentityClientWithConfigurationProvider(*clients.identityClient.ConfigurationProvider())
 	if err != nil {
 		return "", fmt.Errorf("cannot create client for the source region %s: %v", region, err)
 	}
+	err = configureClient(&identityClient.BaseClient)
+	if err != nil {
+		return "", fmt.Errorf("cannot configure client for the source region: %v", err)
+	}
 	identityClient.SetRegion(region)
 	listAvailabilityDomainsResponse, err := identityClient.ListAvailabilityDomains(context.Background(),
 		oci_identity.ListAvailabilityDomainsRequest{
@@ -69,6 +77,10 @@ func createVolumeBackupInRegion(clients *OracleClients, region string, volumeId
 	if err != nil {
 		return "", fmt.Errorf("cannot create client for the source region %s: %v", region, err)
 	}
+	err = configureClient(&blockStorageClient.BaseClient)
+	if err != nil {
+		return "", fmt.Errorf("cannot configure client for the source region: %v", err)
+	}
 	blockStorageClient.SetRegion(region)
 
 	createVolumeBackupResponse, err := blockStorageClient.CreateVolumeBackup(context.Background(), oci_core.CreateVolumeBackupRequest{
@@ -104,6 +116,10 @@ func deleteVolumeInRegion(clients *OracleClients, region string, volumeId string
 	if err != nil {
 		return fmt.Errorf("cannot create client for the source region %s: %v", region, err)
 	}
+	err = configureClient(&blockStorageClient.BaseClient)
+	if err != nil {
+		return fmt.Errorf("cannot configure client for the source region: %v", err)
+	}
 	blockStorageClient.SetRegion(region)
 
 	if volumeId != "" {
@@ -125,6 +141,10 @@ func deleteVolumeBackupInRegion(clients *OracleClients, region string, volumeBac
 	if err != nil {
 		return fmt.Errorf("cannot create client for the source region %s: %v", region, err)
 	}
+	err = configureClient(&blockStorageClient.BaseClient)
+	if err != nil {
+		return fmt.Errorf("cannot configure client for the source region: %v", err)
+	}
 	blockStorageClient.SetRegion(region)
 
 	if volumeBackupId != "" {

oci/helpers_objectstorage.go

@@ -403,6 +403,10 @@ func (s *ObjectResourceCrud) createSourceRegionClient(region string) error {
 		if err != nil {
 			return fmt.Errorf("cannot create client for the source region: %v", err)
 		}
+		err = configureClient(&sourceObjectStorageClient.BaseClient)
+		if err != nil {
+			return fmt.Errorf("cannot configure client for the source region: %v", err)
+		}
 		s.SourceRegionClient = &sourceObjectStorageClient
 	}
 	s.SourceRegionClient.SetRegion(region)