Skip to content

Commit 0aee5ad

Browse files
IBM-DeekshaDeeksha Sharma
andauthored
fix: backuprecovery client error handling (IBM-Cloud#6225)
Co-authored-by: Deeksha Sharma <[email protected]>
1 parent 0518715 commit 0aee5ad

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

ibm/conns/config.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,15 +1655,16 @@ func (c *Config) ClientSession() (interface{}, error) {
16551655
}
16561656
// Construct the service client.
16571657
session.backupRecoveryClient, err = backuprecoveryv1.NewBackupRecoveryV1(backupRecoveryClientOptions)
1658-
if err == nil {
1658+
if err != nil {
1659+
session.backupRecoveryClientErr = fmt.Errorf("Error occurred while configuring IBM Backup recovery API service: %q", err)
1660+
}
1661+
if session.backupRecoveryClient != nil && session.backupRecoveryClient.Service != nil {
16591662
// Enable retries for API calls
16601663
session.backupRecoveryClient.Service.EnableRetries(c.RetryCount, c.RetryDelay)
16611664
// Add custom header for analytics
16621665
session.backupRecoveryClient.SetDefaultHeaders(gohttp.Header{
16631666
"X-Original-User-Agent": {fmt.Sprintf("terraform-provider-ibm/%s", version.Version)},
16641667
})
1665-
} else {
1666-
session.backupRecoveryClientErr = fmt.Errorf("Error occurred while configuring IBM Backup recovery API service: %q", err)
16671668
}
16681669

16691670
var backupRecoveryConnectorClientAuthenticator core.Authenticator
@@ -1676,15 +1677,16 @@ func (c *Config) ClientSession() (interface{}, error) {
16761677

16771678
// Construct the service connector client.
16781679
session.backupRecoveryConnectorClient, err = backuprecoveryv1.NewBackupRecoveryV1Connector(backupRecoveryConnectorClientOptions)
1679-
if err == nil {
1680+
if err != nil {
1681+
session.backupRecoveryConnectorClientErr = fmt.Errorf("Error occurred while configuring IBM Backup recovery API connector service: %q", err)
1682+
}
1683+
if session.backupRecoveryConnectorClient != nil && session.backupRecoveryConnectorClient.Service != nil {
16801684
// Enable retries for API calls
16811685
session.backupRecoveryConnectorClient.Service.EnableRetries(c.RetryCount, c.RetryDelay)
16821686
// Add custom header for analytics
16831687
session.backupRecoveryConnectorClient.SetDefaultHeaders(gohttp.Header{
16841688
"X-Original-User-Agent": {fmt.Sprintf("terraform-provider-ibm/%s", version.Version)},
16851689
})
1686-
} else {
1687-
session.backupRecoveryConnectorClientErr = fmt.Errorf("Error occurred while configuring IBM Backup recovery API connector service: %q", err)
16881690
}
16891691

16901692
projectEndpoint := project.DefaultServiceURL

0 commit comments

Comments
 (0)