Refactor the deleteDeadLetter and support pass with the context

Author: Joker-hh

client/client.go

@@ -1,17 +1,10 @@
 package client
 
 import (
-	"bytes"
-	"encoding/json"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
-	"path"
-	"strconv"
-	"strings"
 	"time"
 )
 
@@ -189,56 +182,7 @@ func (c *LmstfyClient) RespawnDeadLetter(queue string, limit, ttlSecond int64) (
 	return c.respawnDeadLetter(nil, queue, limit, ttlSecond)
 }
 
+// DeleteDeadLetter deletes the given queue's dead letter
 func (c *LmstfyClient) DeleteDeadLetter(queue string, limit int64) *APIError {
-	if limit <= 0 {
-		return &APIError{
-			Type:   RequestErr,
-			Reason: "limit should be > 0",
-		}
-	}
-	query := url.Values{}
-	query.Add("limit", strconv.FormatInt(limit, 10))
-	req, err := c.getReq(http.MethodDelete, path.Join(queue, "deadletter"), query, nil)
-	if err != nil {
-		return &APIError{
-			Type:   RequestErr,
-			Reason: err.Error(),
-		}
-	}
-	resp, err := c.httpCli.Do(req)
-	if err != nil {
-		return &APIError{
-			Type:   RequestErr,
-			Reason: err.Error(),
-		}
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusNoContent {
-		return &APIError{
-			Type:      ResponseErr,
-			Reason:    parseResponseError(resp),
-			RequestID: resp.Header.Get("X-Request-ID"),
-		}
-	}
-	return nil
-}
-
-func discardResponseBody(resp io.ReadCloser) {
-	// discard response body, to make this connection reusable in the http connection pool
-	ioutil.ReadAll(resp)
-}
-
-func parseResponseError(resp *http.Response) string {
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Sprintf("Invalid response: %s", err)
-	}
-	var errData struct {
-		Error string `json:"error"`
-	}
-	err = json.Unmarshal(respBytes, &errData)
-	if err != nil {
-		return fmt.Sprintf("Invalid JSON: %s", err)
-	}
-	return fmt.Sprintf("[%d]%s", resp.StatusCode, errData.Error)
+	return c.deleteDeadLetter(nil, queue, limit)
 }

client/client_impl.go

@@ -753,6 +753,40 @@ func (c *LmstfyClient) respawnDeadLetter(ctx context.Context, queue string, limi
 	return respData.Count, nil
 }
 
+func (c *LmstfyClient) deleteDeadLetter(ctx context.Context, queue string, limit int64) *APIError {
+	if limit <= 0 {
+		return &APIError{
+			Type:   RequestErr,
+			Reason: "limit should be > 0",
+		}
+	}
+	query := url.Values{}
+	query.Add("limit", strconv.FormatInt(limit, 10))
+	req, err := c.getReq(ctx, http.MethodDelete, path.Join(queue, "deadletter"), query, nil)
+	if err != nil {
+		return &APIError{
+			Type:   RequestErr,
+			Reason: err.Error(),
+		}
+	}
+	resp, err := c.httpCli.Do(req)
+	if err != nil {
+		return &APIError{
+			Type:   RequestErr,
+			Reason: err.Error(),
+		}
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusNoContent {
+		return &APIError{
+			Type:      ResponseErr,
+			Reason:    parseResponseError(resp),
+			RequestID: resp.Header.Get("X-Request-ID"),
+		}
+	}
+	return nil
+}
+
 func discardResponseBody(resp io.ReadCloser) {
 	// discard response body, to make this connection reusable in the http connection pool
 	_, _ = ioutil.ReadAll(resp)