feat(deps): upgrade resty v2 → v3 (resty.dev/v3 v3.0.0-rc.2)

- Update import path to resty.dev/v3
- Rename resp.IsError() → IsStatusFailure(), IsSuccess() → IsStatusSuccess()
- Replace removed resp.Body() with resp.Bytes()
- Add Close() error to Gateway interface and GatewayCommon
- Add SetRetryAllowNonIdempotent(true) to preserve POST retry behaviour
- Move Nokia SID cookie from client-level to per-request injection,
  since v3 has no ClearCookies() API; update tests accordingly
- Update BaseURL field access to BaseURL() method call

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: hugoh

arcadyan.go

@@ -67,7 +67,7 @@ func (a *ArcadyanGateway) Login(ctx context.Context) error {
 		return fmt.Errorf("login request failed: %w", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		return NewAuthError(resp.StatusCode(), resp.String(), nil)
 	}
 
@@ -102,7 +102,7 @@ func (a *ArcadyanGateway) Reboot(ctx context.Context) error {
 		return fmt.Errorf("reboot request failed: %w", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		status := resp.StatusCode()
 		if status == http.StatusUnauthorized || status == http.StatusForbidden {
 			a.logout()
@@ -129,12 +129,12 @@ func (a *ArcadyanGateway) Request(ctx context.Context, method, path string) (*In
 		return nil, fmt.Errorf("request failed: %w", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		return nil, fmt.Errorf("%w: HTTP %d", ErrRequestFailed, resp.StatusCode())
 	}
 
 	contentType := resp.Header().Get("Content-Type")
-	body := resp.Body()
+	body := resp.Bytes()
 
 	var data map[string]any
 	if strings.HasPrefix(contentType, jsonContentType) {
@@ -172,7 +172,7 @@ func (a *ArcadyanGateway) Status(ctx context.Context) (*StatusResult, error) {
 		if webResult.Error == nil {
 			webResult.Error = NewGatewayError("status", 0, "failed to get registration status", err)
 		}
-	case resp.IsError():
+	case resp.IsStatusFailure():
 		if webResult.Error == nil {
 			webResult.Error = NewGatewayError(
 				"status",
@@ -199,7 +199,7 @@ func (a *ArcadyanGateway) Signal(ctx context.Context) (*SignalResult, error) {
 		return nil, NewGatewayError("signal", 0, "failed to get signal info", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		return nil, NewGatewayError(
 			"signal",
 			resp.StatusCode(),

arcadyan_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"resty.dev/v3"
 )
 
 func newArcadyan(gc *GatewayCommon, token string, exp time.Time) *ArcadyanGateway {

gateway.go

@@ -6,14 +6,15 @@ import (
 	"net"
 	"strings"
 
-	"github.com/go-resty/resty/v2"
+	"resty.dev/v3"
 )
 
 // Gateway defines the interface for T-Mobile gateway implementations.
 //
 // Implementations are not safe for concurrent use: Login mutates shared
 // client state such as auth headers and cookies.
 type Gateway interface {
+	Close() error
 	Login(ctx context.Context) error
 	Reboot(ctx context.Context) error
 	Request(ctx context.Context, method, path string) (*InfoResult, error)
@@ -54,6 +55,7 @@ func NewGatewayCommon(cfg *GatewayConfig) *GatewayCommon {
 
 	if cfg.Retries > 0 {
 		client.SetRetryCount(cfg.Retries)
+		client.SetRetryAllowNonIdempotent(true)
 	}
 
 	if cfg.Debug {
@@ -66,6 +68,15 @@ func NewGatewayCommon(cfg *GatewayConfig) *GatewayCommon {
 	}
 }
 
+// Close releases resources held by the underlying HTTP client.
+func (gc *GatewayCommon) Close() error {
+	if err := gc.client.Close(); err != nil {
+		return fmt.Errorf("close client: %w", err)
+	}
+
+	return nil
+}
+
 // CheckWebInterface checks if the gateway web interface is accessible.
 func (gc *GatewayCommon) CheckWebInterface(ctx context.Context) *StatusResult {
 	resp, err := gc.client.R().SetContext(ctx).Head("/")
@@ -79,7 +90,7 @@ func (gc *GatewayCommon) CheckWebInterface(ctx context.Context) *StatusResult {
 	}
 
 	result.StatusCode = resp.StatusCode()
-	result.WebInterfaceUp = resp.IsSuccess()
+	result.WebInterfaceUp = resp.IsStatusSuccess()
 
 	return result
 }

gateway_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/stretchr/testify/assert"
+	"resty.dev/v3"
 )
 
 const testServerErrMsg = "server error"
@@ -85,7 +85,7 @@ func TestNewGatewayCommon_HostForms(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.host, func(t *testing.T) {
 			gc := NewGatewayCommon(&GatewayConfig{Host: tc.host})
-			assert.Equal(t, tc.want, gc.client.BaseURL)
+			assert.Equal(t, tc.want, gc.client.BaseURL())
 		})
 	}
 }

go.mod

@@ -3,8 +3,8 @@ module github.com/hugoh/tmhi-gateway/v2
 go 1.26.0
 
 require (
-	github.com/go-resty/resty/v2 v2.17.2
 	github.com/stretchr/testify v1.11.1
+	resty.dev/v3 v3.0.0-rc.2
 )
 
 require (

go.sum

@@ -1,16 +1,14 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-resty/resty/v2 v2.17.2 h1:FQW5oHYcIlkCNrMD2lloGScxcHJ0gkjshV3qcQAyHQk=
-github.com/go-resty/resty/v2 v2.17.2/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
-golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+resty.dev/v3 v3.0.0-rc.2 h1:NE6RqPkUd27eQ5dFSb5tfyT3s6XX9ZySp9qZ7Nw1bn0=
+resty.dev/v3 v3.0.0-rc.2/go.mod h1:NTOerrC/4T7/FE6tXIZGIysXXBdgNqwMZuKtxpea9NM=

nokia.go

@@ -65,8 +65,6 @@ func (n *NokiaGateway) Login(ctx context.Context) error {
 
 	n.credentials.SID = loginResp.Sid
 	n.credentials.csrfToken = loginResp.CsrfToken
-	//nolint:gosec // Secure/HttpOnly/SameSite only apply to response cookies, not outgoing requests.
-	n.client.SetCookie(&http.Cookie{Name: sidCookieName, Value: n.credentials.SID})
 
 	return nil
 }
@@ -85,12 +83,17 @@ func (n *NokiaGateway) Reboot(ctx context.Context) error {
 		return nil
 	}
 
-	resp, err := n.client.R().SetContext(ctx).SetFormData(formData).Post("/reboot_web_app.cgi")
+	//nolint:gosec // Secure/HttpOnly/SameSite only apply to response cookies, not outgoing requests.
+	resp, err := n.client.R().
+		SetContext(ctx).
+		SetCookie(&http.Cookie{Name: sidCookieName, Value: n.credentials.SID}).
+		SetFormData(formData).
+		Post("/reboot_web_app.cgi")
 	if err != nil {
 		return fmt.Errorf("error sending reboot request: %w", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		status := resp.StatusCode()
 		if status == http.StatusUnauthorized || status == http.StatusForbidden {
 			n.logout()
@@ -131,9 +134,6 @@ func (n *NokiaGateway) isLoggedIn() bool {
 
 func (n *NokiaGateway) logout() {
 	n.credentials = nokiaLoginData{}
-	// resty.Client.SetCookie/SetCookies both append; assign directly to
-	// replace the slice so re-login doesn't accumulate stale sid cookies.
-	n.client.Cookies = nil
 }
 
 func (n *NokiaGateway) getCredentials(
@@ -166,7 +166,7 @@ func (n *NokiaGateway) getCredentials(
 		return nil, NewAuthError(0, "login request failed", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		return nil, NewAuthError(resp.StatusCode(), resp.String(), nil)
 	}
 
@@ -191,7 +191,7 @@ func (n *NokiaGateway) getNonce(ctx context.Context) (*nokiaNonce, error) {
 		return nil, fmt.Errorf("error getting nonce: %w", err)
 	}
 
-	if resp.IsError() {
+	if resp.IsStatusFailure() {
 		return nil, NewGatewayError("nonce", resp.StatusCode(), resp.String(), ErrAuthentication)
 	}
 

nokia_test.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"resty.dev/v3"
 )
 
 const (
@@ -331,25 +331,37 @@ func TestNokiaGateway_NotImplemented(t *testing.T) {
 	})
 }
 
-func TestNokiaGateway_logout_ClearsCookie(t *testing.T) {
-	ts := newTestServer(t, func(w http.ResponseWriter, _ *http.Request) {
+func TestNokiaGateway_logout_ClearsCredentials(t *testing.T) {
+	gw := newNokia(&GatewayCommon{config: &GatewayConfig{}}, testValidSID, testValidToken)
+
+	gw.logout()
+
+	assert.False(t, gw.isLoggedIn(), "logout should clear credentials")
+}
+
+func TestNokiaGateway_Reboot_SendsSIDCookie(t *testing.T) {
+	// Reboot must include the current session SID in the request cookie.
+	var gotCookie string
+
+	ts := newTestServer(t, func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
+
+		if r.Method == http.MethodPost && r.URL.Path == "/reboot_web_app.cgi" {
+			if c, err := r.Cookie(sidCookieName); err == nil {
+				gotCookie = c.Value
+			}
+		}
 	})
 
 	gw := nokiaTestGw(ts, nokiaConfig(ts), testValidSID, testValidToken)
-	//nolint:gosec // Secure/HttpOnly/SameSite only apply to response cookies, not outgoing requests.
-	gw.client.SetCookie(&http.Cookie{Name: sidCookieName, Value: testValidSID})
-
-	gw.logout()
 
-	assert.False(t, gw.isLoggedIn(), "logout should clear credentials")
-	assert.Empty(t, gw.client.Cookies, "logout should clear all resty cookies")
+	require.NoError(t, gw.Reboot(t.Context()))
+	assert.Equal(t, testValidSID, gotCookie, "reboot request must carry the session SID cookie")
 }
 
-func TestNokiaGateway_Reboot_ReloginNoDuplicateCookie(t *testing.T) {
-	// After reboot (which calls logout), a subsequent Login should not
-	// accumulate a second sid cookie from the previous session.
-	callCount := 0
+func TestNokiaGateway_Reboot_ReloginHasFreshSID(t *testing.T) {
+	// After reboot (which calls logout), a subsequent Login must use fresh credentials,
+	// not carry over the old SID.
 	ts := newTestServer(t, func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
@@ -358,34 +370,22 @@ func TestNokiaGateway_Reboot_ReloginNoDuplicateCookie(t *testing.T) {
 		case r.Method == http.MethodGet:
 			_, _ = w.Write([]byte(testNonceBody))
 		case r.Method == http.MethodPost && r.URL.Path == loginWebAppCGI:
-			callCount++
 			_, _ = w.Write([]byte(testLoginRespBody))
-		case r.Method == http.MethodPost && r.URL.Path == "/reboot_web_app.cgi":
-			// pass
 		}
 	})
 
 	gw := nokiaTestGw(ts, nokiaConfig(ts), testValidSID, testValidToken)
-	//nolint:gosec // Secure/HttpOnly/SameSite only apply to response cookies, not outgoing requests.
-	gw.client.SetCookie(&http.Cookie{Name: sidCookieName, Value: testValidSID})
 
 	require.NoError(t, gw.Reboot(t.Context()))
 	require.NoError(t, gw.Login(t.Context()))
 
-	sidCookies := 0
-
-	for _, c := range gw.client.Cookies {
-		if c.Name == sidCookieName {
-			sidCookies++
-		}
-	}
-
 	assert.Equal(
 		t,
-		1,
-		sidCookies,
-		"re-login after reboot must not accumulate duplicate sid cookies",
+		"testSid",
+		gw.credentials.SID,
+		"re-login after reboot must have fresh SID, not the old one",
 	)
+	assert.NotEqual(t, testValidSID, gw.credentials.SID)
 }
 
 func TestNewNokiaGateway(t *testing.T) {