Skip to content

Update sdk version #6497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Oct 21, 2025
Merged

Update sdk version #6497

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ca49e6f
update
IBM-Deeksha Sep 4, 2025
ac1b684
update
IBM-Deeksha Sep 17, 2025
996d7e6
Merge commit 'ac1b6847f'
IBM-Deeksha Sep 17, 2025
b67dc36
update BRS sdk
IBM-Deeksha Oct 7, 2025
fd79a2c
Merge branch 'IBM-Cloud:master' into master
IBM-Deeksha Oct 7, 2025
7903e08
Merge branch 'IBM-Cloud:master' into master
IBM-Deeksha Oct 7, 2025
95e1a21
update resources/data-sources with additional endpoint url parameter
IBM-Deeksha Oct 7, 2025
ed02d12
update protection sources to use additional endpoint url
IBM-Deeksha Oct 7, 2025
681beaf
update url function to set URL
IBM-Deeksha Oct 7, 2025
fb02175
endpoint tests
IBM-Deeksha Oct 13, 2025
7c055b8
address comments
IBM-Deeksha Oct 14, 2025
76628b0
update docs
IBM-Deeksha Oct 14, 2025
15099c1
update code
IBM-Deeksha Oct 16, 2025
9fb918a
update go version
IBM-Deeksha Oct 16, 2025
eef5d1e
remove backup_recovery_endpoint frommschema
IBM-Deeksha Oct 21, 2025
1c7a0b3
address comments : add provision for test cloud
IBM-Deeksha Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/IBM/event-notifications-go-admin-sdk v0.18.0
github.com/IBM/eventstreams-go-sdk v1.4.0
github.com/IBM/go-sdk-core/v5 v5.21.0
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5
github.com/IBM/ibm-cos-sdk-go v1.12.2
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.3.0
github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20250305134146-e023c2e84762
Expand Down Expand Up @@ -59,7 +59,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/rook/rook/pkg/apis v0.0.0-20250619203122-80563e28b685
github.com/softlayer/softlayer-go v1.0.3
github.com/stretchr/testify v1.10.0
github.com/stretchr/testify v1.11.1
golang.org/x/crypto v0.41.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools v2.2.0+incompatible
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2y
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3 h1:9TZHocmCfgmF8TGVrpP1kFyQbjcqLNW7+bM07lefpKQ=
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3/go.mod h1:jsYutWlnGysdCNoAk0zoIXb2vfKM9TmMpiUkI4pVuXY=
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5 h1:bVf67pkGi5dp8SQXMcam8c1JrEwNRkXVcz3FkaalmYg=
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5/go.mod h1:m+7lHOrXJwYPbrdxMmKl96tT7OJMMhpyKnQgnaCcy+w=
github.com/IBM/ibm-cos-sdk-go v1.12.2 h1:71A4tDl8u6BZ548h71ecEe7fw5bBA7ECTVqYmeSQWQA=
github.com/IBM/ibm-cos-sdk-go v1.12.2/go.mod h1:ODYcmrmdpjo5hVguq9RbD6xmC8xb1XZMG7NefUbJNcc=
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.3.0 h1:956Nqk0eKI3lq+AkzWXZDid4UZHRz0wWh1LwkleBsWk=
Expand Down Expand Up @@ -1164,8 +1164,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
Expand Down
6 changes: 2 additions & 4 deletions ibm/conns/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ func (c *Config) ClientSession() (interface{}, error) {
}

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

if fileMap != nil && c.Visibility != "public-and-private" {
Expand All @@ -1676,9 +1676,7 @@ func (c *Config) ClientSession() (interface{}, error) {
Authenticator: authenticator,
URL: EnvFallBack([]string{"IBMCLOUD_BACKUP_RECOVERY_ENDPOINT"}, backupRecoveryURL),
}
if backupRecoveryClientOptions.URL == "" {
session.backupRecoveryClientErr = fmt.Errorf("IBMCLOUD_BACKUP_RECOVERY_ENDPOINT not set in env or endpoints file")
}

// Construct the service client.
session.backupRecoveryClient, err = backuprecoveryv1.NewBackupRecoveryV1(backupRecoveryClientOptions)
if err != nil {
Expand Down
82 changes: 41 additions & 41 deletions ibm/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,31 +266,31 @@ func Provider() *schema.Provider {
"ibm_config_aggregator_resource_collection_status": configurationaggregator.AddConfigurationAggregatorInstanceFields(configurationaggregator.DataSourceIbmConfigAggregatorResourceCollectionStatus()),

// // BackupAndRecovery
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks(),
"ibm_backup_recovery_download_agent": backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent(),
"ibm_backup_recovery_search_indexed_object": backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject(),
"ibm_backup_recovery_object_snapshots": backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots(),
"ibm_backup_recovery_connectors_metadata": backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata(),
"ibm_backup_recovery_connector_logs": backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs(),
"ibm_backup_recovery_connector_status": backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus(),
"ibm_backup_recovery_data_source_connections": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections(),
"ibm_backup_recovery_data_source_connectors": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors(),
"ibm_backup_recovery_search_objects": backuprecovery.DataSourceIbmBackupRecoverySearchObjects(),
"ibm_backup_recovery_search_protected_objects": backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects(),
"ibm_backup_recovery_protection_group": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup(),
"ibm_backup_recovery_protection_groups": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups(),
"ibm_backup_recovery_protection_group_runs": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns(),
"ibm_backup_recovery_protection_policies": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies(),
"ibm_backup_recovery_protection_policy": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy(),
"ibm_backup_recovery": backuprecovery.DataSourceIbmBackupRecovery(),
"ibm_backup_recoveries": backuprecovery.DataSourceIbmBackupRecoveries(),
"ibm_backup_recovery_download_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles(),
"ibm_backup_recovery_source_registrations": backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations(),
"ibm_backup_recovery_source_registration": backuprecovery.DataSourceIbmBackupRecoverySourceRegistration(),
"ibm_backup_recovery_download_indexed_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles(),
"ibm_backup_recovery_protection_sources": backuprecovery.DataSourceIbmBackupRecoveryProtectionSources(),
"ibm_backup_recovery_connector_get_users": backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers(),

// // BackupAndRecovery
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks()),
"ibm_backup_recovery_download_agent": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent()),
"ibm_backup_recovery_search_indexed_object": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject()),
"ibm_backup_recovery_object_snapshots": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots()),
"ibm_backup_recovery_connectors_metadata": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata()),
"ibm_backup_recovery_connector_logs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs()),
"ibm_backup_recovery_connector_status": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus()),
"ibm_backup_recovery_data_source_connections": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections()),
"ibm_backup_recovery_data_source_connectors": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors()),
"ibm_backup_recovery_search_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchObjects()),
"ibm_backup_recovery_search_protected_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects()),
"ibm_backup_recovery_protection_group": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup()),
"ibm_backup_recovery_protection_groups": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups()),
"ibm_backup_recovery_protection_group_runs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns()),
"ibm_backup_recovery_protection_policies": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies()),
"ibm_backup_recovery_protection_policy": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy()),
"ibm_backup_recovery": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecovery()),
"ibm_backup_recoveries": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveries()),
"ibm_backup_recovery_download_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles()),
"ibm_backup_recovery_source_registrations": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations()),
"ibm_backup_recovery_source_registration": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistration()),
"ibm_backup_recovery_download_indexed_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles()),
"ibm_backup_recovery_protection_sources": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionSources()),
"ibm_backup_recovery_connector_get_users": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers()),
// // AppID
"ibm_appid_action_url": appid.DataSourceIBMAppIDActionURL(),
"ibm_appid_apm": appid.DataSourceIBMAppIDAPM(),
Expand Down Expand Up @@ -1121,22 +1121,22 @@ func Provider() *schema.Provider {
},

ResourcesMap: map[string]*schema.Resource{
"ibm_backup_recovery_agent_upgrade_task": backuprecovery.ResourceIbmBackupRecoveryAgentUpgradeTask(),
"ibm_backup_recovery_protection_group_run_request": backuprecovery.ResourceIbmBackupRecoveryProtectionGroupRunRequest(),
"ibm_backup_recovery_data_source_connection": backuprecovery.ResourceIbmBackupRecoveryDataSourceConnection(),
"ibm_backup_recovery_data_source_connector_patch": backuprecovery.ResourceIbmBackupRecoveryDataSourceConnectorPatch(),
"ibm_backup_recovery_download_files_folders": backuprecovery.ResourceIbmBackupRecoveryDownloadFilesFolders(),
"ibm_backup_recovery_restore_points": backuprecovery.ResourceIbmBackupRecoveryRestorePoints(),
"ibm_backup_recovery_perform_action_on_protection_group_run_request": backuprecovery.ResourceIbmBackupRecoveryPerformActionOnProtectionGroupRunRequest(),
"ibm_backup_recovery_protection_group": backuprecovery.ResourceIbmBackupRecoveryProtectionGroup(),
"ibm_backup_recovery_protection_policy": backuprecovery.ResourceIbmBackupRecoveryProtectionPolicy(),
"ibm_backup_recovery": backuprecovery.ResourceIbmBackupRecovery(),
"ibm_backup_recovery_source_registration": backuprecovery.ResourceIbmBackupRecoverySourceRegistration(),
"ibm_backup_recovery_update_protection_group_run_request": backuprecovery.ResourceIbmBackupRecoveryUpdateProtectionGroupRunRequest(),
"ibm_backup_recovery_connection_registration_token": backuprecovery.ResourceIbmBackupRecoveryConnectionRegistrationToken(),
"ibm_backup_recovery_connector_registration": backuprecovery.ResourceIbmBackupRecoveryConnectorRegistration(),
"ibm_backup_recovery_connector_access_token": backuprecovery.ResourceIbmBackupRecoveryConnectorAccessToken(),
"ibm_backup_recovery_connector_update_user": backuprecovery.ResourceIbmBackupRecoveryConnectorUpdateUser(),
"ibm_backup_recovery_agent_upgrade_task": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryAgentUpgradeTask()),
"ibm_backup_recovery_protection_group_run_request": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryProtectionGroupRunRequest()),
"ibm_backup_recovery_data_source_connection": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryDataSourceConnection()),
"ibm_backup_recovery_data_source_connector_patch": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryDataSourceConnectorPatch()),
"ibm_backup_recovery_download_files_folders": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryDownloadFilesFolders()),
"ibm_backup_recovery_restore_points": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryRestorePoints()),
"ibm_backup_recovery_perform_action_on_protection_group_run_request": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryPerformActionOnProtectionGroupRunRequest()),
"ibm_backup_recovery_protection_group": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryProtectionGroup()),
"ibm_backup_recovery_protection_policy": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryProtectionPolicy()),
"ibm_backup_recovery": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecovery()),
"ibm_backup_recovery_source_registration": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoverySourceRegistration()),
"ibm_backup_recovery_update_protection_group_run_request": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryUpdateProtectionGroupRunRequest()),
"ibm_backup_recovery_connection_registration_token": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectionRegistrationToken()),
"ibm_backup_recovery_connector_registration": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorRegistration()),
"ibm_backup_recovery_connector_access_token": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorAccessToken()),
"ibm_backup_recovery_connector_update_user": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorUpdateUser()),

"ibm_app": cloudfoundry.ResourceIBMApp(),
"ibm_app_domain_private": cloudfoundry.ResourceIBMAppDomainPrivate(),
Expand Down
16 changes: 13 additions & 3 deletions ibm/service/backuprecovery/data_source_ibm_backup_recoveries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ import (
"log"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/IBM/go-sdk-core/v5/core"
"github.com/IBM/ibm-backup-recovery-sdk-go/backuprecoveryv1"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func DataSourceIbmBackupRecoveries() *schema.Resource {
Expand Down Expand Up @@ -2282,6 +2281,12 @@ func dataSourceIbmBackupRecoveriesRead(context context.Context, d *schema.Resour
return tfErr.GetDiag()
}

endpointType := d.Get("endpoint_type").(string)
instanceId, region := getInstanceIdAndRegion(d)
if instanceId != "" && region != "" {
backupRecoveryClient = getClientWithInstanceEndpoint(backupRecoveryClient, instanceId, region, endpointType)
}

getRecoveriesOptions := &backuprecoveryv1.GetRecoveriesOptions{}

getRecoveriesOptions.SetXIBMTenantID(d.Get("x_ibm_tenant_id").(string))
Expand Down Expand Up @@ -2351,6 +2356,11 @@ func dataSourceIbmBackupRecoveriesRead(context context.Context, d *schema.Resour
}

d.SetId(dataSourceIbmBackupRecoveriesID(d))
if endpoint, ok := d.GetOk("backup_recovery_endpoint"); ok {
if err := d.Set("backup_recovery_endpoint", endpoint); err != nil {
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting backup_recovery_endpoint: %s", err), "(Data) ibm_backup_recovery_recoveries", "read", "recoveries-to-map").GetDiag()
}
}

if !core.IsNil(recoveriesResponse.Recoveries) {
recoveries := []map[string]interface{}{}
Expand Down
7 changes: 5 additions & 2 deletions ibm/service/backuprecovery/data_source_ibm_backup_recoveries_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
func TestAccIbmBackupRecoveriesDataSourceBasic(t *testing.T) {
name := fmt.Sprintf("tf_recovery_name_%d", acctest.RandIntRange(10, 100))
snapshotEnvironment := "kPhysical"
objectId := 3
objectId := 344
targetenvironment := "kPhysical"
absolutePath := "/data/"
absolutePath := "/mnt"
restoreEntityType := "kRegular"
recoveryAction := "RecoverFiles"

Expand Down Expand Up @@ -51,12 +51,14 @@ func testAccCheckIbmBackupRecoveriesDataSourceConfigBasic(objectId int, name, sn

data "ibm_backup_recovery_object_snapshots" "object_snapshot" {
x_ibm_tenant_id = "%s"

object_id = %d
}

resource "ibm_backup_recovery" "baas_recovery_instance" {
x_ibm_tenant_id = "%s"
snapshot_environment = "%s"

name = "%s"
physical_params {
recovery_action = "%s"
Expand All @@ -81,6 +83,7 @@ func testAccCheckIbmBackupRecoveriesDataSourceConfigBasic(objectId int, name, sn

data "ibm_backup_recoveries" "baas_recoveries_instance" {
x_ibm_tenant_id = "%[1]s"

ids = [ ibm_backup_recovery.baas_recovery_instance.recovery_id ]
}
`, tenantId, objectId, tenantId, snapshotEnvironment, name, recoveryAction, targetenvironment, absolutePath, objectId, restoreEntityType, absolutePath)
Expand Down
11 changes: 11 additions & 0 deletions ibm/service/backuprecovery/data_source_ibm_backup_recovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2208,6 +2208,11 @@ func dataSourceIbmBackupRecoveryRead(context context.Context, d *schema.Resource
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
endpointType := d.Get("endpoint_type").(string)
instanceId, region := getInstanceIdAndRegion(d)
if instanceId != "" && region != "" {
backupRecoveryClient = getClientWithInstanceEndpoint(backupRecoveryClient, instanceId, region, endpointType)
}

getRecoveryByIdOptions := &backuprecoveryv1.GetRecoveryByIdOptions{}
tenantId := d.Get("x_ibm_tenant_id").(string)
Expand All @@ -2223,6 +2228,12 @@ func dataSourceIbmBackupRecoveryRead(context context.Context, d *schema.Resource
recoveryId := fmt.Sprintf("%s::%s", tenantId, d.Get("recovery_id").(string))
d.SetId(recoveryId)

if endpoint, ok := d.GetOk("backup_recovery_endpoint"); ok {
if err := d.Set("backup_recovery_endpoint", endpoint); err != nil {
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting backup_recovery_endpoint: %s", err), "(Data) ibm_backup_recovery_recovery", "read", "set-backup-recovery-endpoint").GetDiag()
}
}

if !core.IsNil(recovery.Name) {
if err = d.Set("name", recovery.Name); err != nil {
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting name: %s", err), "(Data) ibm_backup_recovery_recovery", "read", "set-name").GetDiag()
Expand Down
Loading
Loading