diff --git a/go.mod b/go.mod index ba32646ec05..56f97458e58 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca github.com/IBM/appconfiguration-go-admin-sdk v0.3.0 github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f - github.com/IBM/cloud-databases-go-sdk v0.6.0 + github.com/IBM/cloud-databases-go-sdk v0.7.0 github.com/IBM/cloudant-go-sdk v0.0.43 github.com/IBM/code-engine-go-sdk v0.0.0-20231106200405-99e81b3ee752 github.com/IBM/container-registry-go-sdk v1.1.0 diff --git a/go.sum b/go.sum index ec77d3a45b6..623e6911e2a 100644 --- a/go.sum +++ b/go.sum @@ -116,8 +116,8 @@ github.com/IBM/appconfiguration-go-admin-sdk v0.3.0 h1:OqFxnDxro0JiRwHBKytCcseY2 github.com/IBM/appconfiguration-go-admin-sdk v0.3.0/go.mod h1:xPxAYhr/uywUIDEo/JqWbkUdTryPdzRdYBfUpA5IjoE= github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f h1:4c1kqY4GqmkQ+tO03rneDb74Tv7BhTj8jDiDB1p8mdM= github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f/go.mod h1:d22kTYY7RYBWcQlZpqrSdshpB/lJ16viWS5Sbjtlc8s= -github.com/IBM/cloud-databases-go-sdk v0.6.0 h1:QK3eif7+kusgeuMB54Zw5nco/kDwsDg2sD/84/foDxo= -github.com/IBM/cloud-databases-go-sdk v0.6.0/go.mod h1:nCIVfeZnhBYIiwByT959dFP4VWUeNLxomDYy63tTC6M= +github.com/IBM/cloud-databases-go-sdk v0.7.0 h1:prvLebKD1kcIk81D6yRhOr/TWp1VQJGLhGAasQr7RtA= +github.com/IBM/cloud-databases-go-sdk v0.7.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc= github.com/IBM/cloudant-go-sdk v0.0.43 h1:YxTy4RpAEezX32YIWnds76hrBREmO4u6IkBz1WylNuQ= github.com/IBM/cloudant-go-sdk v0.0.43/go.mod h1:WeYrJPaHTw19943ndWnVfwMIlZ5z0XUM2uEXNBrwZ1M= github.com/IBM/code-engine-go-sdk v0.0.0-20231106200405-99e81b3ee752 h1:S5NT0aKKUqd9hnIrPN/qUijKx9cZjJi3kfFpog0ByDA= diff --git a/ibm/service/database/data_source_ibm_database.go b/ibm/service/database/data_source_ibm_database.go index 2ab901252f0..0ef0cfcf329 100644 --- a/ibm/service/database/data_source_ibm_database.go +++ b/ibm/service/database/data_source_ibm_database.go @@ -1,4 +1,4 @@ -// Copyright IBM Corp. 2017, 2021 All Rights Reserved. +// Copyright IBM Corp. 2024 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 package database diff --git a/ibm/service/database/data_source_ibm_database_backup.go b/ibm/service/database/data_source_ibm_database_backup.go index 17b63cea508..c7df6826b60 100644 --- a/ibm/service/database/data_source_ibm_database_backup.go +++ b/ibm/service/database/data_source_ibm_database_backup.go @@ -1,4 +1,4 @@ -// Copyright IBM Corp. 2022 All Rights Reserved. +// Copyright IBM Corp. 2024 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 package database @@ -68,7 +68,9 @@ func DataSourceIBMDatabaseBackup() *schema.Resource { func DataSourceIBMDatabaseBackupRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { cloudDatabasesClient, err := meta.(conns.ClientSession).CloudDatabasesV5() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_backup", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } getBackupInfoOptions := &clouddatabasesv5.GetBackupInfoOptions{} @@ -77,42 +79,50 @@ func DataSourceIBMDatabaseBackupRead(context context.Context, d *schema.Resource backup, response, err := cloudDatabasesClient.GetBackupInfoWithContext(context, getBackupInfoOptions) if err != nil { - log.Printf("[DEBUG] GetBackupInfoWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("GetBackupInfoWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetBackupInfoWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_database_backup", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(*backup.Backup.ID) if err = d.Set("backup_id", backup.Backup.ID); err != nil { - return diag.FromErr(fmt.Errorf("Error setting id: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting backup_id: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } - if err = d.Set("deployment_id", backup.Backup.DeploymentID); err != nil { - return diag.FromErr(fmt.Errorf("Error setting deployment_id: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting deployment_id: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } if err = d.Set("type", backup.Backup.Type); err != nil { - return diag.FromErr(fmt.Errorf("Error setting type: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting type: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } if err = d.Set("status", backup.Backup.Status); err != nil { - return diag.FromErr(fmt.Errorf("Error setting status: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting status: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } if err = d.Set("is_downloadable", backup.Backup.IsDownloadable); err != nil { - return diag.FromErr(fmt.Errorf("Error setting is_downloadable: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting is_downloadable: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } if err = d.Set("is_restorable", backup.Backup.IsRestorable); err != nil { - return diag.FromErr(fmt.Errorf("Error setting is_restorable: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting is_restorable: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } if err = d.Set("download_link", backup.Backup.DownloadLink); err != nil { - return diag.FromErr(fmt.Errorf("Error setting download_link: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting download_link: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } if err = d.Set("created_at", flex.DateTimeToString(backup.Backup.CreatedAt)); err != nil { - return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting created_at: %s", err), "(Data) ibm_database_backup", "read") + return tfErr.GetDiag() } return nil diff --git a/ibm/service/database/data_source_ibm_database_backups.go b/ibm/service/database/data_source_ibm_database_backups.go index a1dfa7f4dba..744e775b32e 100644 --- a/ibm/service/database/data_source_ibm_database_backups.go +++ b/ibm/service/database/data_source_ibm_database_backups.go @@ -1,4 +1,4 @@ -// Copyright IBM Corp. 2022 All Rights Reserved. +// Copyright IBM Corp. 2024 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 package database @@ -13,6 +13,7 @@ import ( "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-Cloud/terraform-provider-ibm/ibm/validate" "github.com/IBM/cloud-databases-go-sdk/clouddatabasesv5" ) @@ -102,7 +103,9 @@ func DataSourceIBMDatabaseBackupsValidator() *validate.ResourceValidator { func DataSourceIBMDatabaseBackupsRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { cloudDatabasesClient, err := meta.(conns.ClientSession).CloudDatabasesV5() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_backups", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } listDeploymentBackupsOptions := &clouddatabasesv5.ListDeploymentBackupsOptions{} @@ -110,8 +113,9 @@ func DataSourceIBMDatabaseBackupsRead(context context.Context, d *schema.Resourc backups, response, err := cloudDatabasesClient.ListDeploymentBackupsWithContext(context, listDeploymentBackupsOptions) if err != nil { - log.Printf("[DEBUG] ListDeploymentBackupsWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("ListDeploymentBackupsWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListDeploymentBackupsWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_database_backups", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } // Use the provided filter argument and construct a new list with only the requested resource(s) @@ -134,7 +138,8 @@ func DataSourceIBMDatabaseBackupsRead(context context.Context, d *schema.Resourc if suppliedFilter { if len(backups.Backups) == 0 { - return diag.FromErr(fmt.Errorf("no Backups found with deploymentID %s", deploymentID)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("no Backups found with deploymentID %s", deploymentID), "(Data) ibm_database_backups", "read") + return tfErr.GetDiag() } d.SetId(deploymentID) } else { @@ -146,13 +151,15 @@ func DataSourceIBMDatabaseBackupsRead(context context.Context, d *schema.Resourc for _, modelItem := range backups.Backups { modelMap, err := DataSourceIBMDatabaseBackupsBackupToMap(&modelItem) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_backups", "read") + return tfErr.GetDiag() } backups2 = append(backups2, modelMap) } } if err = d.Set("backups", backups2); err != nil { - return diag.FromErr(fmt.Errorf("Error setting backups %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting backups: %s", err), "(Data) ibm_database_backups", "read") + return tfErr.GetDiag() } return nil diff --git a/ibm/service/database/data_source_ibm_database_connection.go b/ibm/service/database/data_source_ibm_database_connection.go index cb9429f04a0..c774c52e60a 100644 --- a/ibm/service/database/data_source_ibm_database_connection.go +++ b/ibm/service/database/data_source_ibm_database_connection.go @@ -1,4 +1,4 @@ -// Copyright IBM Corp. 2022 All Rights Reserved. +// Copyright IBM Corp. 2024 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 package database @@ -1641,7 +1641,9 @@ func DataSourceIBMDatabaseConnectionValidator() *validate.ResourceValidator { func DataSourceIBMDatabaseConnectionRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { cloudDatabasesClient, err := meta.(conns.ClientSession).CloudDatabasesV5() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } getConnectionOptions := &clouddatabasesv5.GetConnectionOptions{} @@ -1657,8 +1659,9 @@ func DataSourceIBMDatabaseConnectionRead(context context.Context, d *schema.Reso connection, response, err := cloudDatabasesClient.GetConnectionWithContext(context, getConnectionOptions) if err != nil { - log.Printf("[DEBUG] GetConnectionWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("GetConnectionWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetConnectionWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_database_connection", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(DataSourceIBMDatabaseConnectionID(d)) @@ -1668,180 +1671,210 @@ func DataSourceIBMDatabaseConnectionRead(context context.Context, d *schema.Reso if conn.Postgres != nil { modelMap, err := DataSourceIBMDatabaseConnectionPostgreSQLConnectionURIToMap(conn.Postgres) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } postgres = append(postgres, modelMap) } if err = d.Set("postgres", postgres); err != nil { - return diag.FromErr(fmt.Errorf("Error setting postgres %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting postgres: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } cli := []map[string]interface{}{} if conn.Cli != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionCliToMap(conn.Cli) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } cli = append(cli, modelMap) } if err = d.Set("cli", cli); err != nil { - return diag.FromErr(fmt.Errorf("Error setting cli %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting cli: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } rediss := []map[string]interface{}{} if conn.Rediss != nil { modelMap, err := DataSourceIBMDatabaseConnectionRedisConnectionURIToMap(conn.Rediss) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } rediss = append(rediss, modelMap) } if err = d.Set("rediss", rediss); err != nil { - return diag.FromErr(fmt.Errorf("Error setting rediss %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting rediss: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } https := []map[string]interface{}{} if conn.HTTPS != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.HTTPS) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } https = append(https, modelMap) } if err = d.Set("https", https); err != nil { - return diag.FromErr(fmt.Errorf("Error setting https %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting https: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } amqps := []map[string]interface{}{} if conn.Amqps != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.Amqps) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } amqps = append(amqps, modelMap) } if err = d.Set("amqps", amqps); err != nil { - return diag.FromErr(fmt.Errorf("Error setting amqps %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting amqps: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } mqtts := []map[string]interface{}{} if conn.Mqtts != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.Mqtts) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } mqtts = append(mqtts, modelMap) } if err = d.Set("mqtts", mqtts); err != nil { - return diag.FromErr(fmt.Errorf("Error setting mqtts %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting mqtts: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } stompSsl := []map[string]interface{}{} if conn.StompSsl != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.StompSsl) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } stompSsl = append(stompSsl, modelMap) } if err = d.Set("stomp_ssl", stompSsl); err != nil { - return diag.FromErr(fmt.Errorf("Error setting stomp_ssl %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting stomp_ssl: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } grpc := []map[string]interface{}{} if conn.Grpc != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.Grpc) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } grpc = append(grpc, modelMap) } if err = d.Set("grpc", grpc); err != nil { - return diag.FromErr(fmt.Errorf("Error setting grpc %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting grpc: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } mongodb := []map[string]interface{}{} if conn.Mongodb != nil { modelMap, err := DataSourceIBMDatabaseConnectionMongoDbConnectionURIToMap(conn.Mongodb) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } mongodb = append(mongodb, modelMap) } if err = d.Set("mongodb", mongodb); err != nil { - return diag.FromErr(fmt.Errorf("Error setting mongodb %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting mongodb: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } biConnector := []map[string]interface{}{} if conn.BiConnector != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.BiConnector) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } biConnector = append(biConnector, modelMap) } if err = d.Set("bi_connector", biConnector); err != nil { - return diag.FromErr(fmt.Errorf("Error setting bi_connector %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting bi_connector: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } analytics := []map[string]interface{}{} if conn.Analytics != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.Analytics) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } analytics = append(analytics, modelMap) } if err = d.Set("analytics", analytics); err != nil { - return diag.FromErr(fmt.Errorf("Error setting analytics %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting analytics: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } opsManager := []map[string]interface{}{} if conn.OpsManager != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.OpsManager) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } opsManager = append(opsManager, modelMap) } if err = d.Set("ops_manager", opsManager); err != nil { - return diag.FromErr(fmt.Errorf("Error setting ops_manager %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting ops_manager: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } mysql := []map[string]interface{}{} if conn.Mysql != nil { modelMap, err := DataSourceIBMDatabaseConnectionMySQLConnectionURIToMap(conn.Mysql) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } mysql = append(mysql, modelMap) } if err = d.Set("mysql", mysql); err != nil { - return diag.FromErr(fmt.Errorf("Error setting mysql %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting mysql: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } secure := []map[string]interface{}{} if conn.Secure != nil { modelMap, err := DataSourceIBMDatabaseConnectionDataStaxConnectionURIToMap(conn.Secure) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } secure = append(secure, modelMap) } if err = d.Set("secure", secure); err != nil { - return diag.FromErr(fmt.Errorf("Error setting secure %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secure: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } emp := []map[string]interface{}{} if conn.Emp != nil { modelMap, err := DataSourceIBMDatabaseConnectionConnectionURIToMap(conn.Emp) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } emp = append(emp, modelMap) } if err = d.Set("emp", emp); err != nil { - return diag.FromErr(fmt.Errorf("Error setting emp %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting emp: %s", err), "(Data) ibm_database_connection", "read") + return tfErr.GetDiag() } return nil diff --git a/ibm/service/database/data_source_ibm_database_connection_test.go b/ibm/service/database/data_source_ibm_database_connection_test.go index 0c21d81ffaa..fca45cc4527 100644 --- a/ibm/service/database/data_source_ibm_database_connection_test.go +++ b/ibm/service/database/data_source_ibm_database_connection_test.go @@ -50,11 +50,11 @@ func testAccCheckIBMDatabaseDataSourceConfig2(name string) string { name = "%[1]s" service = "databases-for-postgresql" plan = "standard" - location = "au-syd" + location = "%[2]s" tags = ["one:two"] } - `, name) + `, name, acc.Region()) } func testAccCheckIBMDatabaseInstancePostgresql(name string) string { diff --git a/ibm/service/database/data_source_ibm_database_point_in_time_recovery.go b/ibm/service/database/data_source_ibm_database_point_in_time_recovery.go index 85c49a9ac9e..ccd2a5b20cb 100644 --- a/ibm/service/database/data_source_ibm_database_point_in_time_recovery.go +++ b/ibm/service/database/data_source_ibm_database_point_in_time_recovery.go @@ -1,4 +1,4 @@ -// Copyright IBM Corp. 2022 All Rights Reserved. +// Copyright IBM Corp. 2024 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 package database @@ -8,11 +8,12 @@ import ( "fmt" "log" - "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" - "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" "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-Cloud/terraform-provider-ibm/ibm/validate" "github.com/IBM/cloud-databases-go-sdk/clouddatabasesv5" ) @@ -57,7 +58,9 @@ func DataSourceIBMDatabasePointInTimeRecoveryValidator() *validate.ResourceValid func DataSourceIBMDatabasePointInTimeRecoveryRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { cloudDatabasesClient, err := meta.(conns.ClientSession).CloudDatabasesV5() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_database_pitr", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } getPitrDataOptions := &clouddatabasesv5.GetPitrDataOptions{} @@ -66,8 +69,9 @@ func DataSourceIBMDatabasePointInTimeRecoveryRead(context context.Context, d *sc pointInTimeRecoveryData, response, err := cloudDatabasesClient.GetPitrDataWithContext(context, getPitrDataOptions) if err != nil { - log.Printf("[DEBUG] GetPitrDataWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("GetPitrDataWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetPitrDataWithContext failed %s\n%s", err.Error(), response), "(Data) ibm_database_pitr", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(d.Get("deployment_id").(string)) @@ -75,7 +79,8 @@ func DataSourceIBMDatabasePointInTimeRecoveryRead(context context.Context, d *sc if pointInTimeRecoveryData.PointInTimeRecoveryData.EarliestPointInTimeRecoveryTime != nil { pitr := pointInTimeRecoveryData.PointInTimeRecoveryData.EarliestPointInTimeRecoveryTime if err = d.Set("earliest_point_in_time_recovery_time", pitr); err != nil { - return diag.FromErr(fmt.Errorf("Error setting earliest_point_in_time_recovery_time: %s", err)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting earliest_point_in_time_recovery_time: %s", err), "(Data) ibm_database_pitr", "read") + return tfErr.GetDiag() } }