7️⃣ all: upgrade to go 1.27

Author: database64128

go.mod

@@ -1,6 +1,6 @@
 module github.com/database64128/ddns-go
 
-go 1.26.0
+go 1.27.0
 
 require (
 	github.com/lmittmann/tint v1.2.0

internal/httpreq/httpreq.go

@@ -3,7 +3,7 @@ package httpreq
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"io"
 	"net"

jsoncfg/duration.go

@@ -2,20 +2,25 @@ package jsoncfg
 
 import "time"
 
-// Duration is [time.Duration] but implements [encoding.TextMarshaler] and [encoding.TextUnmarshaler].
+// Duration is [time.Duration] but uses its string representation for marshaling and unmarshaling.
 type Duration time.Duration
 
-// Value returns the duration as [time.Duration].
+// Value returns the duration as a [time.Duration].
 func (d Duration) Value() time.Duration {
 	return time.Duration(d)
 }
 
-// MarshalText implements [encoding.TextMarshaler.MarshalText].
+// AppendText implements [encoding.TextAppender].
+func (d Duration) AppendText(b []byte) ([]byte, error) {
+	return append(b, time.Duration(d).String()...), nil
+}
+
+// MarshalText implements [encoding.TextMarshaler].
 func (d Duration) MarshalText() ([]byte, error) {
 	return []byte(time.Duration(d).String()), nil
 }
 
-// UnmarshalText implements [encoding.TextUnmarshaler.UnmarshalText].
+// UnmarshalText implements [encoding.TextUnmarshaler].
 func (d *Duration) UnmarshalText(text []byte) error {
 	duration, err := time.ParseDuration(string(text))
 	if err != nil {

jsoncfg/jsoncfg.go

@@ -1,7 +1,8 @@
 package jsoncfg
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"os"
 )
 
@@ -15,9 +16,7 @@ func Load(path string, v any) error {
 	}
 	defer f.Close()
 
-	dec := json.NewDecoder(f)
-	dec.DisallowUnknownFields()
-	return dec.Decode(v)
+	return json.UnmarshalRead(f, v, json.RejectUnknownMembers(true))
 }
 
 // Save encodes v into JSON and saves it to the file at path.
@@ -28,8 +27,5 @@ func Save(path string, v any) error {
 	}
 	defer f.Close()
 
-	enc := json.NewEncoder(f)
-	enc.SetEscapeHTML(false)
-	enc.SetIndent("", "    ")
-	return enc.Encode(v)
+	return json.MarshalWrite(f, v, jsontext.Multiline(true))
 }

producer/unifiapi/client.go

@@ -1,15 +1,16 @@
 package unifiapi
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
+	"io"
 	"log/slog"
 	"net/http"
 	"net/netip"
 	"net/url"
 	"time"
+	"uuid"
 
 	"github.com/database64128/ddns-go/internal/httpreq"
 )
@@ -46,8 +47,8 @@ func NewClient(client *http.Client, baseURL, apiKey string) (*Client, error) {
 }
 
 // GetDeviceIPAddress returns the IP address of the specified device in the specified site.
-func (c *Client) GetDeviceIPAddress(ctx context.Context, siteID, deviceID string) (netip.Addr, error) {
-	deviceURL, err := url.JoinPath(c.sitesURL, siteID, "devices", deviceID)
+func (c *Client) GetDeviceIPAddress(ctx context.Context, siteID, deviceID uuid.UUID) (netip.Addr, error) {
+	deviceURL, err := url.JoinPath(c.sitesURL, siteID.String(), "devices", deviceID.String())
 	if err != nil {
 		return netip.Addr{}, fmt.Errorf("failed to join device URL: %w", err)
 	}
@@ -82,21 +83,17 @@ func clientDo(client *http.Client, apiKey string, newRequest func() (*http.Reque
 	defer resp.Body.Close()
 
 	const maxResponseBodySize = 128 * 1024 * 1024 // 128 MiB
-	var buf bytes.Buffer
-	if err := httpreq.ReadResponseBody(&buf, resp, maxResponseBodySize); err != nil {
-		return fmt.Errorf("failed to read response: %w", err)
-	}
-	bodyBytes := buf.Bytes()
+	r := io.LimitReader(resp.Body, maxResponseBodySize)
 
 	if resp.StatusCode != http.StatusOK {
 		var apiErr Error
-		if err := json.Unmarshal(bodyBytes, &apiErr); err != nil {
+		if err := json.UnmarshalRead(r, &apiErr); err != nil {
 			return fmt.Errorf("failed to unmarshal API error response: %w", err)
 		}
 		return &apiErr
 	}
 
-	if err := json.Unmarshal(bodyBytes, v); err != nil {
+	if err := json.UnmarshalRead(r, v); err != nil {
 		return fmt.Errorf("failed to unmarshal response: %w", err)
 	}
 

producer/unifiapi/unifiapi.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"time"
+	"uuid"
 
 	"github.com/database64128/ddns-go/internal/httpreq"
 	"github.com/database64128/ddns-go/jsoncfg"
@@ -22,15 +23,15 @@ import (
 // Source implements [producer.Source].
 type Source struct {
 	client   *Client
-	siteID   string
-	deviceID string
+	siteID   uuid.UUID
+	deviceID uuid.UUID
 }
 
 // NewSource creates a new [Source].
 //
 //   - If client is nil, [http.DefaultClient] is used.
 //   - If baseURL is empty, it defaults to "https://unifi.local".
-func NewSource(client *http.Client, baseURL, apiKey, siteID, deviceID string) (*Source, error) {
+func NewSource(client *http.Client, baseURL, apiKey string, siteID, deviceID uuid.UUID) (*Source, error) {
 	c, err := NewClient(client, baseURL, apiKey)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create UniFi API client: %w", err)
@@ -70,10 +71,10 @@ type ProducerConfig struct {
 	APIKey string `json:"api_key"`
 
 	// SiteID is the site ID.
-	SiteID string `json:"site_id"`
+	SiteID uuid.UUID `json:"site_id"`
 
 	// DeviceID is the device ID.
-	DeviceID string `json:"device_id"`
+	DeviceID uuid.UUID `json:"device_id"`
 
 	// RootCAPaths is a list of paths to PEM-encoded root CA certificates for verifying TLS server certificates.
 	//

provider/cloudflare/client.go

@@ -1,10 +1,10 @@
 package cloudflare
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -237,18 +237,10 @@ func clientDo[R any](client *http.Client, authorizationHeader string, newRequest
 	defer resp.Body.Close()
 
 	const maxResponseBodySize = 128 * 1024 * 1024 // 128 MiB
-	var buf bytes.Buffer
-	if err = httpreq.ReadResponseBody(&buf, resp, maxResponseBodySize); err != nil {
-		return result, fmt.Errorf("failed to read response: %w", err)
-	}
-	bodyBytes := buf.Bytes()
-
-	if resp.StatusCode != http.StatusOK {
-		return result, fmt.Errorf("%w: unexpected status code %d: %q", provider.ErrAPIResponseFailure, resp.StatusCode, bodyBytes)
-	}
+	r := io.LimitReader(resp.Body, maxResponseBodySize)
 
 	var response Response[R]
-	if err = json.Unmarshal(bodyBytes, &response); err != nil {
+	if err = json.UnmarshalRead(r, &response); err != nil {
 		return result, fmt.Errorf("failed to unmarshal response: %w", err)
 	}