Update error handling on route data source

Author: ismirlia

ibm/service/power/data_source_ibm_pi_route.go

@@ -5,6 +5,7 @@ package power
 
 import (
 	"context"
+	"fmt"
 	"log"
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
@@ -95,10 +96,12 @@ func DataSourceIBMPIRoute() *schema.Resource {
 	}
 }
 
-func dataSourceIBMPIRouteRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func dataSourceIBMPIRouteRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	sess, err := meta.(conns.ClientSession).IBMPISession()
 	if err != nil {
-		return diag.FromErr(err)
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_route", "read")
+		log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+		return tfErr.GetDiag()
 	}
 
 	cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
@@ -107,7 +110,9 @@ func dataSourceIBMPIRouteRead(ctx context.Context, d *schema.ResourceData, meta
 
 	route, err := client.Get(routeID)
 	if err != nil {
-		return diag.FromErr(err)
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Get failed: %s", err.Error()), "(Data) ibm_pi_route", "read")
+		log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+		return tfErr.GetDiag()
 	}
 
 	d.Set(Attr_Action, route.Action)

ibm/service/power/data_source_ibm_pi_route_test.go

@@ -31,7 +31,7 @@ func TestAccIBMPIRouteDataSource_basic(t *testing.T) {
 func testAccCheckIBMPIRouteDataSourceConfig() string {
 	return fmt.Sprintf(`
 		data "ibm_pi_route" "route_data" {
-			pi_cloud_instance_id = "%[2]s"
-			pi_route_id          = "%[1]s"
-		}`, acc.Pi_route_id, acc.Pi_cloud_instance_id)
+			pi_cloud_instance_id = "%[1]s"
+			pi_route_id          = "%[2]s"
+		}`, acc.Pi_cloud_instance_id, acc.Pi_route_id)
 }

ibm/service/power/data_source_ibm_pi_routes.go

@@ -5,6 +5,7 @@ package power
 
 import (
 	"context"
+	"fmt"
 	"log"
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
@@ -105,18 +106,22 @@ func DataSourceIBMPIRoutes() *schema.Resource {
 	}
 }
 
-func dataSourceIBMPIRoutesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func dataSourceIBMPIRoutesRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	sess, err := meta.(conns.ClientSession).IBMPISession()
 	if err != nil {
-		return diag.FromErr(err)
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_routes", "read")
+		log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+		return tfErr.GetDiag()
 	}
 
 	cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
 	client := instance.NewIBMPIRouteClient(ctx, sess, cloudInstanceID)
 
 	routes, err := client.GetAll()
 	if err != nil {
-		return diag.FromErr(err)
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetAll failed: %s", err.Error()), "(Data) ibm_pi_routes", "read")
+		log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+		return tfErr.GetDiag()
 	}
 	var clientgenU, _ = uuid.GenerateUUID()
 	d.SetId(clientgenU)
@@ -125,10 +130,10 @@ func dataSourceIBMPIRoutesRead(ctx context.Context, d *schema.ResourceData, meta
 	return nil
 }
 
-func flattenRoutes(routes []*models.Route, meta interface{}) []map[string]interface{} {
-	result := make([]map[string]interface{}, len(routes))
+func flattenRoutes(routes []*models.Route, meta any) []map[string]any {
+	result := make([]map[string]any, len(routes))
 	for _, r := range routes {
-		route := map[string]interface{}{
+		route := map[string]any{
 			Attr_RouteID:         r.ID,
 			Attr_Action:          r.Action,
 			Attr_Advertise:       r.Advertise,