silent identity err for datasources

Author: yfodil

internal/services/vpc/acl.go

@@ -150,16 +150,9 @@ func ResourceVPCACLCreate(ctx context.Context, d *schema.ResourceData, m any) di
 
 	d.SetId(regional.NewIDString(region, regional.ExpandID(d.Get("vpc_id").(string)).ID))
 
-	identity, err := d.Identity()
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if err = identity.Set("id", regional.ExpandID(d.Get("vpc_id").(string)).ID); err != nil {
-		return diag.FromErr(err)
-	}
-	if err = identity.Set("region", region); err != nil {
-		return diag.FromErr(err)
+	if identity, err := d.Identity(); err == nil && identity != nil {
+		_ = identity.Set("id", regional.ExpandID(d.Get("vpc_id").(string)).ID)
+		_ = identity.Set("region", region)
 	}
 
 	return ResourceVPCACLRead(ctx, d, m)

internal/services/vpc/private_network.go

@@ -303,16 +303,9 @@ func ResourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("ipv4_subnet", ipv4Subnet)
 	_ = d.Set("ipv6_subnets", ipv6Subnets)
 
-	identity, err := d.Identity()
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if err = identity.Set("id", pn.ID); err != nil {
-		return diag.FromErr(err)
-	}
-	if err = identity.Set("region", region); err != nil {
-		return diag.FromErr(err)
+	if identity, err := d.Identity(); err == nil && identity != nil {
+		_ = identity.Set("id", pn.ID)
+		_ = identity.Set("region", region)
 	}
 
 	return nil

internal/services/vpc/route.go

@@ -182,6 +182,11 @@ func ResourceRouteRead(ctx context.Context, d *schema.ResourceData, m any) diag.
 		_ = d.Set("tags", res.Tags)
 	}
 
+	if identity, err := d.Identity(); err == nil && identity != nil {
+		_ = identity.Set("id", res.ID)
+		_ = identity.Set("region", region)
+	}
+
 	return nil
 }
 

internal/services/vpc/vpc.go

@@ -177,16 +177,9 @@ func ResourceVPCRead(ctx context.Context, d *schema.ResourceData, m any) diag.Di
 		_ = d.Set("tags", res.Tags)
 	}
 
-	identity, err := d.Identity()
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if err = identity.Set("id", res.ID); err != nil {
-		return diag.FromErr(err)
-	}
-	if err = identity.Set("region", region); err != nil {
-		return diag.FromErr(err)
+	if identity, err := d.Identity(); err == nil && identity != nil {
+		_ = identity.Set("id", res.ID)
+		_ = identity.Set("region", region)
 	}
 
 	return nil