diff --git a/pkg/core/certmgr/providers/1panel/1panel.go b/pkg/core/certmgr/providers/1panel/1panel.go index e45e90982..bb826ca16 100644 --- a/pkg/core/certmgr/providers/1panel/1panel.go +++ b/pkg/core/certmgr/providers/1panel/1panel.go @@ -136,7 +136,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri { // 获取证书详情 websiteSSLGetResp, err := sdkClient.WebsiteSSLGetWithContext(ctx, sslId) - c.logger.Debug("sdk request 'WebsiteSSLGet'", slog.Int64("sslId", sslId), slog.Any("response", websiteSSLGetResp)) + c.logger.Debug("sdk request 'WebsiteSSLGet'", slog.Int64("params.sslId", sslId), slog.Any("response", websiteSSLGetResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLGet': %w", err) } @@ -160,7 +160,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri { // 获取证书详情 websiteSSLGetResp, err := sdkClient.WebsiteSSLGetWithContext(ctx, sslId) - c.logger.Debug("sdk request 'WebsiteSSLGet'", slog.Any("sslId", sslId), slog.Any("response", websiteSSLGetResp)) + c.logger.Debug("sdk request 'WebsiteSSLGet'", slog.Int64("params.sslId", sslId), slog.Any("response", websiteSSLGetResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLGet': %w", err) } diff --git a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go index d282a763a..0ecfc3606 100644 --- a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go @@ -118,7 +118,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo // 对比证书内容 getCertificateResp, err := c.sdkClient.GetCertificate(ctx, certItem.ID.Name(), certItem.ID.Version(), nil) - c.logger.Debug("sdk request 'keyvault.GetCertificate'", slog.String("request.certificateName", certItem.ID.Name()), slog.String("request.certificateVersion", certItem.ID.Version()), slog.Any("response", getCertificateResp)) + c.logger.Debug("sdk request 'keyvault.GetCertificate'", slog.String("params.certificateName", certItem.ID.Name()), slog.String("params.certificateVersion", certItem.ID.Version()), slog.Any("response", getCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'keyvault.GetCertificate': %w", err) } else { @@ -162,7 +162,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*Uplo }, } importCertificateResp, err := c.sdkClient.ImportCertificate(ctx, certName, importCertificateParams, nil) - c.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("request.certificateName", certName), slog.Any("request.parameters", importCertificateParams), slog.Any("response", importCertificateResp)) + c.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("params.certificateName", certName), slog.Any("request", importCertificateParams), slog.Any("response", importCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } @@ -189,7 +189,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri // 获取证书 // REF: https://learn.microsoft.com/en-us/rest/api/keyvault/certificates/get-certificate/get-certificate getCertificateResp, err := c.sdkClient.GetCertificate(ctx, certIdOrName, "", nil) - c.logger.Debug("sdk request 'keyvault.GetCertificate'", slog.String("request.certificateName", certIdOrName), slog.Any("response", getCertificateResp)) + c.logger.Debug("sdk request 'keyvault.GetCertificate'", slog.String("params.certificateName", certIdOrName), slog.Any("response", getCertificateResp)) if err != nil { var respErr *azcore.ResponseError if !errors.As(err, &respErr) || (respErr.ErrorCode != "ResourceNotFound" && respErr.ErrorCode != "CertificateNotFound") { @@ -217,7 +217,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri }, } importCertificateResp, err := c.sdkClient.ImportCertificate(ctx, certIdOrName, importCertificateParams, nil) - c.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("request.certificateName", certIdOrName), slog.Any("request.parameters", importCertificateParams), slog.Any("response", importCertificateResp)) + c.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("params.certificateName", certIdOrName), slog.Any("request", importCertificateParams), slog.Any("response", importCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } diff --git a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go index 3c30e0be0..577db92ad 100644 --- a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -102,7 +102,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri Key: privkeyPEM, } sslCenterUpdateResp, err := c.sdkClient.SslCenterUpdateWithContext(ctx, certId, sslCenterUpdateReq) - c.logger.Debug("sdk request 'sslcenter.Update'", slog.Int64("certId", certId), slog.Any("request", sslCenterUpdateReq), slog.Any("response", sslCenterUpdateResp)) + c.logger.Debug("sdk request 'sslcenter.Update'", slog.Int64("params.certId", certId), slog.Any("request", sslCenterUpdateReq), slog.Any("response", sslCenterUpdateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'sslcenter.Update': %w", err) } diff --git a/pkg/core/deployer/providers/1panel/1panel.go b/pkg/core/deployer/providers/1panel/1panel.go index 59c88db21..7d4819130 100644 --- a/pkg/core/deployer/providers/1panel/1panel.go +++ b/pkg/core/deployer/providers/1panel/1panel.go @@ -232,7 +232,7 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE } websiteGetResp, err := sdkClient.WebsiteGetWithContext(ctx, websiteItem.ID) - d.logger.Debug("sdk request 'WebsiteGet'", slog.Int64("websiteId", websiteItem.ID), slog.Any("response", websiteGetResp)) + d.logger.Debug("sdk request 'WebsiteGet'", slog.Int64("params.websiteId", websiteItem.ID), slog.Any("response", websiteGetResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'WebsiteGet': %w", err) } @@ -286,7 +286,7 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE } websiteGetResp, err := sdkClient.WebsiteGetWithContext(ctx, websiteItem.ID) - d.logger.Debug("sdk request 'WebsiteGet'", slog.Int64("websiteId", websiteItem.ID), slog.Any("response", websiteGetResp)) + d.logger.Debug("sdk request 'WebsiteGet'", slog.Int64("params.websiteId", websiteItem.ID), slog.Any("response", websiteGetResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'WebsiteGet': %w", err) } @@ -324,7 +324,7 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64 { // 获取网站 HTTPS 配置 websiteHttpsGetResp, err := sdkClient.WebsiteHttpsGetWithContext(ctx, websiteId) - d.logger.Debug("sdk request 'WebsiteHttpsGet'", slog.Int64("websiteId", websiteId), slog.Any("response", websiteHttpsGetResp)) + d.logger.Debug("sdk request 'WebsiteHttpsGet'", slog.Int64("params.websiteId", websiteId), slog.Any("response", websiteHttpsGetResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsGet': %w", err) } else { @@ -348,7 +348,7 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64 websiteHttpsPostReq.HttpConfig = "HTTPToHTTPS" } websiteHttpsPostResp, err := sdkClient.WebsiteHttpsPostWithContext(ctx, websiteId, websiteHttpsPostReq) - d.logger.Debug("sdk request 'WebsiteHttpsPost'", slog.Int64("websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp)) + d.logger.Debug("sdk request 'WebsiteHttpsPost'", slog.Int64("params.websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsPost': %w", err) } @@ -358,7 +358,7 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64 { // 获取网站 HTTPS 配置 websiteHttpsGetResp, err := sdkClient.WebsiteHttpsGetWithContext(ctx, websiteId) - d.logger.Debug("sdk request 'WebsiteHttpsGet'", slog.Int64("websiteId", websiteId), slog.Any("response", websiteHttpsGetResp)) + d.logger.Debug("sdk request 'WebsiteHttpsGet'", slog.Int64("params.websiteId", websiteId), slog.Any("response", websiteHttpsGetResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsGet': %w", err) } else { @@ -383,7 +383,7 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64 websiteHttpsPostReq.HttpConfig = "HTTPToHTTPS" } websiteHttpsPostResp, err := sdkClient.WebsiteHttpsPostWithContext(ctx, websiteId, websiteHttpsPostReq) - d.logger.Debug("sdk request 'WebsiteHttpsPost'", slog.Int64("websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp)) + d.logger.Debug("sdk request 'WebsiteHttpsPost'", slog.Int64("params.websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsPost': %w", err) } diff --git a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go index 811c978d5..aa06105ed 100644 --- a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go +++ b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go @@ -399,7 +399,7 @@ func (d *Deployer) updateCloudNativeDomainCertificate(ctx context.Context, cloud // REF: https://help.aliyun.com/zh/api-gateway/cloud-native-api-gateway/developer-reference/api-apig-2024-03-27-getdomain getDomainReq := &aliapig.GetDomainRequest{} getDomainResp, err := d.sdkClients.CloudNativeAPIGateway.GetDomainWithContext(ctx, tea.String(domainId), getDomainReq, make(map[string]*string), &dara.RuntimeOptions{}) - d.logger.Debug("sdk request 'apig.GetDomain'", slog.String("domainId", domainId), slog.Any("request", getDomainReq), slog.Any("response", getDomainResp)) + d.logger.Debug("sdk request 'apig.GetDomain'", slog.String("params.domainId", domainId), slog.Any("request", getDomainReq), slog.Any("response", getDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'apig.GetDomain': %w", err) } @@ -417,7 +417,7 @@ func (d *Deployer) updateCloudNativeDomainCertificate(ctx context.Context, cloud CertIdentifier: tea.String(cloudCertId), } updateDomainResp, err := d.sdkClients.CloudNativeAPIGateway.UpdateDomainWithContext(ctx, tea.String(domainId), updateDomainReq, make(map[string]*string), &dara.RuntimeOptions{}) - d.logger.Debug("sdk request 'apig.UpdateDomain'", slog.String("domainId", domainId), slog.Any("request", updateDomainReq), slog.Any("response", updateDomainResp)) + d.logger.Debug("sdk request 'apig.UpdateDomain'", slog.String("params.domainId", domainId), slog.Any("request", updateDomainReq), slog.Any("response", updateDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'apig.UpdateDomain': %w", err) } diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index 247636a4a..9a25c4c43 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -120,7 +120,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) // 查询 BLB 实例详情 // REF: https://cloud.baidu.com/doc/BLB/s/6jwvxnyhi#describeloadbalancerdetail%E6%9F%A5%E8%AF%A2blb%E5%AE%9E%E4%BE%8B%E8%AF%A6%E6%83%85 describeLoadBalancerDetailResp, err := d.sdkClient.DescribeLoadBalancerDetail(d.config.LoadbalancerId) - d.logger.Debug("sdk request 'appblb.DescribeLoadBalancerAttribute'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) + d.logger.Debug("sdk request 'appblb.DescribeLoadBalancerAttribute'", slog.String("params.blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'appblb.DescribeLoadBalancerDetail': %w", err) } @@ -188,7 +188,7 @@ func (d *Deployer) deployToListener(ctx context.Context, cloudCertId string) err ListenerPort: uint16(d.config.ListenerPort), } describeAppAllListenersResp, err := d.sdkClient.DescribeAppAllListeners(d.config.LoadbalancerId, describeAppAllListenersRequest) - d.logger.Debug("sdk request 'appblb.DescribeAppAllListeners'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("request", describeAppAllListenersRequest), slog.Any("response", describeAppAllListenersResp)) + d.logger.Debug("sdk request 'appblb.DescribeAppAllListeners'", slog.String("params.blbId", d.config.LoadbalancerId), slog.Any("request", describeAppAllListenersRequest), slog.Any("response", describeAppAllListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'appblb.DescribeAppAllListeners': %w", err) } @@ -256,7 +256,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudLoad MaxKeys: 1, } describeAppHTTPSListenersResp, err := d.sdkClient.DescribeAppHTTPSListeners(cloudLoadbalancerId, describeAppHTTPSListenersReq) - d.logger.Debug("sdk request 'appblb.DescribeAppHTTPSListeners'", slog.String("blbId", cloudLoadbalancerId), slog.Any("request", describeAppHTTPSListenersReq), slog.Any("response", describeAppHTTPSListenersResp)) + d.logger.Debug("sdk request 'appblb.DescribeAppHTTPSListeners'", slog.String("params.blbId", cloudLoadbalancerId), slog.Any("request", describeAppHTTPSListenersReq), slog.Any("response", describeAppHTTPSListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'appblb.DescribeAppHTTPSListeners': %w", err) } else if len(describeAppHTTPSListenersResp.ListenerList) == 0 { diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index 6382f52c8..d18725607 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -120,7 +120,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) // 查询 BLB 实例详情 // REF: https://cloud.baidu.com/doc/BLB/s/njwvxnv79#describeloadbalancerdetail%E6%9F%A5%E8%AF%A2blb%E5%AE%9E%E4%BE%8B%E8%AF%A6%E6%83%85 describeLoadBalancerDetailResp, err := d.sdkClient.DescribeLoadBalancerDetail(d.config.LoadbalancerId) - d.logger.Debug("sdk request 'blb.DescribeLoadBalancerAttribute'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) + d.logger.Debug("sdk request 'blb.DescribeLoadBalancerAttribute'", slog.String("params.blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'blb.DescribeLoadBalancerDetail': %w", err) } @@ -188,7 +188,7 @@ func (d *Deployer) deployToListener(ctx context.Context, cloudCertId string) err ListenerPort: uint16(d.config.ListenerPort), } describeAllListenersResp, err := d.sdkClient.DescribeAllListeners(d.config.LoadbalancerId, describeAllListenersRequest) - d.logger.Debug("sdk request 'blb.DescribeAllListeners'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("request", describeAllListenersRequest), slog.Any("response", describeAllListenersResp)) + d.logger.Debug("sdk request 'blb.DescribeAllListeners'", slog.String("params.blbId", d.config.LoadbalancerId), slog.Any("request", describeAllListenersRequest), slog.Any("response", describeAllListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'blb.DescribeAllListeners': %w", err) } @@ -256,7 +256,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudLoad MaxKeys: 1, } describeHTTPSListenersResp, err := d.sdkClient.DescribeHTTPSListeners(cloudLoadbalancerId, describeHTTPSListenersReq) - d.logger.Debug("sdk request 'blb.DescribeHTTPSListeners'", slog.String("blbId", cloudLoadbalancerId), slog.Any("request", describeHTTPSListenersReq), slog.Any("response", describeHTTPSListenersResp)) + d.logger.Debug("sdk request 'blb.DescribeHTTPSListeners'", slog.String("params.blbId", cloudLoadbalancerId), slog.Any("request", describeHTTPSListenersReq), slog.Any("response", describeHTTPSListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'blb.DescribeHTTPSListeners': %w", err) } else if len(describeHTTPSListenersResp.ListenerList) == 0 { diff --git a/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go b/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go index 9dcb076d7..e766fd036 100644 --- a/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go +++ b/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go @@ -161,7 +161,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { } listDomainsRespDomains, listDomainsNextMarker, err := d.sdkClient.ListDomains(listDomainsMarker) - d.logger.Debug("sdk request 'cdn.ListDomains'", slog.String("request.marker", listDomainsMarker), slog.Any("response.domains", listDomainsRespDomains)) + d.logger.Debug("sdk request 'cdn.ListDomains'", slog.String("params.marker", listDomainsMarker), slog.Any("response.domains", listDomainsRespDomains)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.ListDomains': %w", err) } @@ -190,7 +190,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c }, "ON", ) - d.logger.Debug("sdk request 'cdn.PutCert'", slog.String("request.domain", domain), slog.Any("response", putCertResp)) + d.logger.Debug("sdk request 'cdn.PutCert'", slog.String("params.domain", domain), slog.Any("response", putCertResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.PutCert': %w", err) } diff --git a/pkg/core/deployer/providers/cdnfly/cdnfly.go b/pkg/core/deployer/providers/cdnfly/cdnfly.go index 3a106c312..9d1f56e2c 100644 --- a/pkg/core/deployer/providers/cdnfly/cdnfly.go +++ b/pkg/core/deployer/providers/cdnfly/cdnfly.go @@ -99,7 +99,7 @@ func (d *Deployer) deployToSite(ctx context.Context, certPEM, privkeyPEM string) // 获取单个网站详情 // REF: https://doc.cdnfly.cn/wangzhanguanli-v1-sites.html#%E8%8E%B7%E5%8F%96%E5%8D%95%E4%B8%AA%E7%BD%91%E7%AB%99%E8%AF%A6%E6%83%85 getSiteResp, err := d.sdkClient.GetSiteWithContext(ctx, d.config.SiteId) - d.logger.Debug("sdk request 'GetSite'", slog.String("siteId", d.config.SiteId), slog.Any("response", getSiteResp)) + d.logger.Debug("sdk request 'GetSite'", slog.String("params.siteId", d.config.SiteId), slog.Any("response", getSiteResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'GetSite': %w", err) } @@ -127,7 +127,7 @@ func (d *Deployer) deployToSite(ctx context.Context, certPEM, privkeyPEM string) HttpsListen: lo.ToPtr(updateSiteReqHttpsListen), } updateSiteResp, err := d.sdkClient.UpdateSiteWithContext(ctx, d.config.SiteId, updateSiteReq) - d.logger.Debug("sdk request 'UpdateSite'", slog.String("siteId", d.config.SiteId), slog.Any("request", updateSiteReq), slog.Any("response", updateSiteResp)) + d.logger.Debug("sdk request 'UpdateSite'", slog.String("params.siteId", d.config.SiteId), slog.Any("request", updateSiteReq), slog.Any("response", updateSiteResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'UpdateSite': %w", err) } @@ -148,7 +148,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM Key: lo.ToPtr(privkeyPEM), } updateCertResp, err := d.sdkClient.UpdateCertWithContext(ctx, d.config.CertificateId, updateCertReq) - d.logger.Debug("sdk request 'UpdateCert'", slog.String("certId", d.config.CertificateId), slog.Any("request", updateCertReq), slog.Any("response", updateCertResp)) + d.logger.Debug("sdk request 'UpdateCert'", slog.String("params.certId", d.config.CertificateId), slog.Any("request", updateCertReq), slog.Any("response", updateCertResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'UpdateCert': %w", err) } diff --git a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go index bf3404598..05aa09284 100644 --- a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go +++ b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go @@ -101,7 +101,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep // 获取证书 // REF: https://api.gcore.com/docs/cdn#tag/SSL-certificates/paths/~1cdn~1sslData~1%7Bssl_id%7D/get getCertificateDetailResp, err := d.sdkClients.SSLCerts.Get(ctx, d.config.CertificateId) - d.logger.Debug("sdk request 'sslcerts.Get'", slog.Int64("sslId", d.config.CertificateId), slog.Any("response", getCertificateDetailResp)) + d.logger.Debug("sdk request 'sslcerts.Get'", slog.Int64("params.sslId", d.config.CertificateId), slog.Any("response", getCertificateDetailResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'sslcerts.Get': %w", err) } @@ -115,7 +115,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep ValidateRootCA: false, } changeCertificateResp, err := d.sdkClients.SSLCerts.Update(ctx, getCertificateDetailResp.ID, changeCertificateReq) - d.logger.Debug("sdk request 'sslcerts.Update'", slog.Int64("sslId", getCertificateDetailResp.ID), slog.Any("request", changeCertificateReq), slog.Any("response", changeCertificateResp)) + d.logger.Debug("sdk request 'sslcerts.Update'", slog.Int64("params.sslId", getCertificateDetailResp.ID), slog.Any("request", changeCertificateReq), slog.Any("response", changeCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'sslcerts.Update': %w", err) } @@ -151,7 +151,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep updateResourceReq.ProxySSLData = &getResourceResp.ProxySSLData } updateResourceResp, err := d.sdkClients.Resources.Update(ctx, d.config.ResourceId, updateResourceReq) - d.logger.Debug("sdk request 'resources.Update'", slog.Int64("resourceId", d.config.ResourceId), slog.Any("request", updateResourceReq), slog.Any("response", updateResourceResp)) + d.logger.Debug("sdk request 'resources.Update'", slog.Int64("params.resourceId", d.config.ResourceId), slog.Any("request", updateResourceReq), slog.Any("response", updateResourceResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'resources.Update': %w", err) } diff --git a/pkg/core/deployer/providers/kong/kong.go b/pkg/core/deployer/providers/kong/kong.go index a10a7e960..c22c370f8 100644 --- a/pkg/core/deployer/providers/kong/kong.go +++ b/pkg/core/deployer/providers/kong/kong.go @@ -104,7 +104,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM SNIs: lo.Map(certX509.DNSNames, func(s string, _ int) *string { return lo.ToPtr(s) }), } upsertCertificateResp, err := d.sdkClient.UpsertCertificateWithContext(ctx, d.config.CertificateId, upsertCertificateReq) - d.logger.Debug("sdk request 'UpsertCertificate'", slog.String("certificateId", d.config.CertificateId), slog.Any("request", upsertCertificateReq), slog.Any("response", upsertCertificateResp)) + d.logger.Debug("sdk request 'UpsertCertificate'", slog.String("params.certificateId", d.config.CertificateId), slog.Any("request", upsertCertificateReq), slog.Any("response", upsertCertificateResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'UpsertCertificate': %w", err) } diff --git a/pkg/core/deployer/providers/lecdn/lecdn.go b/pkg/core/deployer/providers/lecdn/lecdn.go index 4eddbfbd4..7f6a498b3 100644 --- a/pkg/core/deployer/providers/lecdn/lecdn.go +++ b/pkg/core/deployer/providers/lecdn/lecdn.go @@ -109,7 +109,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM AutoRenewal: false, } updateSSLCertResp, err := sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateSSLCertReq) - d.logger.Debug("sdk request 'UpdateCertificate'", slog.Int64("certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp)) + d.logger.Debug("sdk request 'UpdateCertificate'", slog.Int64("params.certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'UpdateCertificate': %w", err) } @@ -127,7 +127,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM AutoRenewal: false, } updateSSLCertResp, err := sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateSSLCertReq) - d.logger.Debug("sdk request 'UpdateCertificate'", slog.Int64("certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp)) + d.logger.Debug("sdk request 'UpdateCertificate'", slog.Int64("params.certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'UpdateCertificate': %w", err) } diff --git a/pkg/core/deployer/providers/netlify/netlify.go b/pkg/core/deployer/providers/netlify/netlify.go index 351d56024..0cc2520fa 100644 --- a/pkg/core/deployer/providers/netlify/netlify.go +++ b/pkg/core/deployer/providers/netlify/netlify.go @@ -92,7 +92,7 @@ func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM stri Key: privkeyPEM, } provisionSiteTLSCertificateResp, err := d.sdkClient.ProvisionSiteTLSCertificateWithContext(ctx, d.config.SiteId, provisionSiteTLSCertificateReq) - d.logger.Debug("sdk request 'ProvisionSiteTLSCertificate'", slog.String("siteId", d.config.SiteId), slog.Any("request", provisionSiteTLSCertificateReq), slog.Any("response", provisionSiteTLSCertificateResp)) + d.logger.Debug("sdk request 'ProvisionSiteTLSCertificate'", slog.String("params.siteId", d.config.SiteId), slog.Any("request", provisionSiteTLSCertificateReq), slog.Any("response", provisionSiteTLSCertificateResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'ProvisionSiteTLSCertificate': %w", err) } diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go index ee63ab443..6832203e8 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go @@ -330,7 +330,7 @@ func (d *Deployer) updateHostCertificate(ctx context.Context, cloudHostType stri CertificateId: lo.ToPtr(cloudCertId), } nginxUpdateProxyHostResp, err := d.sdkClient.NginxUpdateProxyHostWithContext(ctx, cloudHostId, nginxUpdateProxyHostReq) - d.logger.Debug("sdk request 'nginx.UpdateProxyHost'", slog.Int64("request.hostId", cloudHostId), slog.Any("request", nginxUpdateProxyHostReq), slog.Any("response", nginxUpdateProxyHostResp)) + d.logger.Debug("sdk request 'nginx.UpdateProxyHost'", slog.Int64("params.hostId", cloudHostId), slog.Any("request", nginxUpdateProxyHostReq), slog.Any("response", nginxUpdateProxyHostResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'nginx.UpdateProxyHost': %w", err) } @@ -342,7 +342,7 @@ func (d *Deployer) updateHostCertificate(ctx context.Context, cloudHostType stri CertificateId: lo.ToPtr(cloudCertId), } nginxUpdateRedirectionHostResp, err := d.sdkClient.NginxUpdateRedirectionHostWithContext(ctx, cloudHostId, nginxUpdateRedirectionHostReq) - d.logger.Debug("sdk request 'nginx.UpdateRedirectionHost'", slog.Int64("request.hostId", cloudHostId), slog.Any("request", nginxUpdateRedirectionHostReq), slog.Any("response", nginxUpdateRedirectionHostResp)) + d.logger.Debug("sdk request 'nginx.UpdateRedirectionHost'", slog.Int64("params.hostId", cloudHostId), slog.Any("request", nginxUpdateRedirectionHostReq), slog.Any("response", nginxUpdateRedirectionHostResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'nginx.UpdateRedirectionHost': %w", err) } @@ -354,7 +354,7 @@ func (d *Deployer) updateHostCertificate(ctx context.Context, cloudHostType stri CertificateId: lo.ToPtr(cloudCertId), } nginxUpdateStreamResp, err := d.sdkClient.NginxUpdateStreamWithContext(ctx, cloudHostId, nginxUpdateStreamReq) - d.logger.Debug("sdk request 'nginx.UpdateStream'", slog.Int64("request.hostId", cloudHostId), slog.Any("request", nginxUpdateStreamReq), slog.Any("response", nginxUpdateStreamResp)) + d.logger.Debug("sdk request 'nginx.UpdateStream'", slog.Int64("params.hostId", cloudHostId), slog.Any("request", nginxUpdateStreamReq), slog.Any("response", nginxUpdateStreamResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'nginx.UpdateStream': %w", err) } @@ -366,7 +366,7 @@ func (d *Deployer) updateHostCertificate(ctx context.Context, cloudHostType stri CertificateId: lo.ToPtr(cloudCertId), } nginxUpdateDeadHostResp, err := d.sdkClient.NginxUpdateDeadHostWithContext(ctx, cloudHostId, nginxUpdateDeadHostReq) - d.logger.Debug("sdk request 'nginx.UpdateDeadHost'", slog.Int64("request.hostId", cloudHostId), slog.Any("request", nginxUpdateDeadHostReq), slog.Any("response", nginxUpdateDeadHostResp)) + d.logger.Debug("sdk request 'nginx.UpdateDeadHost'", slog.Int64("params.hostId", cloudHostId), slog.Any("request", nginxUpdateDeadHostReq), slog.Any("response", nginxUpdateDeadHostResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'nginx.UpdateDeadHost': %w", err) } diff --git a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go index 55a88dd28..1b2ca5d4b 100644 --- a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -180,7 +180,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { } getDomainListResp, err := d.sdkClient.GetDomainList(ctx, getDomainListMarker, 100) - d.logger.Debug("sdk request 'cdn.GetDomainList'", slog.String("request.marker", getDomainListMarker), slog.Any("response", getDomainListResp)) + d.logger.Debug("sdk request 'cdn.GetDomainList'", slog.String("params.marker", getDomainListMarker), slog.Any("response", getDomainListResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.GetDomainList': %w", err) } @@ -208,7 +208,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c // 获取域名信息 // REF: https://developer.qiniu.com/fusion/4246/the-domain-name getDomainInfoResp, err := d.sdkClient.GetDomainInfo(ctx, domain) - d.logger.Debug("sdk request 'cdn.GetDomainInfo'", slog.String("request.domain", domain), slog.Any("response", getDomainInfoResp)) + d.logger.Debug("sdk request 'cdn.GetDomainInfo'", slog.String("params.domain", domain), slog.Any("response", getDomainInfoResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.GetDomainInfo': %w", err) } @@ -218,13 +218,13 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c // REF: https://developer.qiniu.com/fusion/4246/the-domain-name if getDomainInfoResp.Https == nil || getDomainInfoResp.Https.CertID == "" { enableDomainHttpsResp, err := d.sdkClient.EnableDomainHttps(ctx, domain, cloudCertId, true, true) - d.logger.Debug("sdk request 'cdn.EnableDomainHttps'", slog.String("request.domain", domain), slog.String("request.certId", cloudCertId), slog.Any("response", enableDomainHttpsResp)) + d.logger.Debug("sdk request 'cdn.EnableDomainHttps'", slog.String("params.domain", domain), slog.String("params.certId", cloudCertId), slog.Any("response", enableDomainHttpsResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.EnableDomainHttps': %w", err) } } else if getDomainInfoResp.Https.CertID != cloudCertId { modifyDomainHttpsConfResp, err := d.sdkClient.ModifyDomainHttpsConf(ctx, domain, cloudCertId, getDomainInfoResp.Https.ForceHttps, getDomainInfoResp.Https.Http2Enable) - d.logger.Debug("sdk request 'cdn.ModifyDomainHttpsConf'", slog.String("request.domain", domain), slog.String("request.certId", cloudCertId), slog.Any("response", modifyDomainHttpsConfResp)) + d.logger.Debug("sdk request 'cdn.ModifyDomainHttpsConf'", slog.String("params.domain", domain), slog.String("params.certId", cloudCertId), slog.Any("response", modifyDomainHttpsConfResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.ModifyDomainHttpsConf': %w", err) } diff --git a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go index 6f09d35be..e4754f2ff 100644 --- a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go +++ b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go @@ -85,7 +85,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep // 绑定空间域名证书 bindBucketCertResp, err := d.sdkClient.BindBucketCert(ctx, d.config.Domain, upres.CertId) - d.logger.Debug("sdk request 'kodo.BindCert'", slog.String("request.domain", d.config.Domain), slog.String("request.certId", upres.CertId), slog.Any("response", bindBucketCertResp)) + d.logger.Debug("sdk request 'kodo.BindCert'", slog.String("params.domain", d.config.Domain), slog.String("params.certId", upres.CertId), slog.Any("response", bindBucketCertResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'kodo.BindCert': %w", err) } diff --git a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go index 62ff2fb2d..208e5e021 100644 --- a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go +++ b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go @@ -96,7 +96,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep Domains: []string{d.config.Domain}, } rcdnInstanceSslBindResp, err := d.sdkClient.RcdnInstanceSslBindWithContext(ctx, d.config.InstanceId, rcdnInstanceSslBindReq) - d.logger.Debug("sdk request 'rcdn.InstanceSslBind'", slog.Int64("instanceId", d.config.InstanceId), slog.Any("request", rcdnInstanceSslBindReq), slog.Any("response", rcdnInstanceSslBindResp)) + d.logger.Debug("sdk request 'rcdn.InstanceSslBind'", slog.Int64("params.instanceId", d.config.InstanceId), slog.Any("request", rcdnInstanceSslBindReq), slog.Any("response", rcdnInstanceSslBindResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'rcdn.InstanceSslBind': %w", err) } diff --git a/pkg/core/deployer/providers/s3/s3.go b/pkg/core/deployer/providers/s3/s3.go index a3110a68e..2417f70d7 100644 --- a/pkg/core/deployer/providers/s3/s3.go +++ b/pkg/core/deployer/providers/s3/s3.go @@ -92,7 +92,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 - serverCertPEM, issuerCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) + serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { return nil, fmt.Errorf("failed to extract certs: %w", err) } @@ -129,7 +129,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep } if d.config.ObjectKeyForCrtOnlyIntermedia != "" { - if err := s3Client.PutObjectString(ctx, d.config.Bucket, d.config.ObjectKeyForCrtOnlyIntermedia, issuerCertPEM); err != nil { + if err := s3Client.PutObjectString(ctx, d.config.Bucket, d.config.ObjectKeyForCrtOnlyIntermedia, intermediaCertPEM); err != nil { return nil, fmt.Errorf("failed to upload intermedia certificate file: %w", err) } d.logger.Info("ssl intermedia certificate file uploaded", slog.String("bucket", d.config.Bucket), slog.String("object", d.config.ObjectKeyForCrtOnlyIntermedia)) diff --git a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go index e0609b7ab..7cfa0fd78 100644 --- a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go +++ b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go @@ -223,7 +223,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, cloudCertId string) error { // 获取域名证书配置 getHttpsServiceManagerResp, err := d.sdkClient.GetHttpsServiceManagerWithContext(ctx, domain) - d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("request.domain", domain), slog.Any("response", getHttpsServiceManagerResp)) + d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("params.domain", domain), slog.Any("response", getHttpsServiceManagerResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'console.GetHttpsServiceManager': %w", err) } diff --git a/pkg/core/deployer/providers/upyun-file/upyun_file.go b/pkg/core/deployer/providers/upyun-file/upyun_file.go index bf6ce7803..52af7c14a 100644 --- a/pkg/core/deployer/providers/upyun-file/upyun_file.go +++ b/pkg/core/deployer/providers/upyun-file/upyun_file.go @@ -84,7 +84,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep // 获取域名证书配置 getHttpsServiceManagerResp, err := d.sdkClient.GetHttpsServiceManagerWithContext(ctx, d.config.Domain) - d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("request.domain", d.config.Domain), slog.Any("response", getHttpsServiceManagerResp)) + d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("params.domain", d.config.Domain), slog.Any("response", getHttpsServiceManagerResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'console.GetHttpsServiceManager': %w", err) } diff --git a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go index fcd31c9d7..be8869338 100644 --- a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go +++ b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go @@ -89,7 +89,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep // 查询已部署加速域名的详情 getHostnameDetailResp, err := d.sdkClient.GetHostnameDetailWithContext(ctx, d.config.Domain) - d.logger.Debug("sdk request 'cdnpro.GetHostnameDetail'", slog.String("hostname", d.config.Domain), slog.Any("response", getHostnameDetailResp)) + d.logger.Debug("sdk request 'cdnpro.GetHostnameDetail'", slog.String("params.hostname", d.config.Domain), slog.Any("response", getHostnameDetailResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdnpro.GetHostnameDetail': %w", err) } @@ -146,7 +146,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep NewVersion: certificateNewVersionInfo, } updateCertificateResp, err := d.sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateCertificateReq) - d.logger.Debug("sdk request 'cdnpro.CreateCertificate'", slog.Any("certificateId", d.config.CertificateId), slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) + d.logger.Debug("sdk request 'cdnpro.UpdateCertificate'", slog.String("params.certificateId", d.config.CertificateId), slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdnpro.UpdateCertificate': %w", err) } @@ -198,7 +198,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep // REF: https://www.wangsu.com/document/api-doc/27038 if _, err := xwait.UntilWithContext(ctx, func(_ context.Context, _ int) (bool, error) { getDeploymentTaskDetailResp, err := d.sdkClient.GetDeploymentTaskDetailWithContext(ctx, wangsuTaskId) - d.logger.Info("sdk request 'cdnpro.GetDeploymentTaskDetail'", slog.Any("taskId", wangsuTaskId), slog.Any("response", getDeploymentTaskDetailResp)) + d.logger.Info("sdk request 'cdnpro.GetDeploymentTaskDetail'", slog.String("params.taskId", wangsuTaskId), slog.Any("response", getDeploymentTaskDetailResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'cdnpro.GetDeploymentTaskDetail': %w", err) }