diff --git a/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go b/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go index 63fdb2d7f..33798a989 100644 --- a/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go +++ b/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go @@ -119,7 +119,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep if resp.StatusCode != http.StatusOK { body := &bytes.Buffer{} body.ReadFrom(resp.Body) - return nil, fmt.Errorf("huaweicloud obs api error: unexpected status code: %d, resp: %s", resp.StatusCode, body.String()) + return nil, fmt.Errorf("huaweicloud obs api error: unexpected status code: %d (resp: %s)", resp.StatusCode, body.String()) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go b/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go index a1ea9b41b..e13fe5138 100644 --- a/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go +++ b/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go @@ -101,9 +101,9 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("dingtalk api error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("dingtalk api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("dingtalk api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } else if err := json.Unmarshal(resp.Body(), &result); err != nil { - return nil, fmt.Errorf("dingtalk api error: failed to unmarshal response: %w", err) + return nil, fmt.Errorf("dingtalk api error: %w (resp: %s)", err, resp.String()) } else if result.ErrorCode != 0 { return nil, fmt.Errorf("dingtalk api error: errcode='%d', errmsg='%s'", result.ErrorCode, result.ErrorMessage) } diff --git a/pkg/core/notifier/providers/discordbot/discordbot.go b/pkg/core/notifier/providers/discordbot/discordbot.go index cdc350d35..185d62c7f 100644 --- a/pkg/core/notifier/providers/discordbot/discordbot.go +++ b/pkg/core/notifier/providers/discordbot/discordbot.go @@ -62,7 +62,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("discord api error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("discord api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("discord api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } return ¬ifier.NotifyResult{}, nil diff --git a/pkg/core/notifier/providers/larkbot/larkbot.go b/pkg/core/notifier/providers/larkbot/larkbot.go index 69cd62ad5..746fd2926 100644 --- a/pkg/core/notifier/providers/larkbot/larkbot.go +++ b/pkg/core/notifier/providers/larkbot/larkbot.go @@ -105,9 +105,9 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("lark api error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("lark api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("lark api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } else if err := json.Unmarshal(resp.Body(), &result); err != nil { - return nil, fmt.Errorf("lark api error: failed to unmarshal response: %w", err) + return nil, fmt.Errorf("lark api error: %w (resp: %s)", err, resp.String()) } else if result.Code != 0 { return nil, fmt.Errorf("lark api error: code='%d', msg='%s'", result.Code, result.Message) } diff --git a/pkg/core/notifier/providers/mattermost/mattermost.go b/pkg/core/notifier/providers/mattermost/mattermost.go index f582861e3..be0b19a8f 100644 --- a/pkg/core/notifier/providers/mattermost/mattermost.go +++ b/pkg/core/notifier/providers/mattermost/mattermost.go @@ -69,7 +69,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("mattermost api error: failed to send request: %w", err) } else if loginResp.IsError() { - return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", loginResp.StatusCode(), loginResp.String()) + return nil, fmt.Errorf("mattermost api error: unexpected status code: %d (resp: %s)", loginResp.StatusCode(), loginResp.String()) } else if loginResp.Header().Get("Token") == "" { return nil, fmt.Errorf("mattermost api error: received empty login token") } @@ -93,7 +93,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("mattermost api error: failed to send request: %w", err) } else if postResp.IsError() { - return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", postResp.StatusCode(), postResp.String()) + return nil, fmt.Errorf("mattermost api error: unexpected status code: %d (resp: %s)", postResp.StatusCode(), postResp.String()) } return ¬ifier.NotifyResult{}, nil diff --git a/pkg/core/notifier/providers/slackbot/slackbot.go b/pkg/core/notifier/providers/slackbot/slackbot.go index 4c0abbcd6..622c4587e 100644 --- a/pkg/core/notifier/providers/slackbot/slackbot.go +++ b/pkg/core/notifier/providers/slackbot/slackbot.go @@ -64,7 +64,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("slack api error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("slack api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("slack api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } return ¬ifier.NotifyResult{}, nil diff --git a/pkg/core/notifier/providers/telegrambot/telegrambot.go b/pkg/core/notifier/providers/telegrambot/telegrambot.go index f1de59686..b514278fd 100644 --- a/pkg/core/notifier/providers/telegrambot/telegrambot.go +++ b/pkg/core/notifier/providers/telegrambot/telegrambot.go @@ -62,7 +62,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("telegram api error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("telegram api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("telegram api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } return ¬ifier.NotifyResult{}, nil diff --git a/pkg/core/notifier/providers/webhook/webhook.go b/pkg/core/notifier/providers/webhook/webhook.go index 625974833..e7e4e9559 100644 --- a/pkg/core/notifier/providers/webhook/webhook.go +++ b/pkg/core/notifier/providers/webhook/webhook.go @@ -171,7 +171,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("webhook error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("webhook error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("webhook error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } n.logger.Debug("webhook responded", slog.String("response", resp.String())) diff --git a/pkg/core/notifier/providers/wecombot/wecombot.go b/pkg/core/notifier/providers/wecombot/wecombot.go index 0c1f5dc19..985dac026 100644 --- a/pkg/core/notifier/providers/wecombot/wecombot.go +++ b/pkg/core/notifier/providers/wecombot/wecombot.go @@ -78,9 +78,9 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( if err != nil { return nil, fmt.Errorf("wecom api error: failed to send request: %w", err) } else if resp.IsError() { - return nil, fmt.Errorf("wecom api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return nil, fmt.Errorf("wecom api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } else if err := json.Unmarshal(resp.Body(), &result); err != nil { - return nil, fmt.Errorf("wecom api error: failed to unmarshal response: %w", err) + return nil, fmt.Errorf("wecom api error: %w (resp: %s)", err, string(resp.Body())) } else if result.ErrorCode != 0 { return nil, fmt.Errorf("wecom api error: errcode='%d', errmsg='%s'", result.ErrorCode, result.ErrorMessage) } diff --git a/pkg/sdk3rd/1panel/client.go b/pkg/sdk3rd/1panel/client.go index 5f52ce9a5..2e222a28d 100644 --- a/pkg/sdk3rd/1panel/client.go +++ b/pkg/sdk3rd/1panel/client.go @@ -83,7 +83,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -104,7 +104,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode/100 != 2 { return resp, fmt.Errorf("sdkerr: api error: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/1panel/v2/client.go b/pkg/sdk3rd/1panel/v2/client.go index e662d64dd..85a8d3c85 100644 --- a/pkg/sdk3rd/1panel/v2/client.go +++ b/pkg/sdk3rd/1panel/v2/client.go @@ -97,7 +97,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -118,7 +118,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode/100 != 2 { return resp, fmt.Errorf("sdkerr: api error: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/51dnscom/client.go b/pkg/sdk3rd/51dnscom/client.go index 684234b08..da88d1f9e 100644 --- a/pkg/sdk3rd/51dnscom/client.go +++ b/pkg/sdk3rd/51dnscom/client.go @@ -90,7 +90,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -111,7 +111,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 0 { return resp, fmt.Errorf("sdkerr: api error: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/baishan/client.go b/pkg/sdk3rd/baishan/client.go index 2978cd33e..485e0b1f0 100644 --- a/pkg/sdk3rd/baishan/client.go +++ b/pkg/sdk3rd/baishan/client.go @@ -58,7 +58,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -79,7 +79,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 0 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/btpanel/client.go b/pkg/sdk3rd/btpanel/client.go index 8b8cff648..5ff349fbe 100644 --- a/pkg/sdk3rd/btpanel/client.go +++ b/pkg/sdk3rd/btpanel/client.go @@ -113,7 +113,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -134,7 +134,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tstatus := res.GetStatus(); tstatus != nil && !*tstatus { if res.GetMessage() == nil { diff --git a/pkg/sdk3rd/btpanelgo/client.go b/pkg/sdk3rd/btpanelgo/client.go index 6964c3862..9df6c5aba 100644 --- a/pkg/sdk3rd/btpanelgo/client.go +++ b/pkg/sdk3rd/btpanelgo/client.go @@ -150,7 +150,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -171,7 +171,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tstatus := res.GetStatus(); tstatus != nil { var errored bool diff --git a/pkg/sdk3rd/btwaf/client.go b/pkg/sdk3rd/btwaf/client.go index a3be8ae92..a7840b176 100644 --- a/pkg/sdk3rd/btwaf/client.go +++ b/pkg/sdk3rd/btwaf/client.go @@ -85,7 +85,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -106,7 +106,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if code := res.GetCode(); code != 0 { return resp, fmt.Errorf("sdkerr: api error: code='%d'", code) diff --git a/pkg/sdk3rd/bunny/client.go b/pkg/sdk3rd/bunny/client.go index 4382164e3..1e39e5afd 100644 --- a/pkg/sdk3rd/bunny/client.go +++ b/pkg/sdk3rd/bunny/client.go @@ -57,7 +57,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 diff --git a/pkg/sdk3rd/cachefly/client.go b/pkg/sdk3rd/cachefly/client.go index ecce81610..d535ecfd5 100644 --- a/pkg/sdk3rd/cachefly/client.go +++ b/pkg/sdk3rd/cachefly/client.go @@ -58,7 +58,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -79,7 +79,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } } diff --git a/pkg/sdk3rd/cdnfly/client.go b/pkg/sdk3rd/cdnfly/client.go index 7bd986131..f111c5208 100644 --- a/pkg/sdk3rd/cdnfly/client.go +++ b/pkg/sdk3rd/cdnfly/client.go @@ -76,7 +76,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -97,7 +97,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != "" && tcode != "0" { return resp, fmt.Errorf("sdkerr: code='%s', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/cpanel/client.go b/pkg/sdk3rd/cpanel/client.go index b2617874f..b6bf34bdc 100644 --- a/pkg/sdk3rd/cpanel/client.go +++ b/pkg/sdk3rd/cpanel/client.go @@ -74,7 +74,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -95,7 +95,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tstatus := res.GetStatus(); tstatus == 0 { return resp, fmt.Errorf("sdkerr: status='%d', messages='%s', warnings='%s', errors='%s'", tstatus, strings.Join(res.GetMessages(), ", "), strings.Join(res.GetWarnings(), ", "), strings.Join(res.GetErrors(), ", ")) diff --git a/pkg/sdk3rd/ctyun/ao/client.go b/pkg/sdk3rd/ctyun/ao/client.go index 6e63e531a..7ad6a446c 100644 --- a/pkg/sdk3rd/ctyun/ao/client.go +++ b/pkg/sdk3rd/ctyun/ao/client.go @@ -40,7 +40,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest resp, err := c.client.DoRequestWithResult(req, res) if err == nil { if tcode := res.GetStatusCode(); tcode != "" && tcode != "100000" { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } } diff --git a/pkg/sdk3rd/ctyun/cdn/client.go b/pkg/sdk3rd/ctyun/cdn/client.go index af147095a..e8091502a 100644 --- a/pkg/sdk3rd/ctyun/cdn/client.go +++ b/pkg/sdk3rd/ctyun/cdn/client.go @@ -40,7 +40,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest resp, err := c.client.DoRequestWithResult(req, res) if err == nil { if tcode := res.GetStatusCode(); tcode != "" && tcode != "100000" { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } } diff --git a/pkg/sdk3rd/ctyun/cms/client.go b/pkg/sdk3rd/ctyun/cms/client.go index d648c09c6..14915500b 100644 --- a/pkg/sdk3rd/ctyun/cms/client.go +++ b/pkg/sdk3rd/ctyun/cms/client.go @@ -42,7 +42,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest statusCode := res.GetStatusCode() errorCode := res.GetError() if (statusCode != "" && statusCode != "200") || errorCode != "" { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', errorMessage='%s'", statusCode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", statusCode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } } diff --git a/pkg/sdk3rd/ctyun/dns/client.go b/pkg/sdk3rd/ctyun/dns/client.go index def071b60..332dff73e 100644 --- a/pkg/sdk3rd/ctyun/dns/client.go +++ b/pkg/sdk3rd/ctyun/dns/client.go @@ -42,7 +42,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest statusCode := res.GetStatusCode() errorCode := res.GetError() if (statusCode != "" && statusCode != "200") || errorCode != "" { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', errorMessage='%s'", statusCode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", statusCode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } } diff --git a/pkg/sdk3rd/ctyun/elb/client.go b/pkg/sdk3rd/ctyun/elb/client.go index f77433183..317a1e30d 100644 --- a/pkg/sdk3rd/ctyun/elb/client.go +++ b/pkg/sdk3rd/ctyun/elb/client.go @@ -42,7 +42,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest statusCode := res.GetStatusCode() errorCode := res.GetError() if (statusCode != "" && statusCode != "200" && statusCode != "800") || (errorCode != "" && errorCode != "SUCCESS") { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', description='%s'", statusCode, res.GetMessage(), res.GetMessage(), res.GetDescription()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', description='%s'", statusCode, res.GetMessage(), res.GetMessage(), res.GetDescription()) } } diff --git a/pkg/sdk3rd/ctyun/icdn/client.go b/pkg/sdk3rd/ctyun/icdn/client.go index f86629044..d1dbab891 100644 --- a/pkg/sdk3rd/ctyun/icdn/client.go +++ b/pkg/sdk3rd/ctyun/icdn/client.go @@ -40,7 +40,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest resp, err := c.client.DoRequestWithResult(req, res) if err == nil { if tcode := res.GetStatusCode(); tcode != "" && tcode != "100000" { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } } diff --git a/pkg/sdk3rd/ctyun/lvdn/client.go b/pkg/sdk3rd/ctyun/lvdn/client.go index 160e58d8e..6c292e238 100644 --- a/pkg/sdk3rd/ctyun/lvdn/client.go +++ b/pkg/sdk3rd/ctyun/lvdn/client.go @@ -40,7 +40,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest resp, err := c.client.DoRequestWithResult(req, res) if err == nil { if tcode := res.GetStatusCode(); tcode != "" && tcode != "100000" { - return resp, fmt.Errorf("sdkerr: api error, code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) + return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } } diff --git a/pkg/sdk3rd/ctyun/openapi/client.go b/pkg/sdk3rd/ctyun/openapi/client.go index 7475a565d..edc3f5330 100644 --- a/pkg/sdk3rd/ctyun/openapi/client.go +++ b/pkg/sdk3rd/ctyun/openapi/client.go @@ -136,7 +136,7 @@ func (c *Client) DoRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -157,7 +157,7 @@ func (c *Client) DoRequestWithResult(req *resty.Request, res any) (*resty.Respon 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } } diff --git a/pkg/sdk3rd/dcloud/unicloud/client.go b/pkg/sdk3rd/dcloud/unicloud/client.go index 11e486193..fb0a7512d 100644 --- a/pkg/sdk3rd/dcloud/unicloud/client.go +++ b/pkg/sdk3rd/dcloud/unicloud/client.go @@ -175,7 +175,7 @@ func (c *Client) invokeServerless(endpoint, clientSecret, appId, spaceId, target if err != nil { return resp, fmt.Errorf("unicloud api error: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("unicloud api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return resp, fmt.Errorf("unicloud api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } return resp, nil @@ -223,7 +223,7 @@ func (c *Client) sendRequest(method string, path string, params interface{}) (*r if err != nil { return resp, fmt.Errorf("unicloud api error: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("unicloud api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) + return resp, fmt.Errorf("unicloud api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } return resp, nil diff --git a/pkg/sdk3rd/dnsexit/client.go b/pkg/sdk3rd/dnsexit/client.go index 78d4022db..9b1a62103 100644 --- a/pkg/sdk3rd/dnsexit/client.go +++ b/pkg/sdk3rd/dnsexit/client.go @@ -63,7 +63,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -84,7 +84,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 0 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/dnsla/client.go b/pkg/sdk3rd/dnsla/client.go index 6add34a48..40fcc9054 100644 --- a/pkg/sdk3rd/dnsla/client.go +++ b/pkg/sdk3rd/dnsla/client.go @@ -61,7 +61,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -82,7 +82,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode/100 != 2 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/dogecloud/client.go b/pkg/sdk3rd/dogecloud/client.go index f2088b009..6fb1cf103 100644 --- a/pkg/sdk3rd/dogecloud/client.go +++ b/pkg/sdk3rd/dogecloud/client.go @@ -98,7 +98,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -119,7 +119,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 0 && tcode != 200 { return resp, fmt.Errorf("sdkerr: code='%d', msg='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/flexcdn/client.go b/pkg/sdk3rd/flexcdn/client.go index 3d097a814..3ffd871df 100644 --- a/pkg/sdk3rd/flexcdn/client.go +++ b/pkg/sdk3rd/flexcdn/client.go @@ -102,7 +102,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -123,7 +123,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 200 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/gname/client.go b/pkg/sdk3rd/gname/client.go index 13b45e72e..bd118916e 100644 --- a/pkg/sdk3rd/gname/client.go +++ b/pkg/sdk3rd/gname/client.go @@ -91,7 +91,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -112,7 +112,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 1 { return resp, fmt.Errorf("sdkerr: api error: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/goedge/client.go b/pkg/sdk3rd/goedge/client.go index 52fdd8d8b..5e2bebdae 100644 --- a/pkg/sdk3rd/goedge/client.go +++ b/pkg/sdk3rd/goedge/client.go @@ -102,7 +102,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -123,7 +123,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 200 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/lecdn/v3/client/client.go b/pkg/sdk3rd/lecdn/v3/client/client.go index 9fc39df93..3a13f1f48 100644 --- a/pkg/sdk3rd/lecdn/v3/client/client.go +++ b/pkg/sdk3rd/lecdn/v3/client/client.go @@ -91,7 +91,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -112,7 +112,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 200 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/lecdn/v3/master/client.go b/pkg/sdk3rd/lecdn/v3/master/client.go index aeaa359da..b818de9a1 100644 --- a/pkg/sdk3rd/lecdn/v3/master/client.go +++ b/pkg/sdk3rd/lecdn/v3/master/client.go @@ -93,7 +93,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -114,7 +114,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 200 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/netlify/client.go b/pkg/sdk3rd/netlify/client.go index 1a6fa9084..7bbe6a107 100644 --- a/pkg/sdk3rd/netlify/client.go +++ b/pkg/sdk3rd/netlify/client.go @@ -58,7 +58,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -79,7 +79,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 0 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/qingcloud/dns/client.go b/pkg/sdk3rd/qingcloud/dns/client.go index 3c8a71847..204324aa7 100644 --- a/pkg/sdk3rd/qingcloud/dns/client.go +++ b/pkg/sdk3rd/qingcloud/dns/client.go @@ -97,7 +97,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -118,7 +118,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != 0 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/rainyun/client.go b/pkg/sdk3rd/rainyun/client.go index e7f2fb5ae..845618133 100644 --- a/pkg/sdk3rd/rainyun/client.go +++ b/pkg/sdk3rd/rainyun/client.go @@ -58,7 +58,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -79,7 +79,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode/100 != 2 { return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", tcode, res.GetMessage()) diff --git a/pkg/sdk3rd/ratpanel/client.go b/pkg/sdk3rd/ratpanel/client.go index 351e76adb..b45a0f325 100644 --- a/pkg/sdk3rd/ratpanel/client.go +++ b/pkg/sdk3rd/ratpanel/client.go @@ -118,7 +118,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -139,7 +139,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tmessage := res.GetMessage(); tmessage != "success" { return resp, fmt.Errorf("sdkerr: message='%s'", tmessage) diff --git a/pkg/sdk3rd/safeline/client.go b/pkg/sdk3rd/safeline/client.go index 5d7ee6683..fc0dfd369 100644 --- a/pkg/sdk3rd/safeline/client.go +++ b/pkg/sdk3rd/safeline/client.go @@ -72,7 +72,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -93,7 +93,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if terrcode := res.GetErrCode(); terrcode != "" { return resp, fmt.Errorf("sdkerr: err='%s', msg='%s'", terrcode, res.GetErrMsg()) diff --git a/pkg/sdk3rd/upyun/console/client.go b/pkg/sdk3rd/upyun/console/client.go index 0c54ea613..b86ce7348 100644 --- a/pkg/sdk3rd/upyun/console/client.go +++ b/pkg/sdk3rd/upyun/console/client.go @@ -80,7 +80,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -101,11 +101,11 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { tresp := &apiResponseBase{} if err := json.Unmarshal(resp.Body(), &tresp); err != nil { - return resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w", err) + return resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else if tdata := tresp.GetData(); tdata == nil { return resp, fmt.Errorf("sdkerr: received empty data") } else if terrcode := tdata.GetErrorCode(); terrcode != 0 { diff --git a/pkg/sdk3rd/wangsu/cdn/client.go b/pkg/sdk3rd/wangsu/cdn/client.go index e28855878..4e8284afa 100644 --- a/pkg/sdk3rd/wangsu/cdn/client.go +++ b/pkg/sdk3rd/wangsu/cdn/client.go @@ -39,7 +39,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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, fmt.Errorf("sdkerr: api error: code='%s', message='%s'", tcode, res.GetMessage()) } } diff --git a/pkg/sdk3rd/wangsu/openapi/client.go b/pkg/sdk3rd/wangsu/openapi/client.go index 4d6c50d6c..941b415a1 100644 --- a/pkg/sdk3rd/wangsu/openapi/client.go +++ b/pkg/sdk3rd/wangsu/openapi/client.go @@ -162,7 +162,7 @@ func (c *Client) DoRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -183,7 +183,7 @@ func (c *Client) DoRequestWithResult(req *resty.Request, res any) (*resty.Respon 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } } diff --git a/pkg/sdk3rd/xinnet/client.go b/pkg/sdk3rd/xinnet/client.go index 092897f56..6a3f82823 100644 --- a/pkg/sdk3rd/xinnet/client.go +++ b/pkg/sdk3rd/xinnet/client.go @@ -115,7 +115,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { if err != nil { return resp, fmt.Errorf("sdkerr: failed to send request: %w", err) } else if resp.IsError() { - return resp, fmt.Errorf("sdkerr: 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 @@ -136,7 +136,7 @@ func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*rest 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 resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w (resp: %s)", err, resp.String()) } else { if tcode := res.GetCode(); tcode != "0" { return resp, fmt.Errorf("sdkerr: code='%s', msg='%s'", tcode, res.GetMessage())