client: copy SetOptions onto setAction

client/keys.go

@@ -121,10 +121,12 @@ type httpKeysAPI struct {
 
 func (k *httpKeysAPI) Set(ctx context.Context, key, val string, opts SetOptions) (*Response, error) {
 	act := &setAction{
-		Prefix:  k.prefix,
-		Key:     key,
-		Value:   val,
-		Options: opts,
+		Prefix:    k.prefix,
+		Key:       key,
+		Value:     val,
+		PrevValue: opts.PrevValue,
+		PrevIndex: opts.PrevIndex,
+		PrevExist: opts.PrevExist,
 	}
 
 	resp, body, err := k.client.Do(ctx, act)
@@ -268,24 +270,26 @@ func (w *waitAction) HTTPRequest(ep url.URL) *http.Request {
 }
 
 type setAction struct {
-	Prefix  string
-	Key     string
-	Value   string
-	Options SetOptions
+	Prefix    string
+	Key       string
+	Value     string
+	PrevValue string
+	PrevIndex uint64
+	PrevExist PrevExistType
 }
 
 func (a *setAction) HTTPRequest(ep url.URL) *http.Request {
 	u := v2KeysURL(ep, a.Prefix, a.Key)
 
 	params := u.Query()
-	if a.Options.PrevValue != "" {
-		params.Set("prevValue", a.Options.PrevValue)
+	if a.PrevValue != "" {
+		params.Set("prevValue", a.PrevValue)
 	}
-	if a.Options.PrevIndex != 0 {
-		params.Set("prevIndex", strconv.FormatUint(a.Options.PrevIndex, 10))
+	if a.PrevIndex != 0 {
+		params.Set("prevIndex", strconv.FormatUint(a.PrevIndex, 10))
 	}
-	if a.Options.PrevExist != PrevIgnore {
-		params.Set("prevExist", string(a.Options.PrevExist))
+	if a.PrevExist != PrevIgnore {
+		params.Set("prevExist", string(a.PrevExist))
 	}
 	u.RawQuery = params.Encode()
 

client/keys_test.go

@@ -257,10 +257,8 @@ func TestSetAction(t *testing.T) {
 		// PrevExist set, but still ignored
 		{
 			act: setAction{
-				Key: "foo",
-				Options: SetOptions{
-					PrevExist: PrevIgnore,
-				},
+				Key:       "foo",
+				PrevExist: PrevIgnore,
 			},
 			wantURL:  "http://example.com/foo",
 			wantBody: "value=",
@@ -269,10 +267,8 @@ func TestSetAction(t *testing.T) {
 		// PrevExist set to true
 		{
 			act: setAction{
-				Key: "foo",
-				Options: SetOptions{
-					PrevExist: PrevExist,
-				},
+				Key:       "foo",
+				PrevExist: PrevExist,
 			},
 			wantURL:  "http://example.com/foo?prevExist=true",
 			wantBody: "value=",
@@ -281,10 +277,8 @@ func TestSetAction(t *testing.T) {
 		// PrevExist set to false
 		{
 			act: setAction{
-				Key: "foo",
-				Options: SetOptions{
-					PrevExist: PrevNoExist,
-				},
+				Key:       "foo",
+				PrevExist: PrevNoExist,
 			},
 			wantURL:  "http://example.com/foo?prevExist=false",
 			wantBody: "value=",
@@ -293,10 +287,8 @@ func TestSetAction(t *testing.T) {
 		// PrevValue is urlencoded
 		{
 			act: setAction{
-				Key: "foo",
-				Options: SetOptions{
-					PrevValue: "bar baz",
-				},
+				Key:       "foo",
+				PrevValue: "bar baz",
 			},
 			wantURL:  "http://example.com/foo?prevValue=bar+baz",
 			wantBody: "value=",
@@ -305,10 +297,8 @@ func TestSetAction(t *testing.T) {
 		// PrevIndex is set
 		{
 			act: setAction{
-				Key: "foo",
-				Options: SetOptions{
-					PrevIndex: uint64(12),
-				},
+				Key:       "foo",
+				PrevIndex: uint64(12),
 			},
 			wantURL:  "http://example.com/foo?prevIndex=12",
 			wantBody: "value=",