refactor: re-impl sdk3rd

internal/pkg/sdk3rd/wangsu/cdn/api.go

@@ -1,15 +0,0 @@
-package cdn
-
-import (
-	"net/http"
-)
-
-func (c *Client) BatchUpdateCertificateConfig(req *BatchUpdateCertificateConfigRequest) (*BatchUpdateCertificateConfigResponse, error) {
-	resp := &BatchUpdateCertificateConfigResponse{}
-	_, err := c.client.SendRequestWithResult(http.MethodPut, "/api/config/certificate/batch", req, resp)
-	if err != nil {
-		return resp, err
-	}
-
-	return resp, err
-}

internal/pkg/sdk3rd/wangsu/cdn/api_batch_update_certificate_config.go

@@ -0,0 +1,36 @@
+package cdn
+
+import (
+	"context"
+	"net/http"
+)
+
+type BatchUpdateCertificateConfigRequest struct {
+	CertificateId int64    `json:"certificateId"`
+	DomainNames   []string `json:"domainNames"`
+}
+
+type BatchUpdateCertificateConfigResponse struct {
+	apiResponseBase
+}
+
+func (c *Client) BatchUpdateCertificateConfig(req *BatchUpdateCertificateConfigRequest) (*BatchUpdateCertificateConfigResponse, error) {
+	return c.BatchUpdateCertificateConfigWithContext(context.Background(), req)
+}
+
+func (c *Client) BatchUpdateCertificateConfigWithContext(ctx context.Context, req *BatchUpdateCertificateConfigRequest) (*BatchUpdateCertificateConfigResponse, error) {
+	httpreq, err := c.newRequest(http.MethodPut, "/api/config/certificate/batch")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &BatchUpdateCertificateConfigResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/cdn/client.go

@@ -1,8 +1,11 @@
 package cdn
 
 import (
+	"fmt"
 	"time"
 
+	"github.com/go-resty/resty/v2"
+
 	"github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/openapi"
 )
 
@@ -10,11 +13,35 @@ type Client struct {
 	client *openapi.Client
 }
 
-func NewClient(accessKey, secretKey string) *Client {
-	return &Client{client: openapi.NewClient(accessKey, secretKey)}
+func NewClient(accessKey, secretKey string) (*Client, error) {
+	client, err := openapi.NewClient(accessKey, secretKey)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Client{client: client}, nil
 }
 
-func (c *Client) WithTimeout(timeout time.Duration) *Client {
-	c.client.WithTimeout(timeout)
+func (c *Client) SetTimeout(timeout time.Duration) *Client {
+	c.client.SetTimeout(timeout)
 	return c
 }
+
+func (c *Client) newRequest(method string, path string) (*resty.Request, error) {
+	return c.client.NewRequest(method, path)
+}
+
+func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) {
+	return c.client.DoRequest(req)
+}
+
+func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*resty.Response, error) {
+	resp, err := c.client.DoRequestWithResult(req, res)
+	if err == nil {
+		if tcode := res.GetCode(); tcode != "" && tcode != "0" {
+			return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s'", tcode, res.GetMessage())
+		}
+	}
+
+	return resp, err
+}

internal/pkg/sdk3rd/wangsu/cdn/models.go

@@ -1,26 +0,0 @@
-package cdn
-
-import (
-	"github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/openapi"
-)
-
-type baseResponse struct {
-	RequestId *string `json:"requestId,omitempty"`
-	Code      *string `json:"code,omitempty"`
-	Message   *string `json:"message,omitempty"`
-}
-
-var _ openapi.Result = (*baseResponse)(nil)
-
-func (r *baseResponse) SetRequestId(requestId string) {
-	r.RequestId = &requestId
-}
-
-type BatchUpdateCertificateConfigRequest struct {
-	CertificateId int64    `json:"certificateId" required:"true"`
-	DomainNames   []string `json:"domainNames" required:"true"`
-}
-
-type BatchUpdateCertificateConfigResponse struct {
-	baseResponse
-}

internal/pkg/sdk3rd/wangsu/cdn/types.go

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

internal/pkg/sdk3rd/wangsu/cdnpro/api.go

@@ -1,70 +0,0 @@
-package cdnpro
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"github.com/go-resty/resty/v2"
-)
-
-func (c *Client) CreateCertificate(req *CreateCertificateRequest) (*CreateCertificateResponse, error) {
-	resp := &CreateCertificateResponse{}
-	rres, err := c.client.SendRequestWithResult(http.MethodPost, "/cdn/certificates", req, resp, func(r *resty.Request) {
-		r.SetHeader("X-CNC-Timestamp", fmt.Sprintf("%d", req.Timestamp))
-	})
-	if err != nil {
-		return resp, err
-	}
-
-	resp.CertificateUrl = rres.Header().Get("Location")
-	return resp, err
-}
-
-func (c *Client) UpdateCertificate(certificateId string, req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
-	if certificateId == "" {
-		return nil, fmt.Errorf("wangsu api error: invalid parameter: certificateId")
-	}
-
-	resp := &UpdateCertificateResponse{}
-	rres, err := c.client.SendRequestWithResult(http.MethodPatch, fmt.Sprintf("/cdn/certificates/%s", url.PathEscape(certificateId)), req, resp, func(r *resty.Request) {
-		r.SetHeader("X-CNC-Timestamp", fmt.Sprintf("%d", req.Timestamp))
-	})
-	if err != nil {
-		return resp, err
-	}
-
-	resp.CertificateUrl = rres.Header().Get("Location")
-	return resp, err
-}
-
-func (c *Client) GetHostnameDetail(hostname string) (*GetHostnameDetailResponse, error) {
-	if hostname == "" {
-		return nil, fmt.Errorf("wangsu api error: invalid parameter: hostname")
-	}
-
-	resp := &GetHostnameDetailResponse{}
-	_, err := c.client.SendRequestWithResult(http.MethodGet, fmt.Sprintf("/cdn/hostnames/%s", url.PathEscape(hostname)), nil, resp)
-	return resp, err
-}
-
-func (c *Client) CreateDeploymentTask(req *CreateDeploymentTaskRequest) (*CreateDeploymentTaskResponse, error) {
-	resp := &CreateDeploymentTaskResponse{}
-	rres, err := c.client.SendRequestWithResult(http.MethodPost, "/cdn/deploymentTasks", req, resp)
-	if err != nil {
-		return resp, err
-	}
-
-	resp.DeploymentTaskUrl = rres.Header().Get("Location")
-	return resp, err
-}
-
-func (c *Client) GetDeploymentTaskDetail(deploymentTaskId string) (*GetDeploymentTaskDetailResponse, error) {
-	if deploymentTaskId == "" {
-		return nil, fmt.Errorf("wangsu api error: invalid parameter: deploymentTaskId")
-	}
-
-	resp := &GetDeploymentTaskDetailResponse{}
-	_, err := c.client.SendRequestWithResult(http.MethodGet, fmt.Sprintf("/cdn/deploymentTasks/%s", url.PathEscape(deploymentTaskId)), nil, resp)
-	return resp, err
-}

internal/pkg/sdk3rd/wangsu/cdnpro/api_create_certificate.go

@@ -0,0 +1,46 @@
+package cdnpro
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+)
+
+type CreateCertificateRequest struct {
+	Timestamp   int64                   `json:"-"`
+	Name        *string                 `json:"name,omitempty"`
+	Description *string                 `json:"description,omitempty"`
+	AutoRenew   *string                 `json:"autoRenew,omitempty"`
+	ForceRenew  *bool                   `json:"forceRenew,omitempty"`
+	NewVersion  *CertificateVersionInfo `json:"newVersion,omitempty"`
+}
+
+type CreateCertificateResponse struct {
+	apiResponseBase
+
+	CertificateLocation string `json:"location,omitempty"`
+}
+
+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, "/cdn/certificates")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetHeader("X-CNC-Timestamp", fmt.Sprintf("%d", req.Timestamp))
+		httpreq.SetContext(ctx)
+	}
+
+	result := &CreateCertificateResponse{}
+	if httpresp, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	} else {
+		result.CertificateLocation = httpresp.Header().Get("Location")
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/cdnpro/api_create_deployment_task.go

@@ -0,0 +1,42 @@
+package cdnpro
+
+import (
+	"context"
+	"net/http"
+)
+
+type CreateDeploymentTaskRequest struct {
+	Name    *string                     `json:"name,omitempty"`
+	Target  *string                     `json:"target,omitempty"`
+	Actions *[]DeploymentTaskActionInfo `json:"actions,omitempty"`
+	Webhook *string                     `json:"webhook,omitempty"`
+}
+
+type CreateDeploymentTaskResponse struct {
+	apiResponseBase
+
+	DeploymentTaskLocation string `json:"location,omitempty"`
+}
+
+func (c *Client) CreateDeploymentTask(req *CreateDeploymentTaskRequest) (*CreateDeploymentTaskResponse, error) {
+	return c.CreateDeploymentTaskWithContext(context.Background(), req)
+}
+
+func (c *Client) CreateDeploymentTaskWithContext(ctx context.Context, req *CreateDeploymentTaskRequest) (*CreateDeploymentTaskResponse, error) {
+	httpreq, err := c.newRequest(http.MethodPost, "/cdn/deploymentTasks")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &CreateDeploymentTaskResponse{}
+	if httpresp, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	} else {
+		result.DeploymentTaskLocation = httpresp.Header().Get("Location")
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/cdnpro/api_get_deployment_task_detail.go

@@ -0,0 +1,45 @@
+package cdnpro
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type GetDeploymentTaskDetailResponse struct {
+	apiResponseBase
+
+	Name           string                     `json:"name"`
+	Target         string                     `json:"target"`
+	Actions        []DeploymentTaskActionInfo `json:"actions"`
+	Status         string                     `json:"status"`
+	StatusDetails  string                     `json:"statusDetails"`
+	SubmissionTime string                     `json:"submissionTime"`
+	FinishTime     string                     `json:"finishTime"`
+	ApiRequestId   string                     `json:"apiRequestId"`
+}
+
+func (c *Client) GetDeploymentTaskDetail(deploymentTaskId string) (*GetDeploymentTaskDetailResponse, error) {
+	return c.GetDeploymentTaskDetailWithContext(context.Background(), deploymentTaskId)
+}
+
+func (c *Client) GetDeploymentTaskDetailWithContext(ctx context.Context, deploymentTaskId string) (*GetDeploymentTaskDetailResponse, error) {
+	if deploymentTaskId == "" {
+		return nil, fmt.Errorf("sdkerr: unset deploymentTaskId")
+	}
+
+	httpreq, err := c.newRequest(http.MethodGet, fmt.Sprintf("/cdn/deploymentTasks/%s", url.PathEscape(deploymentTaskId)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetContext(ctx)
+	}
+
+	result := &GetDeploymentTaskDetailResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/cdnpro/api_get_hostname_detail.go

@@ -0,0 +1,40 @@
+package cdnpro
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type GetHostnameDetailResponse struct {
+	apiResponseBase
+
+	Hostname             string                `json:"hostname"`
+	PropertyInProduction *HostnamePropertyInfo `json:"propertyInProduction,omitempty"`
+	PropertyInStaging    *HostnamePropertyInfo `json:"propertyInStaging,omitempty"`
+}
+
+func (c *Client) GetHostnameDetail(hostname string) (*GetHostnameDetailResponse, error) {
+	return c.GetHostnameDetailWithContext(context.Background(), hostname)
+}
+
+func (c *Client) GetHostnameDetailWithContext(ctx context.Context, hostname string) (*GetHostnameDetailResponse, error) {
+	if hostname == "" {
+		return nil, fmt.Errorf("sdkerr: unset hostname")
+	}
+
+	httpreq, err := c.newRequest(http.MethodGet, fmt.Sprintf("/cdn/hostnames/%s", url.PathEscape(hostname)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetContext(ctx)
+	}
+
+	result := &GetHostnameDetailResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/cdnpro/api_update_certificate.go

@@ -0,0 +1,51 @@
+package cdnpro
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type UpdateCertificateRequest struct {
+	Timestamp   int64                   `json:"-"`
+	Name        *string                 `json:"name,omitempty"`
+	Description *string                 `json:"description,omitempty"`
+	AutoRenew   *string                 `json:"autoRenew,omitempty"`
+	ForceRenew  *bool                   `json:"forceRenew,omitempty"`
+	NewVersion  *CertificateVersionInfo `json:"newVersion,omitempty"`
+}
+
+type UpdateCertificateResponse struct {
+	apiResponseBase
+
+	CertificateLocation string `json:"location,omitempty"`
+}
+
+func (c *Client) UpdateCertificate(certificateId string, req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
+	return c.UpdateCertificateWithContext(context.Background(), certificateId, req)
+}
+
+func (c *Client) UpdateCertificateWithContext(ctx context.Context, certificateId string, req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
+	if certificateId == "" {
+		return nil, fmt.Errorf("sdkerr: unset certificateId")
+	}
+
+	httpreq, err := c.newRequest(http.MethodPatch, fmt.Sprintf("/cdn/certificates/%s", url.PathEscape(certificateId)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetHeader("X-CNC-Timestamp", fmt.Sprintf("%d", req.Timestamp))
+		httpreq.SetContext(ctx)
+	}
+
+	result := &UpdateCertificateResponse{}
+	if httpresp, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	} else {
+		result.CertificateLocation = httpresp.Header().Get("Location")
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/cdnpro/client.go

@@ -3,6 +3,8 @@ package cdnpro
 import (
 	"time"
 
+	"github.com/go-resty/resty/v2"
+
 	"github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/openapi"
 )
 
@@ -10,11 +12,28 @@ type Client struct {
 	client *openapi.Client
 }
 
-func NewClient(accessKey, secretKey string) *Client {
-	return &Client{client: openapi.NewClient(accessKey, secretKey)}
+func NewClient(accessKey, secretKey string) (*Client, error) {
+	client, err := openapi.NewClient(accessKey, secretKey)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Client{client: client}, nil
 }
 
-func (c *Client) WithTimeout(timeout time.Duration) *Client {
-	c.client.WithTimeout(timeout)
+func (c *Client) SetTimeout(timeout time.Duration) *Client {
+	c.client.SetTimeout(timeout)
 	return c
 }
+
+func (c *Client) newRequest(method string, path string) (*resty.Request, error) {
+	return c.client.NewRequest(method, path)
+}
+
+func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) {
+	return c.client.DoRequest(req)
+}
+
+func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*resty.Response, error) {
+	return c.client.DoRequestWithResult(req, res)
+}

internal/pkg/sdk3rd/wangsu/cdnpro/models.go

@@ -1,108 +0,0 @@
-package cdnpro
-
-import (
-	"github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/openapi"
-)
-
-type baseResponse struct {
-	RequestId *string `json:"requestId,omitempty"`
-	Code      *string `json:"code,omitempty"`
-	Message   *string `json:"message,omitempty"`
-}
-
-var _ openapi.Result = (*baseResponse)(nil)
-
-func (r *baseResponse) SetRequestId(requestId string) {
-	r.RequestId = &requestId
-}
-
-type CertificateVersion struct {
-	Comments           *string                               `json:"comments,omitempty"`
-	PrivateKey         *string                               `json:"privateKey,omitempty"`
-	Certificate        *string                               `json:"certificate,omitempty"`
-	ChainCert          *string                               `json:"chainCert,omitempty"`
-	IdentificationInfo *CertificateVersionIdentificationInfo `json:"identificationInfo,omitempty"`
-}
-
-type CertificateVersionIdentificationInfo struct {
-	Country                 *string   `json:"country,omitempty"`
-	State                   *string   `json:"state,omitempty"`
-	City                    *string   `json:"city,omitempty"`
-	Company                 *string   `json:"company,omitempty"`
-	Department              *string   `json:"department,omitempty"`
-	CommonName              *string   `json:"commonName,omitempty" required:"true"`
-	Email                   *string   `json:"email,omitempty"`
-	SubjectAlternativeNames *[]string `json:"subjectAlternativeNames,omitempty" required:"true"`
-}
-
-type CreateCertificateRequest struct {
-	Timestamp   int64               `json:"-"`
-	Name        *string             `json:"name,omitempty" required:"true"`
-	Description *string             `json:"description,omitempty"`
-	AutoRenew   *string             `json:"autoRenew,omitempty"`
-	ForceRenew  *bool               `json:"forceRenew,omitempty"`
-	NewVersion  *CertificateVersion `json:"newVersion,omitempty" required:"true"`
-}
-
-type CreateCertificateResponse struct {
-	baseResponse
-	CertificateUrl string `json:"location,omitempty"`
-}
-
-type UpdateCertificateRequest struct {
-	Timestamp   int64               `json:"-"`
-	Name        *string             `json:"name,omitempty"`
-	Description *string             `json:"description,omitempty"`
-	AutoRenew   *string             `json:"autoRenew,omitempty"`
-	ForceRenew  *bool               `json:"forceRenew,omitempty"`
-	NewVersion  *CertificateVersion `json:"newVersion,omitempty" required:"true"`
-}
-
-type UpdateCertificateResponse struct {
-	baseResponse
-	CertificateUrl string `json:"location,omitempty"`
-}
-
-type HostnameProperty struct {
-	PropertyId    string  `json:"propertyId"`
-	Version       int32   `json:"version"`
-	CertificateId *string `json:"certificateId,omitempty"`
-}
-
-type GetHostnameDetailResponse struct {
-	baseResponse
-	Hostname             string            `json:"hostname"`
-	PropertyInProduction *HostnameProperty `json:"propertyInProduction,omitempty"`
-	PropertyInStaging    *HostnameProperty `json:"propertyInStaging,omitempty"`
-}
-
-type DeploymentTaskAction struct {
-	Action        *string `json:"action,omitempty" required:"true"`
-	PropertyId    *string `json:"propertyId,omitempty"`
-	CertificateId *string `json:"certificateId,omitempty"`
-	Version       *int32  `json:"version,omitempty"`
-}
-
-type CreateDeploymentTaskRequest struct {
-	Name    *string                 `json:"name,omitempty"`
-	Target  *string                 `json:"target,omitempty" required:"true"`
-	Actions *[]DeploymentTaskAction `json:"actions,omitempty" required:"true"`
-	Webhook *string                 `json:"webhook,omitempty"`
-}
-
-type CreateDeploymentTaskResponse struct {
-	baseResponse
-	DeploymentTaskUrl string `json:"location,omitempty"`
-}
-
-type GetDeploymentTaskDetailResponse struct {
-	baseResponse
-	Name           string                 `json:"name"`
-	Target         string                 `json:"target"`
-	Actions        []DeploymentTaskAction `json:"actions"`
-	Status         string                 `json:"status"`
-	StatusDetails  string                 `json:"statusDetails"`
-	SubmissionTime string                 `json:"submissionTime"`
-	FinishTime     string                 `json:"finishTime"`
-	ApiRequestId   string                 `json:"apiRequestId"`
-}

internal/pkg/sdk3rd/wangsu/cdnpro/types.go

@@ -0,0 +1,61 @@
+package cdnpro
+
+type apiResponse interface {
+	GetCode() string
+	GetMessage() string
+}
+
+type apiResponseBase struct {
+	Code    *string `json:"code,omitempty"`
+	Message *string `json:"message,omitempty"`
+}
+
+var _ apiResponse = (*apiResponseBase)(nil)
+
+func (r *apiResponseBase) GetCode() string {
+	if r.Code == nil {
+		return ""
+	}
+
+	return *r.Code
+}
+
+func (r *apiResponseBase) GetMessage() string {
+	if r.Message == nil {
+		return ""
+	}
+
+	return *r.Message
+}
+
+type CertificateVersionInfo struct {
+	Comments           *string                               `json:"comments,omitempty"`
+	PrivateKey         *string                               `json:"privateKey,omitempty"`
+	Certificate        *string                               `json:"certificate,omitempty"`
+	ChainCert          *string                               `json:"chainCert,omitempty"`
+	IdentificationInfo *CertificateVersionIdentificationInfo `json:"identificationInfo,omitempty"`
+}
+
+type CertificateVersionIdentificationInfo struct {
+	Country                 *string   `json:"country,omitempty"`
+	State                   *string   `json:"state,omitempty"`
+	City                    *string   `json:"city,omitempty"`
+	Company                 *string   `json:"company,omitempty"`
+	Department              *string   `json:"department,omitempty"`
+	CommonName              *string   `json:"commonName,omitempty"`
+	Email                   *string   `json:"email,omitempty"`
+	SubjectAlternativeNames *[]string `json:"subjectAlternativeNames,omitempty"`
+}
+
+type HostnamePropertyInfo struct {
+	PropertyId    string  `json:"propertyId"`
+	Version       int32   `json:"version"`
+	CertificateId *string `json:"certificateId,omitempty"`
+}
+
+type DeploymentTaskActionInfo struct {
+	Action        *string `json:"action,omitempty"`
+	PropertyId    *string `json:"propertyId,omitempty"`
+	CertificateId *string `json:"certificateId,omitempty"`
+	Version       *int32  `json:"version,omitempty"`
+}

internal/pkg/sdk3rd/wangsu/certificate/api.go

@@ -1,42 +0,0 @@
-package certificate
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-)
-
-func (c *Client) ListCertificates() (*ListCertificatesResponse, error) {
-	resp := &ListCertificatesResponse{}
-	_, err := c.client.SendRequestWithResult(http.MethodGet, "/api/ssl/certificate", nil, resp)
-	if err != nil {
-		return resp, err
-	}
-
-	return resp, err
-}
-
-func (c *Client) CreateCertificate(req *CreateCertificateRequest) (*CreateCertificateResponse, error) {
-	resp := &CreateCertificateResponse{}
-	rres, err := c.client.SendRequestWithResult(http.MethodPost, "/api/certificate", req, resp)
-	if err != nil {
-		return resp, err
-	}
-
-	resp.CertificateUrl = rres.Header().Get("Location")
-	return resp, err
-}
-
-func (c *Client) UpdateCertificate(certificateId string, req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
-	if certificateId == "" {
-		return nil, fmt.Errorf("wangsu api error: invalid parameter: certificateId")
-	}
-
-	resp := &UpdateCertificateResponse{}
-	_, err := c.client.SendRequestWithResult(http.MethodPut, fmt.Sprintf("/api/certificate/%s", url.PathEscape(certificateId)), req, resp)
-	if err != nil {
-		return resp, err
-	}
-
-	return resp, err
-}

internal/pkg/sdk3rd/wangsu/certificate/api_create_certificate.go

@@ -0,0 +1,42 @@
+package certificate
+
+import (
+	"context"
+	"net/http"
+)
+
+type CreateCertificateRequest struct {
+	Name        *string `json:"name,omitempty"`
+	Certificate *string `json:"certificate,omitempty"`
+	PrivateKey  *string `json:"privateKey,omitempty"`
+	Comment     *string `json:"comment,omitempty" `
+}
+
+type CreateCertificateResponse struct {
+	apiResponseBase
+
+	CertificateLocation string `json:"location,omitempty"`
+}
+
+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, "/api/certificate")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &CreateCertificateResponse{}
+	if httpresp, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	} else {
+		result.CertificateLocation = httpresp.Header().Get("Location")
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/certificate/api_list_certificates.go

@@ -0,0 +1,32 @@
+package certificate
+
+import (
+	"context"
+	"net/http"
+)
+
+type ListCertificatesResponse struct {
+	apiResponseBase
+
+	Certificates []*CertificateRecord `json:"ssl-certificates,omitempty"`
+}
+
+func (c *Client) ListCertificates() (*ListCertificatesResponse, error) {
+	return c.ListCertificatesWithContext(context.Background())
+}
+
+func (c *Client) ListCertificatesWithContext(ctx context.Context) (*ListCertificatesResponse, error) {
+	httpreq, err := c.newRequest(http.MethodGet, "/api/ssl/certificate")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetContext(ctx)
+	}
+
+	result := &ListCertificatesResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/certificate/api_update_certificate.go

@@ -0,0 +1,44 @@
+package certificate
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type UpdateCertificateRequest struct {
+	Name        *string `json:"name,omitempty"`
+	Certificate *string `json:"certificate,omitempty"`
+	PrivateKey  *string `json:"privateKey,omitempty"`
+	Comment     *string `json:"comment,omitempty" `
+}
+
+type UpdateCertificateResponse struct {
+	apiResponseBase
+}
+
+func (c *Client) UpdateCertificate(certificateId string, req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
+	return c.UpdateCertificateWithContext(context.Background(), certificateId, req)
+}
+
+func (c *Client) UpdateCertificateWithContext(ctx context.Context, certificateId string, req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
+	if certificateId == "" {
+		return nil, fmt.Errorf("sdkerr: unset certificateId")
+	}
+
+	httpreq, err := c.newRequest(http.MethodPut, fmt.Sprintf("/api/certificate/%s", url.PathEscape(certificateId)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &UpdateCertificateResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/wangsu/certificate/client.go

@@ -3,6 +3,8 @@ package certificate
 import (
 	"time"
 
+	"github.com/go-resty/resty/v2"
+
 	"github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/openapi"
 )
 
@@ -10,11 +12,28 @@ type Client struct {
 	client *openapi.Client
 }
 
-func NewClient(accessKey, secretKey string) *Client {
-	return &Client{client: openapi.NewClient(accessKey, secretKey)}
+func NewClient(accessKey, secretKey string) (*Client, error) {
+	client, err := openapi.NewClient(accessKey, secretKey)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Client{client: client}, nil
 }
 
-func (c *Client) WithTimeout(timeout time.Duration) *Client {
-	c.client.WithTimeout(timeout)
+func (c *Client) SetTimeout(timeout time.Duration) *Client {
+	c.client.SetTimeout(timeout)
 	return c
 }
+
+func (c *Client) newRequest(method string, path string) (*resty.Request, error) {
+	return c.client.NewRequest(method, path)
+}
+
+func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) {
+	return c.client.DoRequest(req)
+}
+
+func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*resty.Response, error) {
+	return c.client.DoRequestWithResult(req, res)
+}

internal/pkg/sdk3rd/wangsu/certificate/models.go

@@ -1,52 +0,0 @@
-package certificate
-
-import (
-	"github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/openapi"
-)
-
-type baseResponse struct {
-	RequestId *string `json:"requestId,omitempty"`
-	Code      *string `json:"code,omitempty"`
-	Message   *string `json:"message,omitempty"`
-}
-
-var _ openapi.Result = (*baseResponse)(nil)
-
-func (r *baseResponse) SetRequestId(requestId string) {
-	r.RequestId = &requestId
-}
-
-type CreateCertificateRequest struct {
-	Name        *string `json:"name,omitempty" required:"true"`
-	Certificate *string `json:"certificate,omitempty" required:"true"`
-	PrivateKey  *string `json:"privateKey,omitempty"`
-	Comment     *string `json:"comment,omitempty" `
-}
-
-type CreateCertificateResponse struct {
-	baseResponse
-	CertificateUrl string `json:"location,omitempty"`
-}
-
-type UpdateCertificateRequest struct {
-	Name        *string `json:"name,omitempty" required:"true"`
-	Certificate *string `json:"certificate,omitempty"`
-	PrivateKey  *string `json:"privateKey,omitempty"`
-	Comment     *string `json:"comment,omitempty" `
-}
-
-type UpdateCertificateResponse struct {
-	baseResponse
-}
-
-type ListCertificatesResponse struct {
-	baseResponse
-	Certificates []*struct {
-		CertificateId string `json:"certificate-id"`
-		Name          string `json:"name"`
-		Comment       string `json:"comment"`
-		ValidityFrom  string `json:"certificate-validity-from"`
-		ValidityTo    string `json:"certificate-validity-to"`
-		Serial        string `json:"certificate-serial"`
-	} `json:"ssl-certificates,omitempty"`
-}

internal/pkg/sdk3rd/wangsu/certificate/types.go

@@ -0,0 +1,38 @@
+package certificate
+
+type apiResponse interface {
+	GetCode() string
+	GetMessage() string
+}
+
+type apiResponseBase struct {
+	Code    *string `json:"code,omitempty"`
+	Message *string `json:"message,omitempty"`
+}
+
+var _ apiResponse = (*apiResponseBase)(nil)
+
+func (r *apiResponseBase) GetCode() string {
+	if r.Code == nil {
+		return ""
+	}
+
+	return *r.Code
+}
+
+func (r *apiResponseBase) GetMessage() string {
+	if r.Message == nil {
+		return ""
+	}
+
+	return *r.Message
+}
+
+type CertificateRecord struct {
+	CertificateId string `json:"certificate-id"`
+	Name          string `json:"name"`
+	Comment       string `json:"comment"`
+	ValidityFrom  string `json:"certificate-validity-from"`
+	ValidityTo    string `json:"certificate-validity-to"`
+	Serial        string `json:"certificate-serial"`
+}

internal/pkg/sdk3rd/wangsu/openapi/client.go

@@ -23,11 +23,14 @@ type Client struct {
 	client *resty.Client
 }
 
-type Result interface {
-	SetRequestId(requestId string)
-}
+func NewClient(accessKey, secretKey string) (*Client, error) {
+	if accessKey == "" {
+		return nil, fmt.Errorf("sdkerr: unset accessKey")
+	}
+	if secretKey == "" {
+		return nil, fmt.Errorf("sdkerr: unset secretKey")
+	}
 
-func NewClient(accessKey, secretKey string) *Client {
 	client := resty.New().
 		SetBaseURL("https://open.chinanetcenter.com").
 		SetHeader("Accept", "application/json").
@@ -125,67 +128,64 @@ func NewClient(accessKey, secretKey string) *Client {
 		accessKey: accessKey,
 		secretKey: secretKey,
 		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{}, configureReq ...func(req *resty.Request)) (*resty.Response, error) {
+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")
+	}
+
 	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.Method = method
+	req.URL = path
+	return req, nil
+}
 
-		req = req.SetQueryParams(qs)
-	} else {
-		req = req.SetHeader("Content-Type", "application/json").SetBody(params)
+func (c *Client) DoRequest(req *resty.Request) (*resty.Response, error) {
+	if req == nil {
+		return nil, fmt.Errorf("sdkerr: nil request")
 	}
 
-	if configureReq != nil {
-		for _, fn := range configureReq {
-			fn(req)
-		}
-	}
+	// WARN:
+	//   PLEASE DO NOT USE `req.SetResult` or `req.SetError` HERE! USE `doRequestWithResult` INSTEAD.
 
-	resp, err := req.Execute(method, path)
+	resp, err := req.Send()
 	if err != nil {
-		return resp, fmt.Errorf("wangsu 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("wangsu 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 Result, configureReq ...func(req *resty.Request)) (*resty.Response, error) {
-	resp, err := c.sendRequest(method, path, params, configureReq...)
+func (c *Client) DoRequestWithResult(req *resty.Request, res any) (*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)
-			result.SetRequestId(resp.Header().Get("X-CNC-Request-Id"))
+			json.Unmarshal(resp.Body(), &res)
 		}
 		return resp, err
 	}
 
-	respBody := resp.Body()
-	if len(respBody) != 0 {
-		if err := json.Unmarshal(respBody, &result); err != nil {
-			return resp, fmt.Errorf("wangsu 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)
 		}
 	}
 
-	result.SetRequestId(resp.Header().Get("X-CNC-Request-Id"))
 	return resp, nil
 }