refactor: re-impl sdk3rd

internal/pkg/sdk3rd/cachefly/api.go

@@ -1,11 +0,0 @@
-package cachefly
-
-import (
-	"net/http"
-)
-
-func (c *Client) CreateCertificate(req *CreateCertificateRequest) (*CreateCertificateResponse, error) {
-	resp := &CreateCertificateResponse{}
-	err := c.sendRequestWithResult(http.MethodPost, "/certificates", req, resp)
-	return resp, err
-}

internal/pkg/sdk3rd/cachefly/api_create_certificate.go

@@ -0,0 +1,50 @@
+package cachefly
+
+import (
+	"context"
+	"net/http"
+)
+
+type CreateCertificateRequest struct {
+	Certificate    *string `json:"certificate,omitempty"`
+	CertificateKey *string `json:"certificateKey,omitempty"`
+	Password       *string `json:"password,omitempty"`
+}
+
+type CreateCertificateResponse struct {
+	apiResponseBase
+
+	Id                string   `json:"_id"`
+	SubjectCommonName string   `json:"subjectCommonName"`
+	SubjectNames      []string `json:"subjectNames"`
+	Expired           bool     `json:"expired"`
+	Expiring          bool     `json:"expiring"`
+	InUse             bool     `json:"inUse"`
+	Managed           bool     `json:"managed"`
+	Services          []string `json:"services"`
+	Domains           []string `json:"domains"`
+	NotBefore         string   `json:"notBefore"`
+	NotAfter          string   `json:"notAfter"`
+	CreatedAt         string   `json:"createdAt"`
+}
+
+func (c *Client) CreateCertificate(req *CreateCertificateRequest) (*CreateCertificateResponse, error) {
+	return c.CreateCertificateWithContext(context.Background(), req)
+}
+
+func (c *Client) CreateCertificateWithContext(ctx context.Context, req *CreateCertificateRequest) (*CreateCertificateResponse, error) {
+	httpreq, err := c.newRequest(http.MethodPost, "/certificates")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &CreateCertificateResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/cachefly/client.go

@@ -3,8 +3,6 @@ package cachefly
 import (
 	"encoding/json"
 	"fmt"
-	"net/http"
-	"strings"
 	"time"
 
 	"github.com/go-resty/resty/v2"
@@ -14,63 +12,76 @@ type Client struct {
 	client *resty.Client
 }
 
-func NewClient(apiToken string) *Client {
+func NewClient(apiToken string) (*Client, error) {
+	if apiToken == "" {
+		return nil, fmt.Errorf("sdkerr: unset apiToken")
+	}
+
 	client := resty.New().
 		SetBaseURL("https://api.cachefly.com/api/2.5").
+		SetHeader("Accept", "application/json").
+		SetHeader("Content-Type", "application/json").
+		SetHeader("User-Agent", "certimate").
 		SetHeader("X-CF-Authorization", "Bearer "+apiToken)
 
-	return &Client{
-		client: client,
-	}
+	return &Client{client}, nil
 }
 
-func (c *Client) WithTimeout(timeout time.Duration) *Client {
+func (c *Client) SetTimeout(timeout time.Duration) *Client {
 	c.client.SetTimeout(timeout)
 	return c
 }
 
-func (c *Client) sendRequest(method string, path string, params interface{}) (*resty.Response, error) {
-	req := c.client.R()
-	if strings.EqualFold(method, http.MethodGet) {
-		qs := make(map[string]string)
-		if params != nil {
-			temp := make(map[string]any)
-			jsonb, _ := json.Marshal(params)
-			json.Unmarshal(jsonb, &temp)
-			for k, v := range temp {
-				if v != nil {
-					qs[k] = fmt.Sprintf("%v", v)
-				}
-			}
-		}
-
-		req = req.SetQueryParams(qs)
-	} else {
-		req = req.SetHeader("Content-Type", "application/json").SetBody(params)
+func (c *Client) newRequest(method string, path string) (*resty.Request, error) {
+	if method == "" {
+		return nil, fmt.Errorf("sdkerr: unset method")
+	}
+	if path == "" {
+		return nil, fmt.Errorf("sdkerr: unset path")
 	}
 
-	resp, err := req.Execute(method, path)
+	req := c.client.R()
+	req.Method = method
+	req.URL = path
+	return req, nil
+}
+
+func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) {
+	if req == nil {
+		return nil, fmt.Errorf("sdkerr: nil request")
+	}
+
+	// WARN:
+	//   PLEASE DO NOT USE `req.SetResult` or `req.SetError` HERE! USE `doRequestWithResult` INSTEAD.
+
+	resp, err := req.Send()
 	if err != nil {
-		return resp, fmt.Errorf("cachefly api error: failed to send request: %w", err)
+		return resp, fmt.Errorf("sdkerr: failed to send request: %w", err)
 	} else if resp.IsError() {
-		return resp, fmt.Errorf("cachefly api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
+		return resp, fmt.Errorf("sdkerr: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return resp, nil
 }
 
-func (c *Client) sendRequestWithResult(method string, path string, params interface{}, result BaseResponse) error {
-	resp, err := c.sendRequest(method, path, params)
+func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*resty.Response, error) {
+	if req == nil {
+		return nil, fmt.Errorf("sdkerr: nil request")
+	}
+
+	resp, err := c.doRequest(req)
 	if err != nil {
 		if resp != nil {
-			json.Unmarshal(resp.Body(), &result)
+			json.Unmarshal(resp.Body(), &res)
 		}
-		return err
+		return resp, err
 	}
 
-	if err := json.Unmarshal(resp.Body(), &result); err != nil {
-		return fmt.Errorf("cachefly api error: failed to unmarshal response: %w", err)
+	if len(resp.Body()) != 0 {
+		if err := json.Unmarshal(resp.Body(), &res); err != nil {
+			return resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w", err)
+		}
 	}
 
-	return nil
+	return resp, nil
 }

internal/pkg/sdk3rd/cachefly/models.go

@@ -1,38 +0,0 @@
-package cachefly
-
-type BaseResponse interface {
-	GetMessage() string
-}
-
-type baseResponse struct {
-	Message *string `json:"message,omitempty"`
-}
-
-func (r *baseResponse) GetMessage() string {
-	if r.Message != nil {
-		return *r.Message
-	}
-	return ""
-}
-
-type CreateCertificateRequest struct {
-	Certificate    string  `json:"certificate"`
-	CertificateKey string  `json:"certificateKey"`
-	Password       *string `json:"password"`
-}
-
-type CreateCertificateResponse struct {
-	baseResponse
-	Id                string   `json:"_id"`
-	SubjectCommonName string   `json:"subjectCommonName"`
-	SubjectNames      []string `json:"subjectNames"`
-	Expired           bool     `json:"expired"`
-	Expiring          bool     `json:"expiring"`
-	InUse             bool     `json:"inUse"`
-	Managed           bool     `json:"managed"`
-	Services          []string `json:"services"`
-	Domains           []string `json:"domains"`
-	NotBefore         string   `json:"notBefore"`
-	NotAfter          string   `json:"notAfter"`
-	CreatedAt         string   `json:"createdAt"`
-}

internal/pkg/sdk3rd/cachefly/types.go

@@ -0,0 +1,19 @@
+package cachefly
+
+type apiResponse interface {
+	GetMessage() string
+}
+
+type apiResponseBase struct {
+	Message *string `json:"message,omitempty"`
+}
+
+func (r *apiResponseBase) GetMessage() string {
+	if r.Message == nil {
+		return ""
+	}
+
+	return *r.Message
+}
+
+var _ apiResponse = (*apiResponseBase)(nil)