Skip to content

Commit d0f2f7f

Browse files
authored
Update sdk version (IBM-Cloud#6497)
* update * update * update BRS sdk * update resources/data-sources with additional endpoint url parameter * update protection sources to use additional endpoint url * update url function to set URL * endpoint tests * address comments * update docs * update code * update go version * remove backup_recovery_endpoint frommschema * address comments : add provision for test cloud
1 parent a7881b8 commit d0f2f7f

File tree

102 files changed

+12028
-264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+12028
-264
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/IBM/event-notifications-go-admin-sdk v0.18.0
1919
github.com/IBM/eventstreams-go-sdk v1.4.0
2020
github.com/IBM/go-sdk-core/v5 v5.21.0
21-
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3
21+
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5
2222
github.com/IBM/ibm-cos-sdk-go v1.12.2
2323
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.3.0
2424
github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20250305134146-e023c2e84762
@@ -59,7 +59,7 @@ require (
5959
github.com/pkg/errors v0.9.1
6060
github.com/rook/rook/pkg/apis v0.0.0-20250619203122-80563e28b685
6161
github.com/softlayer/softlayer-go v1.0.3
62-
github.com/stretchr/testify v1.10.0
62+
github.com/stretchr/testify v1.11.1
6363
golang.org/x/crypto v0.41.0
6464
gopkg.in/yaml.v3 v3.0.1
6565
gotest.tools v2.2.0+incompatible

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2y
127127
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
128128
github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
129129
github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
130-
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3 h1:9TZHocmCfgmF8TGVrpP1kFyQbjcqLNW7+bM07lefpKQ=
131-
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3/go.mod h1:jsYutWlnGysdCNoAk0zoIXb2vfKM9TmMpiUkI4pVuXY=
130+
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5 h1:bVf67pkGi5dp8SQXMcam8c1JrEwNRkXVcz3FkaalmYg=
131+
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5/go.mod h1:m+7lHOrXJwYPbrdxMmKl96tT7OJMMhpyKnQgnaCcy+w=
132132
github.com/IBM/ibm-cos-sdk-go v1.12.2 h1:71A4tDl8u6BZ548h71ecEe7fw5bBA7ECTVqYmeSQWQA=
133133
github.com/IBM/ibm-cos-sdk-go v1.12.2/go.mod h1:ODYcmrmdpjo5hVguq9RbD6xmC8xb1XZMG7NefUbJNcc=
134134
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.3.0 h1:956Nqk0eKI3lq+AkzWXZDid4UZHRz0wWh1LwkleBsWk=
@@ -1164,8 +1164,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
11641164
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
11651165
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
11661166
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1167-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1168-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1167+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
1168+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
11691169
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
11701170
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
11711171
github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=

ibm/conns/config.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ func (c *Config) ClientSession() (interface{}, error) {
16491649
}
16501650

16511651
// Construct the service options.
1652-
var backupRecoveryURL string
1652+
var backupRecoveryURL string = "https://default.backup-recovery.cloud.ibm.com/v2"
16531653
var backupRecoveryConnectorURL string
16541654

16551655
if fileMap != nil && c.Visibility != "public-and-private" {
@@ -1661,9 +1661,7 @@ func (c *Config) ClientSession() (interface{}, error) {
16611661
Authenticator: authenticator,
16621662
URL: EnvFallBack([]string{"IBMCLOUD_BACKUP_RECOVERY_ENDPOINT"}, backupRecoveryURL),
16631663
}
1664-
if backupRecoveryClientOptions.URL == "" {
1665-
session.backupRecoveryClientErr = fmt.Errorf("IBMCLOUD_BACKUP_RECOVERY_ENDPOINT not set in env or endpoints file")
1666-
}
1664+
16671665
// Construct the service client.
16681666
session.backupRecoveryClient, err = backuprecoveryv1.NewBackupRecoveryV1(backupRecoveryClientOptions)
16691667
if err != nil {

ibm/provider/provider.go

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -266,31 +266,31 @@ func Provider() *schema.Provider {
266266
"ibm_config_aggregator_resource_collection_status": configurationaggregator.AddConfigurationAggregatorInstanceFields(configurationaggregator.DataSourceIbmConfigAggregatorResourceCollectionStatus()),
267267

268268
// // BackupAndRecovery
269-
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks(),
270-
"ibm_backup_recovery_download_agent": backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent(),
271-
"ibm_backup_recovery_search_indexed_object": backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject(),
272-
"ibm_backup_recovery_object_snapshots": backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots(),
273-
"ibm_backup_recovery_connectors_metadata": backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata(),
274-
"ibm_backup_recovery_connector_logs": backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs(),
275-
"ibm_backup_recovery_connector_status": backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus(),
276-
"ibm_backup_recovery_data_source_connections": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections(),
277-
"ibm_backup_recovery_data_source_connectors": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors(),
278-
"ibm_backup_recovery_search_objects": backuprecovery.DataSourceIbmBackupRecoverySearchObjects(),
279-
"ibm_backup_recovery_search_protected_objects": backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects(),
280-
"ibm_backup_recovery_protection_group": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup(),
281-
"ibm_backup_recovery_protection_groups": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups(),
282-
"ibm_backup_recovery_protection_group_runs": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns(),
283-
"ibm_backup_recovery_protection_policies": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies(),
284-
"ibm_backup_recovery_protection_policy": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy(),
285-
"ibm_backup_recovery": backuprecovery.DataSourceIbmBackupRecovery(),
286-
"ibm_backup_recoveries": backuprecovery.DataSourceIbmBackupRecoveries(),
287-
"ibm_backup_recovery_download_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles(),
288-
"ibm_backup_recovery_source_registrations": backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations(),
289-
"ibm_backup_recovery_source_registration": backuprecovery.DataSourceIbmBackupRecoverySourceRegistration(),
290-
"ibm_backup_recovery_download_indexed_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles(),
291-
"ibm_backup_recovery_protection_sources": backuprecovery.DataSourceIbmBackupRecoveryProtectionSources(),
292-
"ibm_backup_recovery_connector_get_users": backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers(),
293-
269+
// // BackupAndRecovery
270+
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks()),
271+
"ibm_backup_recovery_download_agent": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent()),
272+
"ibm_backup_recovery_search_indexed_object": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject()),
273+
"ibm_backup_recovery_object_snapshots": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots()),
274+
"ibm_backup_recovery_connectors_metadata": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata()),
275+
"ibm_backup_recovery_connector_logs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs()),
276+
"ibm_backup_recovery_connector_status": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus()),
277+
"ibm_backup_recovery_data_source_connections": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections()),
278+
"ibm_backup_recovery_data_source_connectors": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors()),
279+
"ibm_backup_recovery_search_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchObjects()),
280+
"ibm_backup_recovery_search_protected_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects()),
281+
"ibm_backup_recovery_protection_group": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup()),
282+
"ibm_backup_recovery_protection_groups": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups()),
283+
"ibm_backup_recovery_protection_group_runs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns()),
284+
"ibm_backup_recovery_protection_policies": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies()),
285+
"ibm_backup_recovery_protection_policy": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy()),
286+
"ibm_backup_recovery": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecovery()),
287+
"ibm_backup_recoveries": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveries()),
288+
"ibm_backup_recovery_download_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles()),
289+
"ibm_backup_recovery_source_registrations": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations()),
290+
"ibm_backup_recovery_source_registration": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistration()),
291+
"ibm_backup_recovery_download_indexed_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles()),
292+
"ibm_backup_recovery_protection_sources": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionSources()),
293+
"ibm_backup_recovery_connector_get_users": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers()),
294294
// // AppID
295295
"ibm_appid_action_url": appid.DataSourceIBMAppIDActionURL(),
296296
"ibm_appid_apm": appid.DataSourceIBMAppIDAPM(),
@@ -1121,22 +1121,22 @@ func Provider() *schema.Provider {
11211121
},
11221122

11231123
ResourcesMap: map[string]*schema.Resource{
1124-
"ibm_backup_recovery_agent_upgrade_task": backuprecovery.ResourceIbmBackupRecoveryAgentUpgradeTask(),
1125-
"ibm_backup_recovery_protection_group_run_request": backuprecovery.ResourceIbmBackupRecoveryProtectionGroupRunRequest(),
1126-
"ibm_backup_recovery_data_source_connection": backuprecovery.ResourceIbmBackupRecoveryDataSourceConnection(),
1127-
"ibm_backup_recovery_data_source_connector_patch": backuprecovery.ResourceIbmBackupRecoveryDataSourceConnectorPatch(),
1128-
"ibm_backup_recovery_download_files_folders": backuprecovery.ResourceIbmBackupRecoveryDownloadFilesFolders(),
1129-
"ibm_backup_recovery_restore_points": backuprecovery.ResourceIbmBackupRecoveryRestorePoints(),
1130-
"ibm_backup_recovery_perform_action_on_protection_group_run_request": backuprecovery.ResourceIbmBackupRecoveryPerformActionOnProtectionGroupRunRequest(),
1131-
"ibm_backup_recovery_protection_group": backuprecovery.ResourceIbmBackupRecoveryProtectionGroup(),
1132-
"ibm_backup_recovery_protection_policy": backuprecovery.ResourceIbmBackupRecoveryProtectionPolicy(),
1133-
"ibm_backup_recovery": backuprecovery.ResourceIbmBackupRecovery(),
1134-
"ibm_backup_recovery_source_registration": backuprecovery.ResourceIbmBackupRecoverySourceRegistration(),
1135-
"ibm_backup_recovery_update_protection_group_run_request": backuprecovery.ResourceIbmBackupRecoveryUpdateProtectionGroupRunRequest(),
1136-
"ibm_backup_recovery_connection_registration_token": backuprecovery.ResourceIbmBackupRecoveryConnectionRegistrationToken(),
1137-
"ibm_backup_recovery_connector_registration": backuprecovery.ResourceIbmBackupRecoveryConnectorRegistration(),
1138-
"ibm_backup_recovery_connector_access_token": backuprecovery.ResourceIbmBackupRecoveryConnectorAccessToken(),
1139-
"ibm_backup_recovery_connector_update_user": backuprecovery.ResourceIbmBackupRecoveryConnectorUpdateUser(),
1124+
"ibm_backup_recovery_agent_upgrade_task": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryAgentUpgradeTask()),
1125+
"ibm_backup_recovery_protection_group_run_request": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryProtectionGroupRunRequest()),
1126+
"ibm_backup_recovery_data_source_connection": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryDataSourceConnection()),
1127+
"ibm_backup_recovery_data_source_connector_patch": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryDataSourceConnectorPatch()),
1128+
"ibm_backup_recovery_download_files_folders": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryDownloadFilesFolders()),
1129+
"ibm_backup_recovery_restore_points": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryRestorePoints()),
1130+
"ibm_backup_recovery_perform_action_on_protection_group_run_request": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryPerformActionOnProtectionGroupRunRequest()),
1131+
"ibm_backup_recovery_protection_group": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryProtectionGroup()),
1132+
"ibm_backup_recovery_protection_policy": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryProtectionPolicy()),
1133+
"ibm_backup_recovery": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecovery()),
1134+
"ibm_backup_recovery_source_registration": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoverySourceRegistration()),
1135+
"ibm_backup_recovery_update_protection_group_run_request": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryUpdateProtectionGroupRunRequest()),
1136+
"ibm_backup_recovery_connection_registration_token": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectionRegistrationToken()),
1137+
"ibm_backup_recovery_connector_registration": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorRegistration()),
1138+
"ibm_backup_recovery_connector_access_token": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorAccessToken()),
1139+
"ibm_backup_recovery_connector_update_user": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorUpdateUser()),
11401140

11411141
"ibm_app": cloudfoundry.ResourceIBMApp(),
11421142
"ibm_app_domain_private": cloudfoundry.ResourceIBMAppDomainPrivate(),

ibm/service/backuprecovery/data_source_ibm_backup_recoveries.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ import (
1313
"log"
1414
"time"
1515

16-
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
17-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
18-
1916
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
2017
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
2118
"github.com/IBM/go-sdk-core/v5/core"
2219
"github.com/IBM/ibm-backup-recovery-sdk-go/backuprecoveryv1"
20+
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
21+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
2322
)
2423

2524
func DataSourceIbmBackupRecoveries() *schema.Resource {
@@ -2282,6 +2281,18 @@ func dataSourceIbmBackupRecoveriesRead(context context.Context, d *schema.Resour
22822281
return tfErr.GetDiag()
22832282
}
22842283

2284+
endpointType := d.Get("endpoint_type").(string)
2285+
instanceId, region := getInstanceIdAndRegion(d)
2286+
if instanceId != "" && region != "" {
2287+
bmxsession, err := meta.(conns.ClientSession).BluemixSession()
2288+
if err != nil {
2289+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("unable to get clientSession"), "ibm_backup_recovery", "create")
2290+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
2291+
return tfErr.GetDiag()
2292+
}
2293+
backupRecoveryClient = getClientWithInstanceEndpoint(backupRecoveryClient, bmxsession, instanceId, region, endpointType)
2294+
}
2295+
22852296
getRecoveriesOptions := &backuprecoveryv1.GetRecoveriesOptions{}
22862297

22872298
getRecoveriesOptions.SetXIBMTenantID(d.Get("x_ibm_tenant_id").(string))
@@ -2351,7 +2362,6 @@ func dataSourceIbmBackupRecoveriesRead(context context.Context, d *schema.Resour
23512362
}
23522363

23532364
d.SetId(dataSourceIbmBackupRecoveriesID(d))
2354-
23552365
if !core.IsNil(recoveriesResponse.Recoveries) {
23562366
recoveries := []map[string]interface{}{}
23572367
for _, recoveriesItem := range recoveriesResponse.Recoveries {

ibm/service/backuprecovery/data_source_ibm_backup_recoveries_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
func TestAccIbmBackupRecoveriesDataSourceBasic(t *testing.T) {
2121
name := fmt.Sprintf("tf_recovery_name_%d", acctest.RandIntRange(10, 100))
2222
snapshotEnvironment := "kPhysical"
23-
objectId := 3
23+
objectId := 344
2424
targetenvironment := "kPhysical"
25-
absolutePath := "/data/"
25+
absolutePath := "/mnt"
2626
restoreEntityType := "kRegular"
2727
recoveryAction := "RecoverFiles"
2828

@@ -51,12 +51,14 @@ func testAccCheckIbmBackupRecoveriesDataSourceConfigBasic(objectId int, name, sn
5151
5252
data "ibm_backup_recovery_object_snapshots" "object_snapshot" {
5353
x_ibm_tenant_id = "%s"
54+
5455
object_id = %d
5556
}
5657
5758
resource "ibm_backup_recovery" "baas_recovery_instance" {
5859
x_ibm_tenant_id = "%s"
5960
snapshot_environment = "%s"
61+
6062
name = "%s"
6163
physical_params {
6264
recovery_action = "%s"
@@ -81,6 +83,7 @@ func testAccCheckIbmBackupRecoveriesDataSourceConfigBasic(objectId int, name, sn
8183
8284
data "ibm_backup_recoveries" "baas_recoveries_instance" {
8385
x_ibm_tenant_id = "%[1]s"
86+
8487
ids = [ ibm_backup_recovery.baas_recovery_instance.recovery_id ]
8588
}
8689
`, tenantId, objectId, tenantId, snapshotEnvironment, name, recoveryAction, targetenvironment, absolutePath, objectId, restoreEntityType, absolutePath)

ibm/service/backuprecovery/data_source_ibm_backup_recovery.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2208,6 +2208,17 @@ func dataSourceIbmBackupRecoveryRead(context context.Context, d *schema.Resource
22082208
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
22092209
return tfErr.GetDiag()
22102210
}
2211+
endpointType := d.Get("endpoint_type").(string)
2212+
instanceId, region := getInstanceIdAndRegion(d)
2213+
if instanceId != "" && region != "" {
2214+
bmxsession, err := meta.(conns.ClientSession).BluemixSession()
2215+
if err != nil {
2216+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("unable to get clientSession"), "ibm_backup_recovery", "create")
2217+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
2218+
return tfErr.GetDiag()
2219+
}
2220+
backupRecoveryClient = getClientWithInstanceEndpoint(backupRecoveryClient, bmxsession, instanceId, region, endpointType)
2221+
}
22112222

22122223
getRecoveryByIdOptions := &backuprecoveryv1.GetRecoveryByIdOptions{}
22132224
tenantId := d.Get("x_ibm_tenant_id").(string)

0 commit comments

Comments
 (0)