From f76cb563d0343b9c960573c4b333449a5f19e69a Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Tue, 30 Dec 2025 14:01:31 +0800 Subject: [PATCH] fix(provider): wrong sdk definations --- .../providers/ctcccloud-faas/ctcccloud_faas.go | 11 ++++++++--- pkg/sdk3rd/ctyun/faas/api_get_custom_domain.go | 8 +++----- pkg/sdk3rd/ctyun/faas/client.go | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go index 43b5a2e7..e81f8490 100644 --- a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go +++ b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go @@ -80,10 +80,15 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Debug("sdk request 'faas.GetCustomDomain'", slog.Any("request", getCustomDomainReq), slog.Any("response", getCustomDomainResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'faas.GetCustomDomain': %w", err) - } else if getCustomDomainResp.ReturnObj == nil || len(getCustomDomainResp.ReturnObj.Data) == 0 { - return nil, fmt.Errorf("could not find custom domain '%s'", d.config.Domain) } else { - faasCustomDomain = getCustomDomainResp.ReturnObj.Data[0] + faasCustomDomain = getCustomDomainResp.ReturnObj + + // 已部署过此域名,跳过 + if faasCustomDomain.CertConfig != nil && + faasCustomDomain.CertConfig.Certificate == certPEM && + faasCustomDomain.CertConfig.PrivateKey == privkeyPEM { + return &deployer.DeployResult{}, nil + } } // 更新自定义域名 diff --git a/pkg/sdk3rd/ctyun/faas/api_get_custom_domain.go b/pkg/sdk3rd/ctyun/faas/api_get_custom_domain.go index 48786ebc..5796cd4d 100644 --- a/pkg/sdk3rd/ctyun/faas/api_get_custom_domain.go +++ b/pkg/sdk3rd/ctyun/faas/api_get_custom_domain.go @@ -10,17 +10,15 @@ import ( ) type GetCustomDomainRequest struct { - RegionId *string `json:"-"` - DomainName *string `json:"domainName,omitempty"` + RegionId *string `json:"-" url:"-"` + DomainName *string `json:"domainName,omitempty" url:"-"` CnameCheck *bool `json:"cnameCheck,omitempty" url:"cnameCheck,omitempty"` } type GetCustomDomainResponse struct { apiResponseBase - ReturnObj *struct { - Data []*CustomDomainRecord `json:"data,omitempty"` - } `json:"returnObj,omitempty"` + ReturnObj *CustomDomainRecord `json:"returnObj,omitempty"` } func (c *Client) GetCustomDomain(req *GetCustomDomainRequest) (*GetCustomDomainResponse, error) { diff --git a/pkg/sdk3rd/ctyun/faas/client.go b/pkg/sdk3rd/ctyun/faas/client.go index e553207d..e9293025 100644 --- a/pkg/sdk3rd/ctyun/faas/client.go +++ b/pkg/sdk3rd/ctyun/faas/client.go @@ -39,7 +39,7 @@ func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) { 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.GetStatusCode(); tcode != "" && tcode != "100000" { + if tcode := res.GetStatusCode(); tcode != "" && tcode != "0" { return resp, fmt.Errorf("sdkerr: api error: code='%s', message='%s', errorCode='%s', errorMessage='%s'", tcode, res.GetMessage(), res.GetMessage(), res.GetErrorMessage()) } }