Fix SetRequestCallbacks/SetResponseCallbacks (hashicorp#242)

Author: averche

client.go

@@ -5,6 +5,7 @@ package vault
 
 import (
 	"fmt"
+	"net/http"
 	"testing"
 	"time"
 
@@ -27,6 +28,12 @@ func Test_Client_Clone(t *testing.T) {
 
 	require.NoError(t, client.SetToken("test-token"))
 	require.NoError(t, client.SetNamespace("test-namespace"))
+	require.NoError(t, client.SetRequestCallbacks(func(req *http.Request) {
+		t.Log(req)
+	}))
+	require.NoError(t, client.SetResponseCallbacks(func(req *http.Request, resp *http.Response) {
+		t.Log(req, resp)
+	}))
 
 	clone := client.Clone()
 

client_test.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"slices"
 	"strings"
 	"sync"
 
@@ -180,8 +181,8 @@ func (c *Client) cloneClientRequestModifiers() requestModifiers {
 
 	var clone requestModifiers
 
-	copy(clone.requestCallbacks, c.clientRequestModifiers.requestCallbacks)
-	copy(clone.responseCallbacks, c.clientRequestModifiers.responseCallbacks)
+	clone.requestCallbacks = slices.Clone(c.clientRequestModifiers.requestCallbacks)
+	clone.responseCallbacks = slices.Clone(c.clientRequestModifiers.responseCallbacks)
 
 	clone.headers = requestHeaders{
 		userAgent:                 c.clientRequestModifiers.headers.userAgent,
@@ -192,7 +193,7 @@ func (c *Client) cloneClientRequestModifiers() requestModifiers {
 		customHeaders:             c.clientRequestModifiers.headers.customHeaders.Clone(),
 	}
 
-	copy(clone.headers.mfaCredentials, c.clientRequestModifiers.headers.mfaCredentials)
+	clone.headers.mfaCredentials = slices.Clone(c.clientRequestModifiers.headers.mfaCredentials)
 
 	return clone
 }

generate/templates/client.handlebars

@@ -10,6 +10,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"net/http"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -228,8 +229,7 @@ func (c *replicationStateCache) clone() replicationStateCache {
 	/* */ c.statesLock.RLock()
 	defer c.statesLock.RUnlock()
 
-	var cloned []string
-	copy(cloned, c.states)
+	cloned := slices.Clone(c.states)
 
 	return replicationStateCache{
 		statesLock: sync.RWMutex{},

replication_consistency.go

@@ -8,6 +8,7 @@ import (
 	"maps"
 	"net/http"
 	"net/url"
+	"slices"
 	"strings"
 	"time"
 	"unicode"
@@ -172,7 +173,7 @@ func (c *Client) ClearCustomHeaders() {
 // SetRequestCallbacks sets callbacks which will be invoked before each request.
 func (c *Client) SetRequestCallbacks(callbacks ...RequestCallback) error {
 	c.clientRequestModifiersLock.Lock()
-	copy(c.clientRequestModifiers.requestCallbacks, callbacks)
+	c.clientRequestModifiers.requestCallbacks = slices.Clone(callbacks)
 	c.clientRequestModifiersLock.Unlock()
 
 	return nil
@@ -189,7 +190,7 @@ func (c *Client) ClearRequestCallbacks() {
 // successful response.
 func (c *Client) SetResponseCallbacks(callbacks ...ResponseCallback) error {
 	c.clientRequestModifiersLock.Lock()
-	copy(c.clientRequestModifiers.responseCallbacks, callbacks)
+	c.clientRequestModifiers.responseCallbacks = slices.Clone(callbacks)
 	c.clientRequestModifiersLock.Unlock()
 
 	return nil