From 151ecba59d9e504fd982e15e32ef037c2b5e8886 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 2 Jul 2026 16:28:49 +0800 Subject: [PATCH] chore: improve logging --- .../providers/ucloud-ussl/ucloud_ussl.go | 1 - .../providers/aliyun-alb/aliyun_alb.go | 2 +- .../providers/aliyun-clb/aliyun_clb.go | 4 +- .../deployer/providers/aliyun-ga/aliyun_ga.go | 4 +- .../providers/aliyun-waf/aliyun_waf.go | 6 ++- .../deployer/providers/aws-alb/aws_alb.go | 4 +- .../deployer/providers/aws-nlb/aws_nlb.go | 4 +- .../baiducloud-appblb/baiducloud_appblb.go | 2 +- .../baiducloud-blb/baiducloud_blb.go | 2 +- .../providers/byteplus-alb/byteplus_alb.go | 2 +- .../providers/cmcccloud-cdn/cmcccloud_cdn.go | 2 +- .../providers/cmcccloud-vlb/cmcccloud_vlb.go | 4 +- .../ctcccloud-faas/ctcccloud_faas.go | 3 +- .../nginxproxymanager/nginxproxymanager.go | 38 ++++++++++--------- .../tencentcloud-cdn/tencentcloud_cdn.go | 2 +- .../tencentcloud-cos/tencentcloud_cos.go | 2 +- .../tencentcloud-ecdn/tencentcloud_ecdn.go | 2 +- .../tencentcloud-eo/tencentcloud_eo.go | 34 ++++++++--------- .../providers/ucloud-ualb/ucloud_ualb.go | 4 +- .../providers/ucloud-uclb/ucloud_uclb.go | 2 +- .../volcengine-alb/volcengine_alb.go | 2 +- pkg/core/notifier/providers/matrix/matrix.go | 5 +-- 22 files changed, 67 insertions(+), 64 deletions(-) diff --git a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go index aeed37ab..f8f4f63d 100644 --- a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go +++ b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go @@ -208,7 +208,6 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) continue } default: - // 未知签名算法，跳过 continue } diff --git a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go index 9a0e649d..eb65e254 100644 --- a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -412,7 +412,7 @@ func (d *Deployer) updateListenerSniCertificate(ctx context.Context, cloudListen // 关联监听和扩展证书 // REF: https://help.aliyun.com/zh/slb/application-load-balancer/developer-reference/api-alb-2020-06-16-associateadditionalcertificateswithlistener if certificateIsAlreadyAssociated { - d.logger.Info("no need to add alb listener sni certificate") + d.logger.Info("no need to deploy alb listener sni certificate") return nil } else { if err := d.waitForListenerReady(ctx, cloudListenerId); err != nil { diff --git a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go index 824bb977..7d020b70 100644 --- a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -232,7 +232,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if tea.StringValue(describeLoadBalancerHTTPSListenerAttributeResp.Body.ServerCertificateId) == cloudCertId { - d.logger.Info("no need to update clb listener default certificate") + d.logger.Info("no need to deploy clb listener default certificate") return nil } return d.updateListenerDefaultCertificate(ctx, cloudLoadbalancerId, cloudListenerPort, cloudCertId) @@ -285,7 +285,7 @@ func (d *Deployer) updateListenerSniCertificate(ctx context.Context, cloudLoadba } if tea.StringValue(domainExtension.ServerCertificateId) == cloudCertId { - d.logger.Info("no need to add clb listener sni certificate") + d.logger.Info("no need to deploy clb listener sni certificate") continue } diff --git a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go index bcf36993..4a0a9e4d 100644 --- a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go +++ b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go @@ -247,7 +247,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if listenerDefaultCertificate != nil && tea.StringValue(listenerDefaultCertificate.CertificateId) == cloudCertId { - d.logger.Info("no need to update ga listener default certificate") + d.logger.Info("no need to deploy ga listener default certificate") return nil } return d.updateListenerDefaultCertificate(ctx, cloudListenerId, cloudCertId) @@ -256,7 +256,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat if lo.SomeBy(listenerAdditionalCertificates, func(item *aliga.ListListenerCertificatesResponseBodyCertificates) bool { return tea.StringValue(item.CertificateId) == cloudCertId }) { - d.logger.Info("no need to add ga listener sni certificate") + d.logger.Info("no need to deploy ga listener sni certificate") return nil } diff --git a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go index 55b07a4c..5140ddd0 100644 --- a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go +++ b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go @@ -215,10 +215,11 @@ func (d *Deployer) deployToWAF3WithCloudResource(ctx context.Context, cloudCertI // 未指定扩展域名，只需替换默认证书 const certAppliedTypeDefault = "default" - // 已部署过，直接跳过更新 + // 已部署过，直接返回 for _, certItem := range wafCloudResourceCertificates { if tea.StringValue(certItem.AppliedType) == certAppliedTypeDefault && tea.StringValue(certItem.CertificateId) == cloudCertId { + d.logger.Info("no need to deploy waf default certificate") return nil } } @@ -245,10 +246,11 @@ func (d *Deployer) deployToWAF3WithCloudResource(ctx context.Context, cloudCertI // 指定扩展域名，替换或新增扩展证书 const certAppliedTypeExtension = "extension" - // 已部署过，直接跳过更新 + // 已部署过，直接返回 for _, certItem := range wafCloudResourceCertificates { if tea.StringValue(certItem.AppliedType) == certAppliedTypeExtension && tea.StringValue(certItem.CertificateId) == cloudCertId { + d.logger.Info("no need to deploy waf extension certificate") return nil } } diff --git a/pkg/core/deployer/providers/aws-alb/aws_alb.go b/pkg/core/deployer/providers/aws-alb/aws_alb.go index db4001df..4d9e1296 100644 --- a/pkg/core/deployer/providers/aws-alb/aws_alb.go +++ b/pkg/core/deployer/providers/aws-alb/aws_alb.go @@ -155,7 +155,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep certArn := upres.ExtendedData["Arn"].(string) for _, certItem := range listenerInfo.Certificates { if aws.ToString(certItem.CertificateArn) == certArn && aws.ToBool(certItem.IsDefault) { - d.logger.Info("no need to update alb listener default certificate") + d.logger.Info("no need to deploy alb listener default certificate") return &DeployResult{}, nil } } @@ -167,7 +167,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep certArn := upres.ExtendedData["Arn"].(string) for _, certItem := range listenerInfo.Certificates { if aws.ToString(certItem.CertificateArn) == certArn && !aws.ToBool(certItem.IsDefault) { - d.logger.Info("no need to add alb listener sni certificate") + d.logger.Info("no need to deploy alb listener sni certificate") return &DeployResult{}, nil } } diff --git a/pkg/core/deployer/providers/aws-nlb/aws_nlb.go b/pkg/core/deployer/providers/aws-nlb/aws_nlb.go index e5f34042..e46ee9f5 100644 --- a/pkg/core/deployer/providers/aws-nlb/aws_nlb.go +++ b/pkg/core/deployer/providers/aws-nlb/aws_nlb.go @@ -155,7 +155,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep certArn := upres.ExtendedData["Arn"].(string) for _, certItem := range listenerInfo.Certificates { if aws.ToString(certItem.CertificateArn) == certArn && aws.ToBool(certItem.IsDefault) { - d.logger.Info("no need to update nlb listener default certificate") + d.logger.Info("no need to deploy nlb listener default certificate") return &DeployResult{}, nil } } @@ -167,7 +167,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep certArn := upres.ExtendedData["Arn"].(string) for _, certItem := range listenerInfo.Certificates { if aws.ToString(certItem.CertificateArn) == certArn && !aws.ToBool(certItem.IsDefault) { - d.logger.Info("no need to add nlb listener sni certificate") + d.logger.Info("no need to deploy nlb listener sni certificate") return &DeployResult{}, nil } } diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index 16037d75..f61a1d08 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -269,7 +269,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudLoad if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if lo.SomeBy(listenerInfo.CertIds, func(item string) bool { return item == cloudCertId }) { - d.logger.Info("no need to update appblb listener default certificate") + d.logger.Info("no need to deploy appblb listener default certificate") return nil } return d.updateHttpsListenerDefaultCertificate(ctx, cloudLoadbalancerId, &listenerInfo, cloudCertId) diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index a1074124..54e973b1 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -269,7 +269,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudLoad if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if lo.SomeBy(listenerInfo.CertIds, func(item string) bool { return item == cloudCertId }) { - d.logger.Info("no need to update blb listener default certificate") + d.logger.Info("no need to deploy blb listener default certificate") return nil } return d.updateHttpsListenerDefaultCertificate(ctx, cloudLoadbalancerId, &listenerInfo, cloudCertId) diff --git a/pkg/core/deployer/providers/byteplus-alb/byteplus_alb.go b/pkg/core/deployer/providers/byteplus-alb/byteplus_alb.go index 19b16543..ca318d57 100644 --- a/pkg/core/deployer/providers/byteplus-alb/byteplus_alb.go +++ b/pkg/core/deployer/providers/byteplus-alb/byteplus_alb.go @@ -220,7 +220,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if bp.StringValue(describeListenerAttributesResp.CertificateId) == cloudCertId { - d.logger.Info("no need to update alb listener default certificate") + d.logger.Info("no need to deploy alb listener default certificate") return nil } return d.updateListenerDefaultCertificate(ctx, *describeListenerAttributesResp, cloudCertId) diff --git a/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn.go b/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn.go index ef7c757f..565c1b8b 100644 --- a/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn.go +++ b/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn.go @@ -247,7 +247,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId in return fmt.Errorf("failed to execute sdk request 'ecdn.DescribeCdnCertificateDetail': %w", err) } else { if xcert.EqualCertificatesFromPEM(certPEM, lo.FromPtr(describeCdnCertificateDetailResp.Body.Certificate)) { - d.logger.Info("no need to update cdn certificate") + d.logger.Info("no need to deploy cdn certificate") return nil } } diff --git a/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb.go b/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb.go index 052ec5af..d866d735 100644 --- a/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb.go +++ b/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb.go @@ -254,14 +254,14 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI if d.config.Domain == "" { // 未指定 SNI，只需部署到默认证书 if lo.FromPtr(listenerInfo.DefaultTlsContainerId) == cloudCertId { - d.logger.Info("no need to update vlb default certificate") + d.logger.Info("no need to deploy vlb default certificate") return nil } return d.updateListenerDefaultCertificate(ctx, *listenerInfo, cloudCertId) } else { // 指定 SNI，需部署到 SNI 证书 if lo.Contains(listenerInfo.SniContainerIdList, cloudCertId) { - d.logger.Info("no need to update vlb sni certificate") + d.logger.Info("no need to deploy vlb sni certificate") return nil } return d.updateListenerSniCertificate(ctx, *listenerInfo, cloudCertId) diff --git a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go index f8d51a99..8be34e19 100644 --- a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go +++ b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go @@ -86,10 +86,11 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep } else { faasCustomDomain = getCustomDomainResp.ReturnObj - // 已部署过此域名，跳过 + // 已部署过，直接返回 if faasCustomDomain.CertConfig != nil && faasCustomDomain.CertConfig.Certificate == certPEM && faasCustomDomain.CertConfig.PrivateKey == privkeyPEM { + d.logger.Info("no need to deploy faas custom domain certificate") return &DeployResult{}, nil } } diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go index 6832203e..1cf7d190 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go @@ -138,6 +138,12 @@ func (d *Deployer) deployToHost(ctx context.Context, certPEM, privkeyPEM string) d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } + // 获取全部可部署的主机列表 + hostsByType, err := d.getAllHosts(ctx, d.config.HostType) + if err != nil { + return err + } + // 获取待部署的主机列表 var hostIds []int64 switch d.config.HostMatchPattern { @@ -152,11 +158,7 @@ func (d *Deployer) deployToHost(ctx context.Context, certPEM, privkeyPEM string) case HOST_MATCH_PATTERN_CERTSAN: { - hostCandidates, err := d.getAllHosts(ctx, d.config.HostType) - if err != nil { - return err - } - + hostCandidates := hostsByType hostIds = lo.Map( lo.Filter(hostCandidates, func(hostItem *npmsdk.Host, _ int) bool { return len(hostItem.DomainNames) > 0 && @@ -171,18 +173,6 @@ func (d *Deployer) deployToHost(ctx context.Context, certPEM, privkeyPEM string) if len(hostIds) == 0 { return fmt.Errorf("could not find any hosts matched by certificate") } - - // 跳过已部署过的主机 - hostIds = lo.Filter(hostIds, func(hostId int64, _ int) bool { - hostInfo, _ := lo.Find(hostCandidates, func(hostItem *npmsdk.Host) bool { - return hostId == hostItem.Id - }) - if hostInfo != nil { - return strconv.FormatInt(hostInfo.CertificateId, 10) != upres.CertId - } - - return true - }) } default: @@ -194,9 +184,21 @@ func (d *Deployer) deployToHost(ctx context.Context, certPEM, privkeyPEM string) d.logger.Info("no hosts to deploy") } else { d.logger.Info("found hosts to deploy", slog.Any("hostIds", hostIds)) - var errs []error + // 跳过已部署过的主机 certId, _ := strconv.ParseInt(upres.CertId, 10, 64) + hostIds = lo.Filter(hostIds, func(hostId int64, _ int) bool { + hostInfo, _ := lo.Find(hostsByType, func(hostItem *npmsdk.Host) bool { + return hostId == hostItem.Id + }) + if hostInfo != nil { + return hostInfo.CertificateId != certId + } + + return true + }) + + var errs []error for i, hostId := range hostIds { select { case <-ctx.Done(): diff --git a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index deb967da..50f356d3 100644 --- a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -264,7 +264,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c domainConfig.Https.CertInfo != nil && domainConfig.Https.CertInfo.CertId != nil && *domainConfig.Https.CertInfo.CertId == cloudCertId { - // 已部署过此域名，跳过 + // 已部署过，直接返回 return nil } diff --git a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go index 651f34b1..1f7e2236 100644 --- a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go +++ b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go @@ -105,7 +105,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep // 避免多次部署，否则会报错 https://github.com/certimate-go/certimate/issues/897#issuecomment-3182904098 if bind, _ := d.checkIsBind(ctx, upres.CertId); bind { - d.logger.Info("no need to update cos custom domain certificate") + d.logger.Info("no need to deploy cos custom domain certificate") return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index 2fa73006..ea0858d5 100644 --- a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -261,7 +261,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c domainConfig := describeDomainsConfigResp.Response.Domains[0] if domainConfig.Https != nil && domainConfig.Https.CertInfo != nil && domainConfig.Https.CertInfo.CertId != nil && *domainConfig.Https.CertInfo.CertId == cloudCertId { - // 已部署过此域名，跳过 + // 已部署过，直接返回 return nil } diff --git a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go index c4f38fdd..1a2a6f4a 100644 --- a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -109,7 +109,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 获取全部可部署的域名信息 + // 获取全部可部署的域名列表 domainsInZone, err := d.getAllDomainsInZone(ctx, d.config.ZoneId) if err != nil { return nil, err @@ -166,28 +166,28 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep return nil, fmt.Errorf("unsupported domain match pattern: '%s'", d.config.DomainMatchPattern) } - // 跳过已部署过的域名 - domains = lo.Filter(domains, func(domain string, _ int) bool { - var deployed bool - - domainInfo, _ := lo.Find(domainsInZone, func(domainInfo *tceo.AccelerationDomain) bool { - return domain == lo.FromPtr(domainInfo.DomainName) - }) - if domainInfo != nil && domainInfo.Certificate != nil { - deployed = lo.SomeBy(domainInfo.Certificate.List, func(certInfo *tceo.CertificateInfo) bool { - return upres.CertId == lo.FromPtr(certInfo.CertId) - }) - } - - return !deployed - }) - // 批量更新域名证书 if len(domains) == 0 { d.logger.Info("no edgeone domains to deploy") } else { d.logger.Info("found edgeone domains to deploy", slog.Any("domains", domains)) + // 跳过已部署过的域名 + domains = lo.Filter(domains, func(domain string, _ int) bool { + var deployed bool + + domainInfo, _ := lo.Find(domainsInZone, func(domainInfo *tceo.AccelerationDomain) bool { + return domain == lo.FromPtr(domainInfo.DomainName) + }) + if domainInfo != nil && domainInfo.Certificate != nil { + deployed = lo.SomeBy(domainInfo.Certificate.List, func(certInfo *tceo.CertificateInfo) bool { + return upres.CertId == lo.FromPtr(certInfo.CertId) + }) + } + + return !deployed + }) + // 配置域名证书 // REF: https://cloud.tencent.com/document/api/1552/80764 modifyHostsCertificateReqs := make([]*tceo.ModifyHostsCertificateRequest, 0) diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go index e24c1e0c..beeab932 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go +++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go @@ -223,14 +223,14 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if lo.SomeBy(listenerInfo.Certificates, func(item ulb.Certificate) bool { return item.SSLId == cloudCertId && item.IsDefault }) { - d.logger.Info("no need to update alb listener default certificate") + d.logger.Info("no need to deploy alb listener default certificate") return nil } return d.updateListenerDefaultCertificate(ctx, cloudLoadbalancerId, cloudListenerId, cloudCertId) } else { // 指定 SNI，需部署到扩展域名 if lo.SomeBy(listenerInfo.Certificates, func(item ulb.Certificate) bool { return item.SSLId == cloudCertId && !item.IsDefault }) { - d.logger.Info("no need to add alb listener sni certificate") + d.logger.Info("no need to deploy alb listener sni certificate") return nil } return d.updateListenerSniCertificate(ctx, cloudLoadbalancerId, listenerInfo, cloudCertId) diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go index 9b2b67e4..6906dc56 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go +++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go @@ -222,7 +222,7 @@ func (d *Deployer) updateVServerCertificate(ctx context.Context, cloudLoadbalanc return fmt.Errorf("could not find uclb vserver '%s'", cloudVServerId) } - // 跳过已部署过的 VServer + // 已部署过，直接返回 vserverInfo := describeVServerResp.DataSet[0] if lo.SomeBy(vserverInfo.SSLSet, func(item ulb.ULBSSLSet) bool { return item.SSLId == cloudCertId }) { return nil diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go index 2b9e3c31..5a79e878 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go @@ -223,7 +223,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 if ve.StringValue(describeListenerAttributesResp.CertificateId) == cloudCertId { - d.logger.Info("no need to update alb listener default certificate") + d.logger.Info("no need to deploy alb listener default certificate") return nil } return d.updateListenerDefaultCertificate(ctx, *describeListenerAttributesResp, cloudCertId) diff --git a/pkg/core/notifier/providers/matrix/matrix.go b/pkg/core/notifier/providers/matrix/matrix.go index 7e168108..cdbe2342 100644 --- a/pkg/core/notifier/providers/matrix/matrix.go +++ b/pkg/core/notifier/providers/matrix/matrix.go @@ -2,7 +2,6 @@ package matrix import ( "context" - "errors" "fmt" "log/slog" @@ -34,7 +33,7 @@ var _ notifier.Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { - return nil, errors.New("the configuration of the notifier provider is nil") + return nil, fmt.Errorf("the configuration of the notifier provider is nil") } return &Notifier{ @@ -53,7 +52,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { if n.config.RoomId == "" { - return nil, errors.New("matrix: config `roomId` is required") + return nil, fmt.Errorf("matrix: config `roomId` is required") } client, err := matrixsdk.NewClient(n.config.ServerUrl,