refactor: adjust error handling for non-existent resources

internal/api/client.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -25,6 +26,8 @@ type ErrorMessage struct {
 	Message string `json:"message"`
 }
 
+var ErrNotFound = errors.New("not found")
+
 // Client for the Hetzner DNS API.
 type Client struct {
 	requestLock sync.Mutex

internal/api/client_test.go

@@ -97,7 +97,7 @@ func TestClientGetZoneReturnNilIfNotFound(t *testing.T) {
 
 	zone, err := client.GetZone(context.Background(), "12345678")
 
-	require.NoError(t, err)
+	require.Error(t, err)
 	assert.Nil(t, zone)
 }
 
@@ -172,7 +172,7 @@ func TestClientGetRecordReturnNilIfNotFound(t *testing.T) {
 
 	record, err := client.GetRecord(context.Background(), "irrelevant")
 
-	require.NoError(t, err)
+	require.Error(t, err)
 	assert.Nil(t, record)
 }
 

internal/api/primary_server.go

@@ -35,7 +35,7 @@ func (c *Client) GetPrimaryServer(ctx context.Context, id string) (*PrimaryServe
 
 	switch resp.StatusCode {
 	case http.StatusNotFound:
-		return nil, fmt.Errorf("primary server %s not found", id)
+		return nil, fmt.Errorf("primary server %s: %w", id, ErrNotFound)
 	case http.StatusOK:
 		var response *PrimaryServerResponse
 

internal/api/record.go

@@ -112,7 +112,7 @@ func (c *Client) GetRecord(ctx context.Context, recordID string) (*Record, error
 
 	switch resp.StatusCode {
 	case http.StatusNotFound:
-		return nil, nil
+		return nil, fmt.Errorf("record %s: %w", recordID, ErrNotFound)
 	case http.StatusOK:
 		var response *RecordResponse
 

internal/api/zone.go

@@ -86,7 +86,7 @@ func (c *Client) GetZone(ctx context.Context, id string) (*Zone, error) {
 
 	switch resp.StatusCode {
 	case http.StatusNotFound:
-		return nil, nil
+		return nil, fmt.Errorf("zone %s: %w", id, ErrNotFound)
 	case http.StatusOK:
 		var response GetZoneResponse
 

internal/provider/primary_server_resource.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -228,7 +229,7 @@ func (r *primaryServerResource) Read(ctx context.Context, req resource.ReadReque
 
 		return nil
 	})
-	if err != nil && fmt.Sprint(err) != fmt.Sprintf("primary server %s not found", state.ID.ValueString()) {
+	if err != nil && !errors.Is(err, api.ErrNotFound) {
 		resp.Diagnostics.AddError("API Error", fmt.Sprintf("read primary server: %s", err))
 
 		return

internal/provider/record_resource.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -258,7 +259,7 @@ func (r *recordResource) Read(ctx context.Context, req resource.ReadRequest, res
 
 		return nil
 	})
-	if err != nil {
+	if err != nil && !errors.Is(err, api.ErrNotFound) {
 		resp.Diagnostics.AddError("API Error", fmt.Sprintf("read record: %s", err))
 
 		return

internal/provider/zone_resource.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"regexp"
 	"time"
@@ -253,7 +254,7 @@ func (r *zoneResource) Read(ctx context.Context, req resource.ReadRequest, resp
 
 		return nil
 	})
-	if err != nil {
+	if err != nil && !errors.Is(err, api.ErrNotFound) {
 		resp.Diagnostics.AddError("API Error", fmt.Sprintf("read zone: %s", err))
 
 		return