Merge pull request #131 from OpenVPN/improve-read-error-messages

vladhss · web-flow · commit f3f37417a7a9 · 2025-06-22T17:12:37.000+03:00
Add entity ID to error messages for read operations
diff --git a/cloudconnexa/data_source_access_group.go b/cloudconnexa/data_source_access_group.go
@@ -60,7 +60,7 @@ func dataSourceAccessGroupRead(ctx context.Context, data *schema.ResourceData, i
 	group, err := c.AccessGroups.Get(id)
 
 	if err != nil {
-		return diag.FromErr(err)
+		return append(diags, diag.Errorf("Failed to get access group with ID: %s, %s", id, err)...)
 	}
 	if group == nil {
 		return append(diags, diag.Errorf("Access Group with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_host.go b/cloudconnexa/data_source_host.go
@@ -70,7 +70,7 @@ func dataSourceHostRead(ctx context.Context, d *schema.ResourceData, m interface
 	id := d.Get("id").(string)
 	host, err := c.Hosts.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get host with ID: %s, %s", id, err)...)
 	}
 	if host == nil {
 		return append(diags, diag.Errorf("Host with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_host_application.go b/cloudconnexa/data_source_host_application.go
@@ -2,8 +2,6 @@ package cloudconnexa
 
 import (
 	"context"
-	"strings"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa"
@@ -66,11 +64,7 @@ func dataSourceHostApplicationRead(ctx context.Context, data *schema.ResourceDat
 	id := data.Get("id").(string)
 	application, err = c.HostApplications.Get(id)
 	if err != nil {
-		if strings.Contains(err.Error(), "status code: 404") {
-			return append(diags, diag.Errorf("Application with id %s was not found", id)...)
-		} else {
-			return append(diags, diag.FromErr(err)...)
-		}
+		return append(diags, diag.Errorf("Failed to get host application with ID: %s, %s", id, err)...)
 	}
 	if application == nil {
 		return append(diags, diag.Errorf("Application with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_host_connector.go b/cloudconnexa/data_source_host_connector.go
@@ -86,7 +86,7 @@ func dataSourceHostConnectorRead(ctx context.Context, d *schema.ResourceData, m
 	id := d.Get("id").(string)
 	connector, err = c.HostConnectors.GetByID(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get host connector with ID: %s, %s", id, err)...)
 	}
 	if connector == nil {
 		return append(diags, diag.Errorf("Connector with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_host_ip_service.go b/cloudconnexa/data_source_host_ip_service.go
@@ -62,10 +62,12 @@ func dataSourceHostIPService() *schema.Resource {
 //   - diag.Diagnostics: Diagnostics containing any errors that occurred during the operation
 func dataSourceHostIPServiceRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
 	c := i.(*cloudconnexa.Client)
-	service, err := c.HostIPServices.Get(data.Get("id").(string))
+	var diags diag.Diagnostics
+	id := data.Get("id").(string)
+	service, err := c.HostIPServices.Get(id)
 
 	if err != nil {
-		return diag.FromErr(err)
+		return append(diags, diag.Errorf("Failed to get host IP service with ID: %s, %s", id, err)...)
 	}
 	setHostIpServiceResourceData(data, service)
 	return nil
diff --git a/cloudconnexa/data_source_location_context.go b/cloudconnexa/data_source_location_context.go
@@ -70,7 +70,7 @@ func dataSourceLocationContextRead(ctx context.Context, data *schema.ResourceDat
 	context, err := c.LocationContexts.Get(id)
 
 	if err != nil {
-		return diag.FromErr(err)
+		return append(diags, diag.Errorf("Failed to get location context with ID: %s, %s", id, err)...)
 	}
 	if context == nil {
 		return append(diags, diag.Errorf("Location Context with ID %s was not found", id)...)
diff --git a/cloudconnexa/data_source_network.go b/cloudconnexa/data_source_network.go
@@ -75,7 +75,7 @@ func dataSourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interf
 	id := d.Get("id").(string)
 	network, err = c.Networks.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network with ID: %s, %s", id, err)...)
 	}
 	if network == nil {
 		return append(diags, diag.Errorf("Network with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_network_application.go b/cloudconnexa/data_source_network_application.go
@@ -2,8 +2,6 @@ package cloudconnexa
 
 import (
 	"context"
-	"strings"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa"
@@ -64,11 +62,7 @@ func dataSourceNetworkApplicationRead(ctx context.Context, data *schema.Resource
 	id := data.Get("id").(string)
 	application, err = c.NetworkApplications.Get(id)
 	if err != nil {
-		if strings.Contains(err.Error(), "status code: 404") {
-			return append(diags, diag.Errorf("Application with id %s was not found", id)...)
-		} else {
-			return append(diags, diag.FromErr(err)...)
-		}
+		return append(diags, diag.Errorf("Failed to get network application with ID: %s, %s", id, err)...)
 	}
 	if application == nil {
 		return append(diags, diag.Errorf("Application with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_network_connector.go b/cloudconnexa/data_source_network_connector.go
@@ -86,7 +86,7 @@ func dataSourceNetworkConnectorRead(ctx context.Context, d *schema.ResourceData,
 	id := d.Get("id").(string)
 	connector, err = c.NetworkConnectors.GetByID(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network connector with ID: %s, %s", id, err)...)
 	}
 	if connector == nil {
 		return append(diags, diag.Errorf("Connector with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_network_ip_service.go b/cloudconnexa/data_source_network_ip_service.go
@@ -63,10 +63,12 @@ func dataSourceNetworkIPService() *schema.Resource {
 //   - diag.Diagnostics: Diagnostics containing any errors that occurred during the operation
 func dataSourceNetworkIPServiceRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
 	c := i.(*cloudconnexa.Client)
-	service, err := c.NetworkIPServices.Get(data.Get("id").(string))
+	var diags diag.Diagnostics
+	id := data.Get("id").(string)
+	service, err := c.NetworkIPServices.Get(id)
 
 	if err != nil {
-		return diag.FromErr(err)
+		return append(diags, diag.Errorf("Failed to get network IP service with ID: %s, %s", id, err)...)
 	}
 	setNetworkIpServiceResourceData(data, service)
 	return nil
diff --git a/cloudconnexa/data_source_network_routes.go b/cloudconnexa/data_source_network_routes.go
@@ -72,13 +72,13 @@ func dataSourceNetworkRoutesRead(ctx context.Context, d *schema.ResourceData, m
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
 
-	networkId := d.Get("id").(string)
-	if networkId == "" {
+	id := d.Get("id").(string)
+	if id == "" {
 		return append(diags, diag.Errorf("ID cannot be empty")...)
 	}
-	network, err := c.Networks.Get(networkId)
+	network, err := c.Networks.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network with ID: %s, %s", id, err)...)
 	}
 
 	configRoutes := make([]map[string]interface{}, len(network.Routes))
@@ -94,7 +94,7 @@ func dataSourceNetworkRoutesRead(ctx context.Context, d *schema.ResourceData, m
 	if err := d.Set("routes", configRoutes); err != nil {
 		return append(diags, diag.FromErr(err)...)
 	}
-	d.SetId(networkId)
+	d.SetId(id)
 
 	return diags
 }
diff --git a/cloudconnexa/data_source_user.go b/cloudconnexa/data_source_user.go
@@ -124,7 +124,7 @@ func dataSourceUserRead(ctx context.Context, d *schema.ResourceData, m interface
 	userName := d.Get("username").(string)
 	user, err := c.Users.GetByUsername(userName)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return diag.Errorf("Failed to get user with username: %s, %s", userName, err)
 	}
 	if user == nil {
 		return append(diags, diag.Errorf("User with name %s was not found", userName)...)
diff --git a/cloudconnexa/data_source_user_group.go b/cloudconnexa/data_source_user_group.go
@@ -2,8 +2,6 @@ package cloudconnexa
 
 import (
 	"context"
-	"strings"
-
 	"github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -89,11 +87,7 @@ func dataSourceUserGroupRead(ctx context.Context, d *schema.ResourceData, m inte
 	id := d.Get("id").(string)
 	userGroup, err = c.UserGroups.Get(id)
 	if err != nil {
-		if strings.Contains(err.Error(), "user group not found") {
-			return append(diags, diag.Errorf("User group with id %s was not found", id)...)
-		} else {
-			return append(diags, diag.FromErr(err)...)
-		}
+		return diag.Errorf("Failed to get user group with ID: %s, %s", id, err)
 	}
 	if userGroup == nil {
 		return append(diags, diag.Errorf("User group with id %s was not found", id)...)
diff --git a/cloudconnexa/data_source_vpn_region.go b/cloudconnexa/data_source_vpn_region.go
@@ -62,14 +62,14 @@ func dataSourceVpnRegion() *schema.Resource {
 func dataSourceVpnRegionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	vpnRegionID := d.Get("id").(string)
+	id := d.Get("id").(string)
 
-	vpnRegion, err := c.VPNRegions.GetByID(vpnRegionID)
+	vpnRegion, err := c.VPNRegions.GetByID(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return diag.Errorf("Failed to get vpn region with ID: %s, %s", id, err)
 	}
 	if vpnRegion == nil {
-		return append(diags, diag.Errorf("VPN region with id %s was not found", vpnRegionID)...)
+		return append(diags, diag.Errorf("VPN region with id %s was not found", id)...)
 	}
 
 	d.SetId(vpnRegion.ID)
diff --git a/cloudconnexa/resource_access_group.go b/cloudconnexa/resource_access_group.go
@@ -161,7 +161,7 @@ func resourceAccessGroupRead(ctx context.Context, d *schema.ResourceData, m inte
 	id := d.Id()
 	ag, err := c.AccessGroups.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get access group with ID: %s, %s", id, err)...)
 	}
 	if ag == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_dns_record.go b/cloudconnexa/resource_dns_record.go
@@ -111,10 +111,10 @@ func resourceDnsRecordCreate(ctx context.Context, d *schema.ResourceData, m inte
 func resourceDnsRecordRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	recordId := d.Id()
-	r, err := c.DNSRecords.GetDNSRecord(recordId)
+	id := d.Id()
+	r, err := c.DNSRecords.GetDNSRecord(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get DNS record with ID: %s, %s", id, err)...)
 	}
 	if r == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_host.go b/cloudconnexa/resource_host.go
@@ -82,9 +82,10 @@ func resourceHostCreate(ctx context.Context, d *schema.ResourceData, m interface
 func resourceHostRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	host, err := c.Hosts.Get(d.Id())
+	id := d.Id()
+	host, err := c.Hosts.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get host with ID: %s, %s", id, err)...)
 	}
 	if host == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_host_application.go b/cloudconnexa/resource_host_application.go
@@ -140,9 +140,10 @@ func customApplicationTypesConfig() map[string]*schema.Schema {
 func resourceHostApplicationRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
 	c := i.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	application, err := c.HostApplications.Get(data.Id())
+	id := data.Id()
+	application, err := c.HostApplications.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get host application with ID: %s, %s", id, err)...)
 	}
 	if application == nil {
 		data.SetId("")
diff --git a/cloudconnexa/resource_host_connector.go b/cloudconnexa/resource_host_connector.go
@@ -133,9 +133,10 @@ func resourceHostConnectorCreate(ctx context.Context, d *schema.ResourceData, m
 func resourceHostConnectorRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	connector, err := c.HostConnectors.GetByID(d.Id())
+	id := d.Id()
+	connector, err := c.HostConnectors.GetByID(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get host connector with ID: %s, %s", id, err)...)
 	}
 	token, err := c.HostConnectors.GetToken(d.Id())
 	if err != nil {
diff --git a/cloudconnexa/resource_host_ip_service.go b/cloudconnexa/resource_host_ip_service.go
@@ -123,9 +123,10 @@ func customHostServiceTypesConfig() map[string]*schema.Schema {
 func resourceHostIpServiceRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
 	c := i.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	service, err := c.HostIPServices.Get(data.Id())
+	id := data.Id()
+	service, err := c.HostIPServices.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get host IP service with ID: %s, %s", id, err)...)
 	}
 	if service == nil {
 		data.SetId("")
diff --git a/cloudconnexa/resource_ipsec_network.go b/cloudconnexa/resource_ipsec_network.go
@@ -257,10 +257,10 @@ func resourceIpsecNetworkCreate(ctx context.Context, d *schema.ResourceData, m i
 func resourceIpsecNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-
-	network, err := c.Networks.Get(d.Id())
+	id := d.Id()
+	network, err := c.Networks.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get ipsec network with ID: %s, %s", id, err)...)
 	}
 
 	if network == nil {
diff --git a/cloudconnexa/resource_location_context.go b/cloudconnexa/resource_location_context.go
@@ -147,10 +147,10 @@ func resourceLocationContextCreate(ctx context.Context, d *schema.ResourceData,
 func resourceLocationContextRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	recordId := d.Id()
-	lc, err := c.LocationContexts.Get(recordId)
+	id := d.Id()
+	lc, err := c.LocationContexts.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get location context with ID: %s, %s", id, err)...)
 	}
 	if lc == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_network.go b/cloudconnexa/resource_network.go
@@ -81,9 +81,10 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf
 func resourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	network, err := c.Networks.Get(d.Id())
+	id := d.Id()
+	network, err := c.Networks.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network with ID: %s, %s", id, err)...)
 	}
 	if network == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_network_application.go b/cloudconnexa/resource_network_application.go
@@ -121,9 +121,10 @@ func resourceNetworkApplicationConfig() *schema.Resource {
 func resourceNetworkApplicationRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
 	c := i.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	application, err := c.NetworkApplications.Get(data.Id())
+	id := data.Id()
+	application, err := c.NetworkApplications.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network application with ID: %s, %s", id, err)...)
 	}
 	if application == nil {
 		data.SetId("")
diff --git a/cloudconnexa/resource_network_connector.go b/cloudconnexa/resource_network_connector.go
@@ -184,9 +184,10 @@ func resourceNetworkConnectorCreate(ctx context.Context, d *schema.ResourceData,
 func resourceNetworkConnectorRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	connector, err := c.NetworkConnectors.GetByID(d.Id())
+	id := d.Id()
+	connector, err := c.NetworkConnectors.GetByID(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network connector with ID: %s, %s", id, err)...)
 	}
 	token, err := c.NetworkConnectors.GetToken(connector.ID)
 	if err != nil {
diff --git a/cloudconnexa/resource_network_ip_service.go b/cloudconnexa/resource_network_ip_service.go
@@ -133,9 +133,10 @@ func customNetworkIpServiceTypesConfig() map[string]*schema.Schema {
 func resourceNetworkIpServiceRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
 	c := i.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	service, err := c.NetworkIPServices.Get(data.Id())
+	id := data.Id()
+	service, err := c.NetworkIPServices.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get network IP service with ID: %s, %s", id, err)...)
 	}
 	if service == nil {
 		data.SetId("")
diff --git a/cloudconnexa/resource_route.go b/cloudconnexa/resource_route.go
@@ -100,10 +100,10 @@ func resourceRouteCreate(ctx context.Context, d *schema.ResourceData, m interfac
 func resourceRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	routeId := d.Id()
-	r, err := c.Routes.Get(routeId)
+	id := d.Id()
+	r, err := c.Routes.Get(id)
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get route with ID: %s, %s", id, err)...)
 	}
 	if r == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_user.go b/cloudconnexa/resource_user.go
@@ -141,11 +141,11 @@ func resourceUserCreate(ctx context.Context, d *schema.ResourceData, m interface
 func resourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*cloudconnexa.Client)
 	var diags diag.Diagnostics
-	userId := d.Id()
-	u, err := c.Users.Get(userId)
+	id := d.Id()
+	u, err := c.Users.Get(id)
 
 	if err != nil {
-		return append(diags, diag.FromErr(err)...)
+		return append(diags, diag.Errorf("Failed to get user with ID: %s, %s", id, err)...)
 	}
 	if u == nil {
 		d.SetId("")
diff --git a/cloudconnexa/resource_user_group.go b/cloudconnexa/resource_user_group.go

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func dataSourceAccessGroupRead(ctx context.Context, data *schema.ResourceData, i`
`60`	`60`	`group, err := c.AccessGroups.Get(id)`
`61`	`61`
`62`	`62`	`if err != nil {`
`63`		`- return diag.FromErr(err)`
	`63`	`+ return append(diags, diag.Errorf("Failed to get access group with ID: %s, %s", id, err)...)`
`64`	`64`	`}`
`65`	`65`	`if group == nil {`
`66`	`66`	`return append(diags, diag.Errorf("Access Group with id %s was not found", id)...)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func dataSourceHostRead(ctx context.Context, d *schema.ResourceData, m interface`
`70`	`70`	`id := d.Get("id").(string)`
`71`	`71`	`host, err := c.Hosts.Get(id)`
`72`	`72`	`if err != nil {`
`73`		`- return append(diags, diag.FromErr(err)...)`
	`73`	`+ return append(diags, diag.Errorf("Failed to get host with ID: %s, %s", id, err)...)`
`74`	`74`	`}`
`75`	`75`	`if host == nil {`
`76`	`76`	`return append(diags, diag.Errorf("Host with id %s was not found", id)...)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func dataSourceHostConnectorRead(ctx context.Context, d *schema.ResourceData, m`
`86`	`86`	`id := d.Get("id").(string)`
`87`	`87`	`connector, err = c.HostConnectors.GetByID(id)`
`88`	`88`	`if err != nil {`
`89`		`- return append(diags, diag.FromErr(err)...)`
	`89`	`+ return append(diags, diag.Errorf("Failed to get host connector with ID: %s, %s", id, err)...)`
`90`	`90`	`}`
`91`	`91`	`if connector == nil {`
`92`	`92`	`return append(diags, diag.Errorf("Connector with id %s was not found", id)...)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func dataSourceLocationContextRead(ctx context.Context, data *schema.ResourceDat`
`70`	`70`	`context, err := c.LocationContexts.Get(id)`
`71`	`71`
`72`	`72`	`if err != nil {`
`73`		`- return diag.FromErr(err)`
	`73`	`+ return append(diags, diag.Errorf("Failed to get location context with ID: %s, %s", id, err)...)`
`74`	`74`	`}`
`75`	`75`	`if context == nil {`
`76`	`76`	`return append(diags, diag.Errorf("Location Context with ID %s was not found", id)...)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func dataSourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interf`
`75`	`75`	`id := d.Get("id").(string)`
`76`	`76`	`network, err = c.Networks.Get(id)`
`77`	`77`	`if err != nil {`
`78`		`- return append(diags, diag.FromErr(err)...)`
	`78`	`+ return append(diags, diag.Errorf("Failed to get network with ID: %s, %s", id, err)...)`
`79`	`79`	`}`
`80`	`80`	`if network == nil {`
`81`	`81`	`return append(diags, diag.Errorf("Network with id %s was not found", id)...)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func dataSourceNetworkConnectorRead(ctx context.Context, d *schema.ResourceData,`
`86`	`86`	`id := d.Get("id").(string)`
`87`	`87`	`connector, err = c.NetworkConnectors.GetByID(id)`
`88`	`88`	`if err != nil {`
`89`		`- return append(diags, diag.FromErr(err)...)`
	`89`	`+ return append(diags, diag.Errorf("Failed to get network connector with ID: %s, %s", id, err)...)`
`90`	`90`	`}`
`91`	`91`	`if connector == nil {`
`92`	`92`	`return append(diags, diag.Errorf("Connector with id %s was not found", id)...)`