From c13a7a7873f9b0f3ee903045ed8a1b2c5d6af0bc Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sun, 16 Mar 2025 18:43:54 +0800 Subject: [PATCH 01/23] feat: logging --- internal/pkg/logging/handler.go | 188 ++++++++++++++++++++++++++++++++ internal/pkg/logging/level.go | 31 ++++++ internal/pkg/logging/record.go | 14 +++ 3 files changed, 233 insertions(+) create mode 100644 internal/pkg/logging/handler.go create mode 100644 internal/pkg/logging/level.go create mode 100644 internal/pkg/logging/record.go diff --git a/internal/pkg/logging/handler.go b/internal/pkg/logging/handler.go new file mode 100644 index 00000000..5e932d1f --- /dev/null +++ b/internal/pkg/logging/handler.go @@ -0,0 +1,188 @@ +package logging + +import ( + "context" + "fmt" + "log/slog" + "sync" + + types "github.com/pocketbase/pocketbase/tools/types" +) + +type HookHandlerOptions struct { + Level slog.Leveler + WriteFunc func(ctx context.Context, record *Record) error +} + +var _ slog.Handler = (*HookHandler)(nil) + +type HookHandler struct { + mutex *sync.Mutex + parent *HookHandler + options *HookHandlerOptions + group string + attrs []slog.Attr +} + +func NewHookHandler(options HookHandlerOptions) *HookHandler { + h := &HookHandler{ + mutex: &sync.Mutex{}, + options: &options, + } + + if h.options.WriteFunc == nil { + panic("`options.WriteFunc` is nil") + } + + if h.options.Level == nil { + h.options.Level = slog.LevelInfo + } + + return h +} + +func (h *HookHandler) Enabled(ctx context.Context, level slog.Level) bool { + return level >= h.options.Level.Level() +} + +func (h *HookHandler) WithGroup(name string) slog.Handler { + if name == "" { + return h + } + + return &HookHandler{ + parent: h, + mutex: h.mutex, + options: h.options, + group: name, + } +} + +func (h *HookHandler) WithAttrs(attrs []slog.Attr) slog.Handler { + if len(attrs) == 0 { + return h + } + + return &HookHandler{ + parent: h, + mutex: h.mutex, + options: h.options, + attrs: attrs, + } +} + +func (h *HookHandler) Handle(ctx context.Context, r slog.Record) error { + if h.group != "" { + h.mutex.Lock() + attrs := make([]any, 0, len(h.attrs)+r.NumAttrs()) + for _, a := range h.attrs { + attrs = append(attrs, a) + } + h.mutex.Unlock() + + r.Attrs(func(a slog.Attr) bool { + attrs = append(attrs, a) + return true + }) + + r = slog.NewRecord(r.Time, r.Level, r.Message, r.PC) + r.AddAttrs(slog.Group(h.group, attrs...)) + } else if len(h.attrs) > 0 { + r = r.Clone() + + h.mutex.Lock() + r.AddAttrs(h.attrs...) + h.mutex.Unlock() + } + + if h.parent != nil { + return h.parent.Handle(ctx, r) + } + + data := make(map[string]any, r.NumAttrs()) + + r.Attrs(func(a slog.Attr) bool { + if err := h.resolveAttr(data, a); err != nil { + return false + } + return true + }) + + log := &Record{ + Time: r.Time, + Message: r.Message, + Data: types.JSONMap[any](data), + } + switch r.Level { + case slog.LevelDebug: + log.Level = LevelDebug + case slog.LevelInfo: + log.Level = LevelInfo + case slog.LevelWarn: + log.Level = LevelWarn + case slog.LevelError: + log.Level = LevelError + default: + log.Level = Level(fmt.Sprintf("LV(%d)", r.Level)) + } + + if err := h.writeRecord(ctx, log); err != nil { + return err + } + + return nil +} + +func (h *HookHandler) SetLevel(level slog.Level) { + h.mutex.Lock() + h.options.Level = level + h.mutex.Unlock() +} + +func (h *HookHandler) writeRecord(ctx context.Context, r *Record) error { + if h.parent != nil { + return h.parent.writeRecord(ctx, r) + } + + return h.options.WriteFunc(ctx, r) +} + +func (h *HookHandler) resolveAttr(data map[string]any, attr slog.Attr) error { + attr.Value = attr.Value.Resolve() + + if attr.Equal(slog.Attr{}) { + return nil + } + + switch attr.Value.Kind() { + case slog.KindGroup: + { + attrs := attr.Value.Group() + if len(attrs) == 0 { + return nil + } + + groupData := make(map[string]any, len(attrs)) + + for _, subAttr := range attrs { + h.resolveAttr(groupData, subAttr) + } + + if len(groupData) > 0 { + data[attr.Key] = groupData + } + } + + default: + { + switch v := attr.Value.Any().(type) { + case error: + data[attr.Key] = v.Error() + default: + data[attr.Key] = v + } + } + } + + return nil +} diff --git a/internal/pkg/logging/level.go b/internal/pkg/logging/level.go new file mode 100644 index 00000000..2af1c2f4 --- /dev/null +++ b/internal/pkg/logging/level.go @@ -0,0 +1,31 @@ +package logging + +import "log/slog" + +type Level string + +const ( + LevelDebug Level = "DEBUG" + LevelInfo Level = "INFO" + LevelWarn Level = "WARN" + LevelError Level = "ERROR" +) + +func (l Level) String() string { + return string(l) +} + +func (l Level) Level() slog.Level { + switch l { + case LevelDebug: + return slog.LevelDebug + case LevelInfo: + return slog.LevelInfo + case LevelWarn: + return slog.LevelWarn + case LevelError: + return slog.LevelError + default: + return slog.Level(-1) + } +} diff --git a/internal/pkg/logging/record.go b/internal/pkg/logging/record.go new file mode 100644 index 00000000..9980489b --- /dev/null +++ b/internal/pkg/logging/record.go @@ -0,0 +1,14 @@ +package logging + +import ( + "time" + + types "github.com/pocketbase/pocketbase/tools/types" +) + +type Record struct { + Time time.Time + Level Level + Message string + Data types.JSONMap[any] +} From b620052b88fd91c0187a20898de31a46a281213a Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 17 Mar 2025 13:24:42 +0800 Subject: [PATCH 02/23] feat: adapt new logging to uploader, deployer and notifier providers --- internal/deployer/deployer.go | 6 +- internal/pkg/core/deployer/deployer.go | 7 +- .../1panel-console/1panel_console.go | 17 ++-- .../providers/1panel-site/1panel_site.go | 23 +++-- .../providers/aliyun-alb/aliyun_alb.go | 48 +++++----- .../aliyun-cas-deploy/aliyun_cas_deploy.go | 29 +++--- .../providers/aliyun-cdn/aliyun_cdn.go | 17 ++-- .../providers/aliyun-clb/aliyun_clb.go | 40 ++++---- .../providers/aliyun-dcdn/aliyun_dcdn.go | 17 ++-- .../providers/aliyun-esa/aliyun_esa.go | 22 +++-- .../providers/aliyun-esa/aliyun_esa_test.go | 2 +- .../deployer/providers/aliyun-fc/aliyun_fc.go | 26 ++--- .../providers/aliyun-fc/aliyun_fc_test.go | 10 +- .../providers/aliyun-live/aliyun_live.go | 17 ++-- .../providers/aliyun-nlb/aliyun_nlb.go | 34 +++---- .../providers/aliyun-oss/aliyun_oss.go | 20 ++-- .../providers/aliyun-vod/aliyun_vod.go | 17 ++-- .../providers/aliyun-waf/aliyun_waf.go | 39 +++++--- .../aws-cloudfront/aws_cloudfront.go | 25 ++--- .../baiducloud-cdn/baiducloud_cdn.go | 17 ++-- .../providers/baishan-cdn/baishan_cdn.go | 23 ++--- .../baotapanel-console/baotapanel_console.go | 20 ++-- .../baotapanel-site/baotapanel_site.go | 23 ++--- .../providers/byteplus-cdn/byteplus_cdn.go | 25 +++-- .../deployer/providers/cachefly/cachefly.go | 17 ++-- .../core/deployer/providers/cdnfly/cdnfly.go | 26 ++--- .../providers/dogecloud-cdn/dogecloud_cdn.go | 22 +++-- .../edgio-applications/edgio_applications.go | 17 ++-- .../deployer/providers/gcore-cdn/gcore_cdn.go | 23 +++-- .../huaweicloud-cdn/huaweicloud_cdn.go | 25 ++--- .../huaweicloud-elb/huaweicloud_elb.go | 47 +++++----- .../huaweicloud-waf/huaweicloud_waf.go | 35 +++---- .../providers/jdcloud-alb/jdcloud_alb.go | 34 +++---- .../providers/jdcloud-cdn/jdcloud_cdn.go | 23 +++-- .../providers/jdcloud-live/jdcloud_live.go | 17 ++-- .../providers/jdcloud-vod/jdcloud_vod.go | 21 +++-- .../providers/k8s-secret/k8s_secret.go | 23 +++-- .../core/deployer/providers/local/local.go | 40 ++++---- .../deployer/providers/qiniu-cdn/qiniu_cdn.go | 28 +++--- .../providers/qiniu-pili/qiniu_pili.go | 22 +++-- .../deployer/providers/safeline/safeline.go | 17 ++-- .../pkg/core/deployer/providers/ssh/ssh.go | 42 ++++----- .../tencentcloud-cdn/tencentcloud_cdn.go | 28 ++++-- .../tencentcloud-clb/tencentcloud_clb.go | 40 ++++---- .../tencentcloud-cos/tencentcloud_cos.go | 22 +++-- .../tencentcloud-css/tencentcloud_css.go | 22 +++-- .../tencentcloud-ecdn/tencentcloud_ecdn.go | 27 ++++-- .../tencentcloud-eo/tencentcloud_eo.go | 22 +++-- .../tencentcloud-scf/tencentcloud_scf.go | 23 +++-- .../tencentcloud_ssl_deploy.go | 28 +++--- .../tencentcloud-vod/tencentcloud_vod.go | 20 ++-- .../tencentcloud-waf/tencentcloud_waf.go | 23 +++-- .../providers/ucloud-ucdn/ucloud_ucdn.go | 25 ++--- .../providers/ucloud-us3/ucloud_us3.go | 24 +++-- .../volcengine-cdn/volcengine_cdn.go | 25 +++-- .../volcengine-clb/volcengine_clb.go | 22 +++-- .../volcengine-dcdn/volcengine_dcdn.go | 22 +++-- .../volcengine-imagex/volcengine_imagex.go | 23 +++-- .../volcengine-live/volcengine_live.go | 26 ++--- .../volcengine-tos/volcengine_tos.go | 22 +++-- .../deployer/providers/webhook/webhook.go | 20 ++-- internal/pkg/core/logger/builtin.go | 94 ------------------- internal/pkg/core/logger/logger.go | 27 ------ internal/pkg/core/logger/logger_test.go | 56 ----------- internal/pkg/core/notifier/notifier.go | 7 +- .../pkg/core/notifier/providers/bark/bark.go | 11 +++ .../notifier/providers/dingtalk/dingtalk.go | 11 +++ .../core/notifier/providers/email/email.go | 11 +++ .../pkg/core/notifier/providers/lark/lark.go | 11 +++ .../providers/serverchan/serverchan.go | 11 +++ .../notifier/providers/telegram/telegram.go | 11 +++ .../notifier/providers/webhook/webhook.go | 11 +++ .../core/notifier/providers/wecom/wecom.go | 11 +++ .../providers/1panel-ssl/1panel_ssl.go | 17 +++- .../providers/aliyun-cas/aliyun_cas.go | 42 ++++++--- .../providers/aliyun-slb/aliyun_slb.go | 39 +++++--- .../uploader/providers/aws-acm/aws_acm.go | 37 +++++--- .../azure-keyvault/azure_keyvault.go | 15 +++ .../providers/byteplus-cdn/byteplus_cdn.go | 37 +++++--- .../uploader/providers/dogecloud/dogecloud.go | 26 +++-- .../uploader/providers/gcore-cdn/gcore_cdn.go | 13 +++ .../huaweicloud-elb/huaweicloud_elb.go | 61 +++++++----- .../huaweicloud-scm/huaweicloud_scm.go | 48 ++++++---- .../huaweicloud-waf/huaweicloud_waf.go | 62 +++++++----- .../providers/jdcloud-ssl/jdcloud_ssl.go | 35 +++++-- .../providers/qiniu-sslcert/qiniu_sslcert.go | 26 +++-- .../tencentcloud-ssl/tencentcloud_ssl.go | 28 ++++-- .../providers/ucloud-ussl/ucloud_ussl.go | 61 +++++++----- .../volcengine-cdn/volcengine_cdn.go | 27 ++++-- .../volcengine_certcenter.go | 29 ++++-- .../volcengine-live/volcengine_live.go | 32 +++++-- internal/pkg/core/uploader/uploader.go | 7 +- 92 files changed, 1358 insertions(+), 1023 deletions(-) delete mode 100644 internal/pkg/core/logger/builtin.go delete mode 100644 internal/pkg/core/logger/logger.go delete mode 100644 internal/pkg/core/logger/logger_test.go diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index f95442a6..1fc1925f 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -3,10 +3,10 @@ package deployer import ( "context" "fmt" + "log/slog" "github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/repository" ) @@ -52,7 +52,7 @@ func NewWithDeployNode(node *domain.WorkflowNode, certdata struct { } return &proxyDeployer{ - logger: logger.NewNilLogger(), + logger: slog.Default(), deployer: deployer, deployCertificate: certdata.Certificate, deployPrivateKey: certdata.PrivateKey, @@ -61,7 +61,7 @@ func NewWithDeployNode(node *domain.WorkflowNode, certdata struct { // TODO: 暂时使用代理模式以兼容之前版本代码，后续重新实现此处逻辑 type proxyDeployer struct { - logger logger.Logger + logger *slog.Logger deployer deployer.Deployer deployCertificate string deployPrivateKey string diff --git a/internal/pkg/core/deployer/deployer.go b/internal/pkg/core/deployer/deployer.go index 78d7c7de..54b206bd 100644 --- a/internal/pkg/core/deployer/deployer.go +++ b/internal/pkg/core/deployer/deployer.go @@ -1,10 +1,15 @@ package deployer -import "context" +import ( + "context" + "log/slog" +) // 表示定义证书部署器的抽象类型接口。 // 注意与 `Uploader` 区分，“部署”通常为“上传”的后置操作。 type Deployer interface { + WithLogger(logger *slog.Logger) Deployer + // 部署证书。 // // 入参： diff --git a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go index 512b5296..91143aa6 100644 --- a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go +++ b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go @@ -4,12 +4,12 @@ import ( "context" "crypto/tls" "errors" + "log/slog" "net/url" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" opsdk "github.com/usual2970/certimate/internal/pkg/vendors/1panel-sdk" ) @@ -26,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *opsdk.Client } @@ -44,13 +44,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -68,10 +72,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe updateSystemSSLReq.AutoRestart = "false" } updateSystemSSLResp, err := d.sdkClient.UpdateSystemSSL(updateSystemSSLReq) + d.logger.Debug("sdk request '1panel.UpdateSystemSSL'", slog.Any("request", updateSystemSSLReq), slog.Any("response", updateSystemSSLResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.UpdateSystemSSL'") - } else { - d.logger.Logt("已设置面板 SSL 证书", updateSystemSSLResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go b/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go index cdad354a..6aa34607 100644 --- a/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go +++ b/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go @@ -4,13 +4,13 @@ import ( "context" "crypto/tls" "errors" + "log/slog" "net/url" "strconv" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/1panel-ssl" opsdk "github.com/usual2970/certimate/internal/pkg/vendors/1panel-sdk" @@ -29,7 +29,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *opsdk.Client sslUploader uploader.Uploader } @@ -56,14 +56,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -73,10 +78,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe WebsiteID: d.config.WebsiteId, } getHttpsConfResp, err := d.sdkClient.GetHttpsConf(getHttpsConfReq) + d.logger.Debug("sdk request '1panel.GetHttpsConf'", slog.Any("request", getHttpsConfReq), slog.Any("response", getHttpsConfResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.GetHttpsConf'") - } else { - d.logger.Logt("已获取网站 HTTPS 配置", getHttpsConfResp) } // 上传证书到面板 @@ -84,7 +88,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 修改网站 HTTPS 配置 @@ -100,10 +104,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Hsts: getHttpsConfResp.Data.Hsts, } updateHttpsConfResp, err := d.sdkClient.UpdateHttpsConf(updateHttpsConfReq) + d.logger.Debug("sdk request '1panel.UpdateHttpsConf'", slog.Any("request", updateHttpsConfReq), slog.Any("response", updateHttpsConfResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.UpdateHttpsConf'") - } else { - d.logger.Logt("已获取网站 HTTPS 配置", updateHttpsConfResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go b/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go index 8c25bc25..ae088602 100644 --- a/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strconv" "strings" "time" @@ -16,7 +17,6 @@ import ( "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -43,7 +43,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -72,14 +72,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClients: clients, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -88,10 +93,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_LOADBALANCER: @@ -122,12 +127,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId LoadBalancerId: tea.String(d.config.LoadbalancerId), } getLoadBalancerAttributeResp, err := d.sdkClients.alb.GetLoadBalancerAttribute(getLoadBalancerAttributeReq) + d.logger.Debug("sdk request 'alb.GetLoadBalancerAttribute'", slog.Any("request", getLoadBalancerAttributeReq), slog.Any("response", getLoadBalancerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.GetLoadBalancerAttribute'") } - d.logger.Logt("已查询到 ALB 负载均衡实例", getLoadBalancerAttributeResp) - // 查询 HTTPS 监听列表 // REF: https://help.aliyun.com/zh/slb/application-load-balancer/developer-reference/api-alb-2020-06-16-listlisteners listenerIds := make([]string, 0) @@ -141,6 +145,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId ListenerProtocol: tea.String("HTTPS"), } listListenersResp, err := d.sdkClients.alb.ListListeners(listListenersReq) + d.logger.Debug("sdk request 'alb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.ListListeners'") } @@ -158,8 +163,6 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId } } - d.logger.Logt("已查询到 ALB 负载均衡实例下的全部 HTTPS 监听", listenerIds) - // 查询 QUIC 监听列表 // REF: https://help.aliyun.com/zh/slb/application-load-balancer/developer-reference/api-alb-2020-06-16-listlisteners listListenersToken = nil @@ -171,6 +174,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId ListenerProtocol: tea.String("QUIC"), } listListenersResp, err := d.sdkClients.alb.ListListeners(listListenersReq) + d.logger.Debug("sdk request 'alb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.ListListeners'") } @@ -188,13 +192,12 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId } } - d.logger.Logt("已查询到 ALB 负载均衡实例下的全部 QUIC 监听", listenerIds) - // 遍历更新监听证书 if len(listenerIds) == 0 { - return errors.New("listener not found") + d.logger.Info("no alb listeners to deploy") } else { var errs []error + d.logger.Info("found https/quic listeners to deploy", slog.Any("listenerIds", listenerIds)) for _, listenerId := range listenerIds { if err := d.updateListenerCertificate(ctx, listenerId, cloudCertId); err != nil { @@ -230,12 +233,11 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL ListenerId: tea.String(cloudListenerId), } getListenerAttributeResp, err := d.sdkClients.alb.GetListenerAttribute(getListenerAttributeReq) + d.logger.Debug("sdk request 'alb.GetListenerAttribute'", slog.Any("request", getListenerAttributeReq), slog.Any("response", getListenerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.GetListenerAttribute'") } - d.logger.Logt("已查询到 ALB 监听配置", getListenerAttributeResp) - if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 @@ -248,11 +250,10 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL }}, } updateListenerAttributeResp, err := d.sdkClients.alb.UpdateListenerAttribute(updateListenerAttributeReq) + d.logger.Debug("sdk request 'alb.UpdateListenerAttribute'", slog.Any("request", updateListenerAttributeReq), slog.Any("response", updateListenerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.UpdateListenerAttribute'") } - - d.logger.Logt("已更新 ALB 监听配置", updateListenerAttributeResp) } else { // 指定 SNI，需部署到扩展域名 @@ -269,6 +270,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL CertificateType: tea.String("Server"), } listListenerCertificatesResp, err := d.sdkClients.alb.ListListenerCertificates(listListenerCertificatesReq) + d.logger.Debug("sdk request 'alb.ListListenerCertificates'", slog.Any("request", listListenerCertificatesReq), slog.Any("response", listListenerCertificatesResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.ListListenerCertificates'") } @@ -286,14 +288,13 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL } } - d.logger.Logt("已查询到 ALB 监听下全部证书", listenerCertificates) - // 遍历查询监听证书，并找出需要解除关联的证书 // REF: https://help.aliyun.com/zh/slb/application-load-balancer/developer-reference/api-alb-2020-06-16-listlistenercertificates // REF: https://help.aliyun.com/zh/ssl-certificate/developer-reference/api-cas-2020-04-07-getusercertificatedetail certificateIsAssociated := false certificateIdsExpired := make([]string, 0) if len(listenerCertificates) > 0 { + d.logger.Info("found listener certificates to deploy", slog.Any("listenerCertificates", listenerCertificates)) var errs []error for _, listenerCertificate := range listenerCertificates { @@ -318,6 +319,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL CertId: tea.Int64(certificateIdAsInt64), } getUserCertificateDetailResp, err := d.sdkClients.cas.GetUserCertificateDetail(getUserCertificateDetailReq) + d.logger.Debug("sdk request 'cas.GetUserCertificateDetail'", slog.Any("request", getUserCertificateDetailReq), slog.Any("response", getUserCertificateDetailResp)) if err != nil { errs = append(errs, xerrors.Wrap(err, "failed to execute sdk request 'cas.GetUserCertificateDetail'")) continue @@ -354,11 +356,10 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL }, } associateAdditionalCertificatesFromListenerResp, err := d.sdkClients.alb.AssociateAdditionalCertificatesWithListener(associateAdditionalCertificatesFromListenerReq) + d.logger.Debug("sdk request 'alb.AssociateAdditionalCertificatesWithListener'", slog.Any("request", associateAdditionalCertificatesFromListenerReq), slog.Any("response", associateAdditionalCertificatesFromListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.AssociateAdditionalCertificatesWithListener'") } - - d.logger.Logt("已关联 ALB 监听和扩展证书", associateAdditionalCertificatesFromListenerResp) } // 解除关联监听和扩展证书 @@ -376,11 +377,10 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL Certificates: dissociateAdditionalCertificates, } dissociateAdditionalCertificatesFromListenerResp, err := d.sdkClients.alb.DissociateAdditionalCertificatesFromListener(dissociateAdditionalCertificatesFromListenerReq) + d.logger.Debug("sdk request 'alb.DissociateAdditionalCertificatesFromListener'", slog.Any("request", dissociateAdditionalCertificatesFromListenerReq), slog.Any("response", dissociateAdditionalCertificatesFromListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'alb.DissociateAdditionalCertificatesFromListener'") } - - d.logger.Logt("已解除关联 ALB 监听和扩展证书", dissociateAdditionalCertificatesFromListenerResp) } } diff --git a/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go b/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go index fa045521..4a95e5ad 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go +++ b/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strings" "time" @@ -13,7 +14,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -34,7 +34,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunCas.Client sslUploader uploader.Uploader } @@ -58,14 +58,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -78,10 +83,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - contactIds := d.config.ContactIds if len(contactIds) == 0 { // 获取联系人列表 @@ -90,6 +95,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe listContactReq.ShowSize = tea.Int32(1) listContactReq.CurrentPage = tea.Int32(1) listContactResp, err := d.sdkClient.ListContact(listContactReq) + d.logger.Debug("sdk request 'cas.ListContact'", slog.Any("request", listContactReq), slog.Any("response", listContactResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.ListContact'") } @@ -109,12 +115,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe ContactIds: tea.String(strings.Join(contactIds, ",")), } createDeploymentJobResp, err := d.sdkClient.CreateDeploymentJob(createDeploymentJobReq) + d.logger.Debug("sdk request 'cas.CreateDeploymentJob'", slog.Any("request", createDeploymentJobReq), slog.Any("response", createDeploymentJobResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.CreateDeploymentJob'") } - d.logger.Logt("已创建部署任务", createDeploymentJobResp) - // 循环获取部署任务详情，等待任务状态变更 // REF: https://help.aliyun.com/zh/ssl-certificate/developer-reference/api-cas-2020-04-07-describedeploymentjob for { @@ -126,20 +131,20 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe JobId: createDeploymentJobResp.Body.JobId, } describeDeploymentJobResp, err := d.sdkClient.DescribeDeploymentJob(describeDeploymentJobReq) + d.logger.Debug("sdk request 'cas.DescribeDeploymentJob'", slog.Any("request", describeDeploymentJobReq), slog.Any("response", describeDeploymentJobResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.DescribeDeploymentJob'") } if describeDeploymentJobResp.Body.Status == nil || *describeDeploymentJobResp.Body.Status == "editing" { - return nil, errors.New("部署任务状态异常") + return nil, errors.New("unexpected deployment job status") } if *describeDeploymentJobResp.Body.Status == "success" || *describeDeploymentJobResp.Body.Status == "error" { - d.logger.Logt("已获取部署任务详情", describeDeploymentJobResp) break } - d.logger.Logt("部署任务未完成 ...") + d.logger.Info("waiting for deployment job completion ...") time.Sleep(time.Second * 5) } diff --git a/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go b/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go index b0edd415..8f61837f 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go +++ b/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "strings" "time" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -26,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunCdn.Client } @@ -44,13 +44,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -69,12 +73,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe SSLPri: tea.String(privkeyPem), } setCdnDomainSSLCertificateResp, err := d.sdkClient.SetCdnDomainSSLCertificate(setCdnDomainSSLCertificateReq) + d.logger.Debug("sdk request 'cdn.SetCdnDomainSSLCertificate'", slog.Any("request", setCdnDomainSSLCertificateReq), slog.Any("response", setCdnDomainSSLCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.SetCdnDomainSSLCertificate'") } - d.logger.Logt("已设置 CDN 域名证书", setCdnDomainSSLCertificateResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go b/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go index 304a7131..fe0d3a44 100644 --- a/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" aliyunSlb "github.com/alibabacloud-go/slb-20140515/v4/client" @@ -11,7 +12,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-slb" ) @@ -38,7 +38,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunSlb.Client sslUploader uploader.Uploader } @@ -66,14 +66,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -82,10 +87,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_LOADBALANCER: @@ -117,12 +122,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId LoadBalancerId: tea.String(d.config.LoadbalancerId), } describeLoadBalancerAttributeResp, err := d.sdkClient.DescribeLoadBalancerAttribute(describeLoadBalancerAttributeReq) + d.logger.Debug("sdk request 'slb.DescribeLoadBalancerAttribute'", slog.Any("request", describeLoadBalancerAttributeReq), slog.Any("response", describeLoadBalancerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeLoadBalancerAttribute'") } - d.logger.Logt("已查询到 CLB 负载均衡实例", describeLoadBalancerAttributeResp) - // 查询 HTTPS 监听列表 // REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-describeloadbalancerlisteners listenerPorts := make([]int32, 0) @@ -137,6 +141,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId ListenerProtocol: tea.String("https"), } describeLoadBalancerListenersResp, err := d.sdkClient.DescribeLoadBalancerListeners(describeLoadBalancerListenersReq) + d.logger.Debug("sdk request 'slb.DescribeLoadBalancerListeners'", slog.Any("request", describeLoadBalancerListenersReq), slog.Any("response", describeLoadBalancerListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeLoadBalancerListeners'") } @@ -154,12 +159,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId } } - d.logger.Logt("已查询到 CLB 负载均衡实例下的全部 HTTPS 监听", listenerPorts) - // 遍历更新监听证书 if len(listenerPorts) == 0 { - return errors.New("listener not found") + d.logger.Info("no clb listeners to deploy") } else { + d.logger.Info("found https listeners to deploy", slog.Any("listenerPorts", listenerPorts)) var errs []error for _, listenerPort := range listenerPorts { @@ -200,12 +204,11 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL ListenerPort: tea.Int32(cloudListenerPort), } describeLoadBalancerHTTPSListenerAttributeResp, err := d.sdkClient.DescribeLoadBalancerHTTPSListenerAttribute(describeLoadBalancerHTTPSListenerAttributeReq) + d.logger.Debug("sdk request 'slb.DescribeLoadBalancerHTTPSListenerAttribute'", slog.Any("request", describeLoadBalancerHTTPSListenerAttributeReq), slog.Any("response", describeLoadBalancerHTTPSListenerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeLoadBalancerHTTPSListenerAttribute'") } - d.logger.Logt("已查询到 CLB HTTPS 监听配置", describeLoadBalancerHTTPSListenerAttributeResp) - if d.config.Domain == "" { // 未指定 SNI，只需部署到监听器 @@ -218,11 +221,10 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL ServerCertificateId: tea.String(cloudCertId), } setLoadBalancerHTTPSListenerAttributeResp, err := d.sdkClient.SetLoadBalancerHTTPSListenerAttribute(setLoadBalancerHTTPSListenerAttributeReq) + d.logger.Debug("sdk request 'slb.SetLoadBalancerHTTPSListenerAttribute'", slog.Any("request", setLoadBalancerHTTPSListenerAttributeReq), slog.Any("response", setLoadBalancerHTTPSListenerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'slb.SetLoadBalancerHTTPSListenerAttribute'") } - - d.logger.Logt("已更新 CLB HTTPS 监听配置", setLoadBalancerHTTPSListenerAttributeResp) } else { // 指定 SNI，需部署到扩展域名 @@ -234,12 +236,11 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL ListenerPort: tea.Int32(cloudListenerPort), } describeDomainExtensionsResp, err := d.sdkClient.DescribeDomainExtensions(describeDomainExtensionsReq) + d.logger.Debug("sdk request 'slb.DescribeDomainExtensions'", slog.Any("request", describeDomainExtensionsReq), slog.Any("response", describeDomainExtensionsResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeDomainExtensions'") } - d.logger.Logt("已查询到 CLB 扩展域名", describeDomainExtensionsResp) - // 遍历修改扩展域名 // REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-setdomainextensionattribute if describeDomainExtensionsResp.Body.DomainExtensions != nil && describeDomainExtensionsResp.Body.DomainExtensions.DomainExtension != nil { @@ -256,12 +257,11 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL ServerCertificateId: tea.String(cloudCertId), } setDomainExtensionAttributeResp, err := d.sdkClient.SetDomainExtensionAttribute(setDomainExtensionAttributeReq) + d.logger.Debug("sdk request 'slb.SetDomainExtensionAttribute'", slog.Any("request", setDomainExtensionAttributeReq), slog.Any("response", setDomainExtensionAttributeResp)) if err != nil { errs = append(errs, xerrors.Wrap(err, "failed to execute sdk request 'slb.SetDomainExtensionAttribute'")) continue } - - d.logger.Logt("已修改 CLB 扩展域名", setDomainExtensionAttributeResp) } if len(errs) > 0 { diff --git a/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go b/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go index bfa28e7b..0ca22a6e 100644 --- a/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go +++ b/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "strings" "time" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -26,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunDcdn.Client } @@ -44,13 +44,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -69,12 +73,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe SSLPri: tea.String(privkeyPem), } setDcdnDomainSSLCertificateResp, err := d.sdkClient.SetDcdnDomainSSLCertificate(setDcdnDomainSSLCertificateReq) + d.logger.Debug("sdk request 'dcdn.SetDcdnDomainSSLCertificate'", slog.Any("request", setDcdnDomainSSLCertificateReq), slog.Any("response", setDcdnDomainSSLCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'dcdn.SetDcdnDomainSSLCertificate'") } - d.logger.Logt("已配置 DCDN 域名证书", setDcdnDomainSSLCertificateResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go b/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go index 5134d115..aa7e60c1 100644 --- a/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go +++ b/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strconv" "strings" @@ -13,7 +14,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -31,7 +31,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunEsa.Client sslUploader uploader.Uploader } @@ -55,14 +55,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -75,10 +80,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 配置站点证书 // REF: https://help.aliyun.com/zh/edge-security-acceleration/esa/api-esa-2024-09-10-setcertificate certId, _ := strconv.ParseInt(upres.CertId, 10, 64) @@ -88,12 +93,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe CasId: tea.Int64(certId), } setCertificateResp, err := d.sdkClient.SetCertificate(setCertificateReq) + d.logger.Debug("sdk request 'esa.SetCertificate'", slog.Any("request", setCertificateReq), slog.Any("response", setCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'esa.SetCertificate'") } - d.logger.Logt("已配置站点证书", setCertificateResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go b/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go index 9a2c4ca0..0877d561 100644 --- a/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go +++ b/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go @@ -28,7 +28,7 @@ func init() { flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") flag.StringVar(&fAccessKeySecret, argsPrefix+"ACCESSKEYSECRET", "", "") flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") - flag.Int64Var(&fSiteId, argsPrefix+"SITEID", "", "") + flag.Int64Var(&fSiteId, argsPrefix+"SITEID", 0, "") } /* diff --git a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go index e70931f8..d3f17965 100644 --- a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go +++ b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "time" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -31,7 +31,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClients *wSdkClients } @@ -54,13 +54,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClients: clients, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -87,10 +91,9 @@ func (d *DeployerProvider) deployToFC3(ctx context.Context, certPem string, priv // 获取自定义域名 // REF: https://help.aliyun.com/zh/functioncompute/fc-3-0/developer-reference/api-fc-2023-03-30-getcustomdomain getCustomDomainResp, err := d.sdkClients.fc3.GetCustomDomain(tea.String(d.config.Domain)) + d.logger.Debug("sdk request 'fc.GetCustomDomain'", slog.Any("response", getCustomDomainResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'fc.GetCustomDomain'") - } else { - d.logger.Logt("已获取自定义域名", getCustomDomainResp) } // 更新自定义域名 @@ -107,10 +110,9 @@ func (d *DeployerProvider) deployToFC3(ctx context.Context, certPem string, priv }, } updateCustomDomainResp, err := d.sdkClients.fc3.UpdateCustomDomain(tea.String(d.config.Domain), updateCustomDomainReq) + d.logger.Debug("sdk request 'fc.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'fc.UpdateCustomDomain'") - } else { - d.logger.Logt("已更新自定义域名", updateCustomDomainResp) } return nil @@ -120,10 +122,9 @@ func (d *DeployerProvider) deployToFC2(ctx context.Context, certPem string, priv // 获取自定义域名 // REF: https://help.aliyun.com/zh/functioncompute/fc-2-0/developer-reference/api-fc-open-2021-04-06-getcustomdomain getCustomDomainResp, err := d.sdkClients.fc2.GetCustomDomain(tea.String(d.config.Domain)) + d.logger.Debug("sdk request 'fc.GetCustomDomain'", slog.Any("response", getCustomDomainResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'fc.GetCustomDomain'") - } else { - d.logger.Logt("已获取自定义域名", getCustomDomainResp) } // 更新自定义域名 @@ -138,10 +139,9 @@ func (d *DeployerProvider) deployToFC2(ctx context.Context, certPem string, priv TlsConfig: getCustomDomainResp.Body.TlsConfig, } updateCustomDomainResp, err := d.sdkClients.fc2.UpdateCustomDomain(tea.String(d.config.Domain), updateCustomDomainReq) + d.logger.Debug("sdk request 'fc.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'fc.UpdateCustomDomain'") - } else { - d.logger.Logt("已更新自定义域名", updateCustomDomainResp) } return nil diff --git a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go index a8780285..d83f2591 100644 --- a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go +++ b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go @@ -17,7 +17,7 @@ var ( fAccessKeyId string fAccessKeySecret string fRegion string - fSiteId int64 + fDomain string ) func init() { @@ -28,7 +28,7 @@ func init() { flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") flag.StringVar(&fAccessKeySecret, argsPrefix+"ACCESSKEYSECRET", "", "") flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") - flag.Int64Var(&fSiteId, argsPrefix+"SITEID", "", "") + flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") } /* @@ -40,7 +40,7 @@ Shell command to run this test: --CERTIMATE_DEPLOYER_ALIYUNFC_ACCESSKEYID="your-access-key-id" \ --CERTIMATE_DEPLOYER_ALIYUNFC_ACCESSKEYSECRET="your-access-key-secret" \ --CERTIMATE_DEPLOYER_ALIYUNFC_REGION="cn-hangzhou" \ - --CERTIMATE_DEPLOYER_ALIYUNFC_SITEID="your-fc-site-id" + --CERTIMATE_DEPLOYER_ALIYUNFC_DOMAIN="example.com" */ func TestDeploy(t *testing.T) { flag.Parse() @@ -53,14 +53,14 @@ func TestDeploy(t *testing.T) { fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), fmt.Sprintf("ACCESSKEYSECRET: %v", fAccessKeySecret), fmt.Sprintf("REGION: %v", fRegion), - fmt.Sprintf("SITEID: %v", fSiteId), + fmt.Sprintf("DOMAIN: %v", fDomain), }, "\n")) deployer, err := provider.NewDeployer(&provider.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - SiteId: fSiteId, + Domain: fDomain, }) if err != nil { t.Errorf("err: %+v", err) diff --git a/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go b/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go index 99b06aca..4eacd077 100644 --- a/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go +++ b/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "strings" "time" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -28,7 +28,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunLive.Client } @@ -46,13 +46,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -71,12 +75,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe SSLPri: tea.String(privkeyPem), } setLiveDomainSSLCertificateResp, err := d.sdkClient.SetLiveDomainCertificate(setLiveDomainSSLCertificateReq) + d.logger.Debug("sdk request 'live.SetLiveDomainCertificate'", slog.Any("request", setLiveDomainSSLCertificateReq), slog.Any("response", setLiveDomainSSLCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.SetLiveDomainCertificate'") } - d.logger.Logt("已设置域名证书", setLiveDomainSSLCertificateResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go b/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go index 8dc1b2e3..98885d7d 100644 --- a/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go +++ b/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strings" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -36,7 +36,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunNlb.Client sslUploader uploader.Uploader } @@ -60,14 +60,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -76,10 +81,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_LOADBALANCER: @@ -110,12 +115,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId LoadBalancerId: tea.String(d.config.LoadbalancerId), } getLoadBalancerAttributeResp, err := d.sdkClient.GetLoadBalancerAttribute(getLoadBalancerAttributeReq) + d.logger.Debug("sdk request 'nlb.GetLoadBalancerAttribute'", slog.Any("request", getLoadBalancerAttributeReq), slog.Any("response", getLoadBalancerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'nlb.GetLoadBalancerAttribute'") } - d.logger.Logt("已查询到 NLB 负载均衡实例", getLoadBalancerAttributeResp) - // 查询 TCPSSL 监听列表 // REF: https://help.aliyun.com/zh/slb/network-load-balancer/developer-reference/api-nlb-2022-04-30-listlisteners listenerIds := make([]string, 0) @@ -129,6 +133,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId ListenerProtocol: tea.String("TCPSSL"), } listListenersResp, err := d.sdkClient.ListListeners(listListenersReq) + d.logger.Debug("sdk request 'nlb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'nlb.ListListeners'") } @@ -146,12 +151,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId } } - d.logger.Logt("已查询到 NLB 负载均衡实例下的全部 TCPSSL 监听", listenerIds) - // 遍历更新监听证书 if len(listenerIds) == 0 { - return errors.New("listener not found") + d.logger.Info("no nlb listeners to deploy") } else { + d.logger.Info("found tcpssl listeners to deploy", slog.Any("listenerIds", listenerIds)) var errs []error for _, listenerId := range listenerIds { @@ -188,12 +192,11 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL ListenerId: tea.String(cloudListenerId), } getListenerAttributeResp, err := d.sdkClient.GetListenerAttribute(getListenerAttributeReq) + d.logger.Debug("sdk request 'nlb.GetListenerAttribute'", slog.Any("request", getListenerAttributeReq), slog.Any("response", getListenerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'nlb.GetListenerAttribute'") } - d.logger.Logt("已查询到 NLB 监听配置", getListenerAttributeResp) - // 修改监听的属性 // REF: https://help.aliyun.com/zh/slb/network-load-balancer/developer-reference/api-nlb-2022-04-30-updatelistenerattribute updateListenerAttributeReq := &aliyunNlb.UpdateListenerAttributeRequest{ @@ -201,12 +204,11 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL CertificateIds: []*string{tea.String(cloudCertId)}, } updateListenerAttributeResp, err := d.sdkClient.UpdateListenerAttribute(updateListenerAttributeReq) + d.logger.Debug("sdk request 'nlb.UpdateListenerAttribute'", slog.Any("request", updateListenerAttributeReq), slog.Any("response", updateListenerAttributeResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'nlb.UpdateListenerAttribute'") } - d.logger.Logt("已更新 NLB 监听配置", updateListenerAttributeResp) - return nil } diff --git a/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go b/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go index 3eba5c55..2f16b09d 100644 --- a/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go +++ b/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go @@ -4,12 +4,12 @@ import ( "context" "errors" "fmt" + "log/slog" "github.com/aliyun/aliyun-oss-go-sdk/oss" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -27,7 +27,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *oss.Client } @@ -45,13 +45,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -65,14 +69,16 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // 为存储空间绑定自定义域名 // REF: https://help.aliyun.com/zh/oss/developer-reference/putcname - err := d.sdkClient.PutBucketCnameWithCertificate(d.config.Bucket, oss.PutBucketCname{ + putBucketCnameWithCertificateReq := oss.PutBucketCname{ Cname: d.config.Domain, CertificateConfiguration: &oss.CertificateConfiguration{ Certificate: certPem, PrivateKey: privkeyPem, Force: true, }, - }) + } + err := d.sdkClient.PutBucketCnameWithCertificate(d.config.Bucket, putBucketCnameWithCertificateReq) + d.logger.Debug("sdk request 'oss.PutBucketCnameWithCertificate'", slog.Any("bucket", d.config.Bucket), slog.Any("request", putBucketCnameWithCertificateReq)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'oss.PutBucketCnameWithCertificate'") } diff --git a/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go b/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go index 77c2ebf0..66dc188c 100644 --- a/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go +++ b/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "time" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" @@ -11,7 +12,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -27,7 +27,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunVod.Client } @@ -45,13 +45,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -67,10 +71,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe SSLPri: tea.String(privkeyPem), } setVodDomainSSLCertificateResp, err := d.sdkClient.SetVodDomainSSLCertificate(setVodDomainSSLCertificateReq) + d.logger.Debug("sdk request 'live.SetVodDomainSSLCertificate'", slog.Any("request", setVodDomainSSLCertificateReq), slog.Any("response", setVodDomainSSLCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.SetVodDomainSSLCertificate'") - } else { - d.logger.Logt("已设置域名证书", setVodDomainSSLCertificateResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go b/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go index 928a0d56..dd9248b6 100644 --- a/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go +++ b/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strings" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -32,7 +32,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *aliyunWaf.Client sslUploader uploader.Uploader } @@ -56,14 +56,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -77,7 +82,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } if d.config.Domain == "" { @@ -90,10 +95,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe RegionId: tea.String(d.config.Region), } describeDefaultHttpsResp, err := d.sdkClient.DescribeDefaultHttps(describeDefaultHttpsReq) + d.logger.Debug("sdk request 'waf.DescribeDefaultHttps'", slog.Any("request", describeDefaultHttpsReq), slog.Any("response", describeDefaultHttpsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDefaultHttps'") - } else { - d.logger.Logt("已查询到默认 SSL/TLS 设置", describeDefaultHttpsResp) } // 修改默认 SSL/TLS 设置 @@ -110,10 +114,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe modifyDefaultHttpsReq.EnableTLSv3 = describeDefaultHttpsResp.Body.DefaultHttps.EnableTLSv3 } modifyDefaultHttpsResp, err := d.sdkClient.ModifyDefaultHttps(modifyDefaultHttpsReq) + d.logger.Debug("sdk request 'waf.ModifyDefaultHttps'", slog.Any("request", modifyDefaultHttpsReq), slog.Any("response", modifyDefaultHttpsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDefaultHttps'") - } else { - d.logger.Logt("已修改默认 SSL/TLS 设置", modifyDefaultHttpsResp) } } else { // 指定接入域名 @@ -126,10 +129,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Domain: tea.String(d.config.Domain), } describeDomainDetailResp, err := d.sdkClient.DescribeDomainDetail(describeDomainDetailReq) + d.logger.Debug("sdk request 'waf.DescribeDomainDetail'", slog.Any("request", describeDomainDetailReq), slog.Any("response", describeDomainDetailResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDomainDetail'") - } else { - d.logger.Logt("已查询到 CNAME 接入详情", describeDomainDetailResp) } // 修改 CNAME 接入资源 @@ -143,18 +145,25 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe TLSVersion: tea.String("tlsv1"), EnableTLSv3: tea.Bool(false), }, - Redirect: &aliyunWaf.ModifyDomainRequestRedirect{}, + Redirect: &aliyunWaf.ModifyDomainRequestRedirect{ + Loadbalance: tea.String("iphash"), + }, } if describeDomainDetailResp.Body != nil && describeDomainDetailResp.Body.Listen != nil { modifyDomainReq.Listen.TLSVersion = describeDomainDetailResp.Body.Listen.TLSVersion modifyDomainReq.Listen.EnableTLSv3 = describeDomainDetailResp.Body.Listen.EnableTLSv3 modifyDomainReq.Listen.FocusHttps = describeDomainDetailResp.Body.Listen.FocusHttps } + if describeDomainDetailResp.Body != nil && describeDomainDetailResp.Body.Redirect != nil { + modifyDomainReq.Redirect.Loadbalance = describeDomainDetailResp.Body.Redirect.Loadbalance + modifyDomainReq.Redirect.FocusHttpBackend = describeDomainDetailResp.Body.Redirect.FocusHttpBackend + modifyDomainReq.Redirect.SniEnabled = describeDomainDetailResp.Body.Redirect.SniEnabled + modifyDomainReq.Redirect.SniHost = describeDomainDetailResp.Body.Redirect.SniHost + } modifyDomainResp, err := d.sdkClient.ModifyDomain(modifyDomainReq) + d.logger.Debug("sdk request 'waf.ModifyDomain'", slog.Any("request", modifyDomainReq), slog.Any("response", modifyDomainResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDomain'") - } else { - d.logger.Logt("已修改 CNAME 接入资源", modifyDomainResp) } } diff --git a/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go b/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go index 2e8e09ee..456799bd 100644 --- a/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go +++ b/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go @@ -3,6 +3,7 @@ import ( "context" "errors" + "log/slog" aws "github.com/aws/aws-sdk-go-v2/aws" awsCfg "github.com/aws/aws-sdk-go-v2/config" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aws-acm" ) @@ -30,7 +30,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *awsCf.Client sslUploader uploader.Uploader } @@ -58,14 +58,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -78,22 +83,21 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 获取分配配置 // REF: https://docs.aws.amazon.com/en_us/cloudfront/latest/APIReference/API_GetDistributionConfig.html getDistributionConfigReq := &awsCf.GetDistributionConfigInput{ Id: aws.String(d.config.DistributionId), } getDistributionConfigResp, err := d.sdkClient.GetDistributionConfig(context.TODO(), getDistributionConfigReq) + d.logger.Debug("sdk request 'cloudfront.GetDistributionConfig'", slog.Any("request", getDistributionConfigReq), slog.Any("response", getDistributionConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cloudfront.GetDistributionConfig'") } - d.logger.Logt("已获取分配配置", getDistributionConfigResp) - // 更新分配配置 // REF: https://docs.aws.amazon.com/zh_cn/cloudfront/latest/APIReference/API_UpdateDistribution.html updateDistributionReq := &awsCf.UpdateDistributionInput{ @@ -107,12 +111,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe updateDistributionReq.DistributionConfig.ViewerCertificate.CloudFrontDefaultCertificate = aws.Bool(false) updateDistributionReq.DistributionConfig.ViewerCertificate.ACMCertificateArn = aws.String(upres.CertId) updateDistributionResp, err := d.sdkClient.UpdateDistribution(context.TODO(), updateDistributionReq) + d.logger.Debug("sdk request 'cloudfront.UpdateDistribution'", slog.Any("request", updateDistributionReq), slog.Any("response", updateDistributionResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cloudfront.UpdateDistribution'") } - d.logger.Logt("已更新分配配置", updateDistributionResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go b/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go index df57ea1d..a31a21ec 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go +++ b/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "time" bceCdn "github.com/baidubce/bce-sdk-go/services/cdn" @@ -10,7 +11,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -24,7 +24,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *bceCdn.Client } @@ -42,13 +42,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -64,12 +68,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe }, "ON", ) + d.logger.Debug("sdk request 'cdn.PutCert'", slog.String("request.domain", d.config.Domain), slog.Any("response", putCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.PutCert'") } - d.logger.Logt("已修改域名证书", putCertResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index efb3353e..17d6d4d0 100644 --- a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -4,12 +4,12 @@ import ( "context" "errors" "fmt" + "log/slog" "time" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" bssdk "github.com/usual2970/certimate/internal/pkg/vendors/baishan-sdk" ) @@ -22,7 +22,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *bssdk.Client } @@ -40,13 +40,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -62,12 +66,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Config: "https", } getDomainConfigResp, err := d.sdkClient.GetDomainConfig(getDomainConfigReq) + d.logger.Debug("sdk request 'baishan.GetDomainConfig'", slog.Any("request", getDomainConfigReq), slog.Any("response", getDomainConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.GetDomainConfig'") } else if len(getDomainConfigResp.Data) == 0 { return nil, errors.New("domain config not found") - } else { - d.logger.Logt("已查询到域名配置", getDomainConfigResp) } // 新增证书 @@ -78,10 +81,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Name: fmt.Sprintf("certimate_%d", time.Now().UnixMilli()), } createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) + d.logger.Debug("sdk request 'baishan.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.CreateCertificate'") - } else { - d.logger.Logt("已新增证书", createCertificateResp) } // 设置域名配置 @@ -98,10 +100,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe }, } setDomainConfigResp, err := d.sdkClient.SetDomainConfig(setDomainConfigReq) + d.logger.Debug("sdk request 'baishan.SetDomainConfig'", slog.Any("request", setDomainConfigReq), slog.Any("response", setDomainConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.SetDomainConfig'") - } else { - d.logger.Logt("已设置域名配置", setDomainConfigResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go b/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go index ff09dc26..57e37f05 100644 --- a/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go +++ b/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go @@ -4,12 +4,12 @@ import ( "context" "crypto/tls" "errors" + "log/slog" "net/url" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" btsdk "github.com/usual2970/certimate/internal/pkg/vendors/btpanel-sdk" ) @@ -26,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *btsdk.Client } @@ -44,13 +44,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -61,10 +65,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Certificate: certPem, } configSavePanelSSLResp, err := d.sdkClient.ConfigSavePanelSSL(configSavePanelSSLReq) + d.logger.Debug("sdk request 'bt.ConfigSavePanelSSL'", slog.Any("request", configSavePanelSSLReq), slog.Any("response", configSavePanelSSLResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.ConfigSavePanelSSL'") - } else { - d.logger.Logt("已设置面板 SSL 证书", configSavePanelSSLResp) } if d.config.AutoRestart { @@ -73,7 +76,8 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Name: "nginx", Type: "restart", } - d.sdkClient.SystemServiceAdmin(systemServiceAdminReq) + systemServiceAdminResp, _ := d.sdkClient.SystemServiceAdmin(systemServiceAdminReq) + d.logger.Debug("sdk request 'bt.SystemServiceAdmin'", slog.Any("request", systemServiceAdminReq), slog.Any("response", systemServiceAdminResp)) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go b/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go index c6bf4966..75d57b1a 100644 --- a/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go +++ b/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go @@ -5,12 +5,12 @@ import ( "crypto/tls" "errors" "fmt" + "log/slog" "net/url" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/slices" btsdk "github.com/usual2970/certimate/internal/pkg/vendors/btpanel-sdk" ) @@ -32,7 +32,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *btsdk.Client } @@ -50,13 +50,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -76,10 +80,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe PrivateKey: privkeyPem, } siteSetSSLResp, err := d.sdkClient.SiteSetSSL(siteSetSSLReq) + d.logger.Debug("sdk request 'bt.SiteSetSSL'", slog.Any("request", siteSetSSLReq), slog.Any("response", siteSetSSLResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SiteSetSSL'") - } else { - d.logger.Logt("已设置站点证书", siteSetSSLResp) } } @@ -95,10 +98,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe PrivateKey: privkeyPem, } sslCertSaveCertResp, err := d.sdkClient.SSLCertSaveCert(sslCertSaveCertReq) + d.logger.Debug("sdk request 'bt.SSLCertSaveCert'", slog.Any("request", sslCertSaveCertReq), slog.Any("response", sslCertSaveCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SSLCertSaveCert'") - } else { - d.logger.Logt("已上传证书", sslCertSaveCertResp) } // 设置站点证书 @@ -111,10 +113,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe }), } sslSetBatchCertToSiteResp, err := d.sdkClient.SSLSetBatchCertToSite(sslSetBatchCertToSiteReq) + d.logger.Debug("sdk request 'bt.SSLSetBatchCertToSite'", slog.Any("request", sslSetBatchCertToSiteReq), slog.Any("response", sslSetBatchCertToSiteResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SSLSetBatchCertToSite'") - } else { - d.logger.Logt("已设置站点证书", sslSetBatchCertToSiteResp) } } diff --git a/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go b/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go index 909a2e7d..b8bd8856 100644 --- a/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go +++ b/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go @@ -3,14 +3,13 @@ import ( "context" "errors" - "fmt" + "log/slog" "strings" bpCdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/byteplus-cdn" ) @@ -26,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *bpCdn.CDN sslUploader uploader.Uploader } @@ -52,14 +51,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -68,10 +72,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - domains := make([]string, 0) if strings.HasPrefix(d.config.Domain, "*.") { // 获取指定证书可关联的域名 @@ -80,6 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe CertId: upres.CertId, } describeCertConfigResp, err := d.sdkClient.DescribeCertConfig(describeCertConfigReq) + d.logger.Debug("sdk request 'cdn.DescribeCertConfig'", slog.Any("request", describeCertConfigReq), slog.Any("response", describeCertConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertConfig'") } @@ -99,6 +104,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if len(domains) == 0 { if len(describeCertConfigResp.Result.SpecifiedCertConfig) > 0 { // 所有可关联的域名都配置了该证书，跳过部署 + d.logger.Info("no domains to deploy") } else { return nil, errors.New("domain not found") } @@ -118,10 +124,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Domain: domain, } batchDeployCertResp, err := d.sdkClient.BatchDeployCert(batchDeployCertReq) + d.logger.Debug("sdk request 'cdn.BatchDeployCert'", slog.Any("request", batchDeployCertReq), slog.Any("response", batchDeployCertResp)) if err != nil { errs = append(errs, err) - } else { - d.logger.Logt(fmt.Sprintf("已关联证书到域名 %s", domain), batchDeployCertResp) } } diff --git a/internal/pkg/core/deployer/providers/cachefly/cachefly.go b/internal/pkg/core/deployer/providers/cachefly/cachefly.go index 8c6f129d..63bb4e95 100644 --- a/internal/pkg/core/deployer/providers/cachefly/cachefly.go +++ b/internal/pkg/core/deployer/providers/cachefly/cachefly.go @@ -3,11 +3,11 @@ import ( "context" "errors" + "log/slog" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" cfsdk "github.com/usual2970/certimate/internal/pkg/vendors/cachefly-sdk" ) @@ -18,7 +18,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *cfsdk.Client } @@ -36,13 +36,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -53,10 +57,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe CertificateKey: privkeyPem, } createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) + d.logger.Debug("sdk request 'cachefly.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cachefly.CreateCertificate'") - } else { - d.logger.Logt("已上传证书", createCertificateResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go b/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go index c98d9ae4..ec2c1883 100644 --- a/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go +++ b/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go @@ -5,13 +5,13 @@ import ( "encoding/json" "errors" "fmt" + "log/slog" "net/url" "time" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" cfsdk "github.com/usual2970/certimate/internal/pkg/vendors/cdnfly-sdk" ) @@ -34,7 +34,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *cfsdk.Client } @@ -52,13 +52,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -93,10 +97,9 @@ func (d *DeployerProvider) deployToSite(ctx context.Context, certPem string, pri Id: d.config.SiteId, } getSiteResp, err := d.sdkClient.GetSite(getSiteReq) + d.logger.Debug("sdk request 'cdnfly.GetSite'", slog.Any("request", getSiteReq), slog.Any("response", getSiteResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.GetSite'") - } else { - d.logger.Logt("已获取网站详情", getSiteResp) } // 添加单个证书 @@ -108,10 +111,9 @@ func (d *DeployerProvider) deployToSite(ctx context.Context, certPem string, pri Key: privkeyPem, } createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) + d.logger.Debug("sdk request 'cdnfly.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.CreateCertificate'") - } else { - d.logger.Logt("已添加证书", createCertificateResp) } // 修改单个网站 @@ -126,10 +128,9 @@ func (d *DeployerProvider) deployToSite(ctx context.Context, certPem string, pri HttpsListen: &updateSiteHttpsListen, } updateSiteResp, err := d.sdkClient.UpdateSite(updateSiteReq) + d.logger.Debug("sdk request 'cdnfly.UpdateSite'", slog.Any("request", updateSiteReq), slog.Any("response", updateSiteResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.UpdateSite'") - } else { - d.logger.Logt("已修改网站", updateSiteResp) } return nil @@ -150,10 +151,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPem stri Key: &privkeyPem, } updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) + d.logger.Debug("sdk request 'cdnfly.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.UpdateCertificate'") - } else { - d.logger.Logt("已修改证书", updateCertificateResp) } return nil diff --git a/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go b/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go index 4743b7cd..94368998 100644 --- a/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go +++ b/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go @@ -2,12 +2,12 @@ import ( "context" + "log/slog" "strconv" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/dogecloud" dogesdk "github.com/usual2970/certimate/internal/pkg/vendors/dogecloud-sdk" @@ -24,7 +24,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *dogesdk.Client sslUploader uploader.Uploader } @@ -48,14 +48,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -64,19 +69,18 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 绑定证书 // REF: https://docs.dogecloud.com/cdn/api-cert-bind bindCdnCertId, _ := strconv.ParseInt(upres.CertId, 10, 64) bindCdnCertResp, err := d.sdkClient.BindCdnCertWithDomain(bindCdnCertId, d.config.Domain) + d.logger.Debug("sdk request 'cdn.BindCdnCert'", slog.Int64("request.certId", bindCdnCertId), slog.String("request.domain", d.config.Domain), slog.Any("response", bindCdnCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.BindCdnCert'") } - d.logger.Logt("已绑定证书", bindCdnCertResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go b/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go index 890cfdf3..572ee4af 100644 --- a/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go +++ b/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go @@ -2,11 +2,11 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/certs" edgsdk "github.com/usual2970/certimate/internal/pkg/vendors/edgio-sdk/applications/v7" edgsdkDtos "github.com/usual2970/certimate/internal/pkg/vendors/edgio-sdk/applications/v7/dtos" @@ -23,7 +23,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *edgsdk.EdgioClient } @@ -41,13 +41,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -67,12 +71,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe PrivateKey: privkeyPem, } uploadTlsCertResp, err := d.sdkClient.UploadTlsCert(uploadTlsCertReq) + d.logger.Debug("sdk request 'edgio.UploadTlsCert'", slog.Any("request", uploadTlsCertReq), slog.Any("response", uploadTlsCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'edgio.UploadTlsCert'") } - d.logger.Logt("已上传 TLS 证书", uploadTlsCertResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go b/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go index e1598a5d..a4d1c33e 100644 --- a/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go +++ b/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go @@ -3,6 +3,7 @@ import ( "context" "errors" + "log/slog" "strconv" gprovider "github.com/G-Core/gcorelabscdn-go/gcore/provider" @@ -10,7 +11,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/gcore-cdn" gcoresdk "github.com/usual2970/certimate/internal/pkg/vendors/gcore-sdk/common" @@ -25,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *gresources.Service sslUploader uploader.Uploader } @@ -51,14 +51,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -72,16 +77,15 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 获取 CDN 资源详情 // REF: https://api.gcore.com/docs/cdn#tag/CDN-resources/paths/~1cdn~1resources~1%7Bresource_id%7D/get getResourceResp, err := d.sdkClient.Get(context.TODO(), d.config.ResourceId) + d.logger.Debug("sdk request 'resources.Get'", slog.Any("resourceId", d.config.ResourceId), slog.Any("response", getResourceResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'resources.Get'") - } else { - d.logger.Logt("已获取 CDN 资源详情", getResourceResp) } // 更新 CDN 资源详情 @@ -101,10 +105,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Options: getResourceResp.Options, } updateResourceResp, err := d.sdkClient.Update(context.TODO(), 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)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'resources.Update'") - } else { - d.logger.Logt("已更新 CDN 资源详情", updateResourceResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go b/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go index 4a40fbc1..d05d6503 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" hcCdn "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2" @@ -10,7 +11,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-scm" hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk" @@ -29,7 +29,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *hcCdn.CdnClient sslUploader uploader.Uploader } @@ -60,14 +60,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -76,22 +81,21 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 查询加速域名配置 // REF: https://support.huaweicloud.com/api-cdn/ShowDomainFullConfig.html showDomainFullConfigReq := &hcCdnModel.ShowDomainFullConfigRequest{ DomainName: d.config.Domain, } showDomainFullConfigResp, err := d.sdkClient.ShowDomainFullConfig(showDomainFullConfigReq) + d.logger.Debug("sdk request 'cdn.ShowDomainFullConfig'", slog.Any("request", showDomainFullConfigReq), slog.Any("response", showDomainFullConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ShowDomainFullConfig'") } - d.logger.Logt("已查询到加速域名配置", showDomainFullConfigResp) - // 更新加速域名配置 // REF: https://support.huaweicloud.com/api-cdn/UpdateDomainMultiCertificates.html // REF: https://support.huaweicloud.com/usermanual-cdn/cdn_01_0306.html @@ -108,12 +112,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe }, } updateDomainMultiCertificatesResp, err := d.sdkClient.UpdateDomainMultiCertificates(updateDomainMultiCertificatesReq) + d.logger.Debug("sdk request 'cdn.UploadDomainMultiCertificates'", slog.Any("request", updateDomainMultiCertificatesReq), slog.Any("response", updateDomainMultiCertificatesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadDomainMultiCertificates'") } - d.logger.Logt("已更新加速域名配置", updateDomainMultiCertificatesResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 17bc178b..8783c053 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" @@ -17,7 +18,6 @@ import ( "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-elb" hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk" @@ -45,7 +45,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *hcElb.ElbClient sslUploader uploader.Uploader } @@ -73,14 +73,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -89,10 +94,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_CERTIFICATE: @@ -134,12 +139,11 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPem stri }, } updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) + d.logger.Debug("sdk request 'elb.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.UpdateCertificate'") } - d.logger.Logt("已更新 ELB 证书", updateCertificateResp) - return nil } @@ -154,12 +158,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, certPem str LoadbalancerId: d.config.LoadbalancerId, } showLoadBalancerResp, err := d.sdkClient.ShowLoadBalancer(showLoadBalancerReq) + d.logger.Debug("sdk request 'elb.ShowLoadBalancer'", slog.Any("request", showLoadBalancerReq), slog.Any("response", showLoadBalancerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowLoadBalancer'") } - d.logger.Logt("已查询到 ELB 负载均衡器", showLoadBalancerResp) - // 查询监听器列表 // REF: https://support.huaweicloud.com/api-elb/ListListeners.html listenerIds := make([]string, 0) @@ -173,6 +176,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, certPem str LoadbalancerId: &[]string{showLoadBalancerResp.Loadbalancer.Id}, } listListenersResp, err := d.sdkClient.ListListeners(listListenersReq) + d.logger.Debug("sdk request 'elb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.ListListeners'") } @@ -190,20 +194,19 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, certPem str } } - d.logger.Logt("已查询到 ELB 负载均衡器下的监听器", listenerIds) - // 上传证书到 SCM upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 遍历更新监听器证书 if len(listenerIds) == 0 { - return errors.New("listener not found") + d.logger.Info("no listeners to deploy") } else { + d.logger.Info("found https listeners to deploy", slog.Any("listenerIds", listenerIds)) var errs []error for _, listenerId := range listenerIds { @@ -229,10 +232,10 @@ func (d *DeployerProvider) deployToListener(ctx context.Context, certPem string, upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 更新监听器证书 if err := d.modifyListenerCertificate(ctx, d.config.ListenerId, upres.CertId); err != nil { return err @@ -248,12 +251,11 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL ListenerId: cloudListenerId, } showListenerResp, err := d.sdkClient.ShowListener(showListenerReq) + d.logger.Debug("sdk request 'elb.ShowListener'", slog.Any("request", showListenerReq), slog.Any("response", showListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowListener'") } - d.logger.Logt("已查询到 ELB 监听器", showListenerResp) - // 更新监听器 // REF: https://support.huaweicloud.com/api-elb/UpdateListener.html updateListenerReq := &hcElbModel.UpdateListenerRequest{ @@ -274,6 +276,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL Id: &showListenerResp.Listener.SniContainerRefs, } listOldCertificateResp, err := d.sdkClient.ListCertificates(listOldCertificateReq) + d.logger.Debug("sdk request 'elb.ListCertificates'", slog.Any("request", listOldCertificateReq), slog.Any("response", listOldCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.ListCertificates'") } @@ -282,6 +285,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL CertificateId: cloudCertId, } showNewCertificateResp, err := d.sdkClient.ShowCertificate(showNewCertificateReq) + d.logger.Debug("sdk request 'elb.ShowCertificate'", slog.Any("request", showNewCertificateReq), slog.Any("response", showNewCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowCertificate'") } @@ -311,12 +315,11 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL } } updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) + d.logger.Debug("sdk request 'elb.UpdateListener'", slog.Any("request", updateListenerReq), slog.Any("response", updateListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'elb.UpdateListener'") } - d.logger.Logt("已更新 ELB 监听器", updateListenerResp) - return nil } diff --git a/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go b/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go index 2342edfa..9d124191 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strings" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" @@ -17,7 +18,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-waf" hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk" @@ -42,7 +42,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *hcWaf.WafClient sslUploader uploader.Uploader } @@ -70,14 +70,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -87,7 +92,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 根据部署资源类型决定部署方式 @@ -125,10 +130,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPem stri CertificateId: d.config.CertificateId, } showCertificateResp, err := d.sdkClient.ShowCertificate(showCertificateReq) + d.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", showCertificateReq), slog.Any("response", showCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'waf.ShowCertificate'") - } else { - d.logger.Logt("已获取 WAF 证书", showCertificateResp) } // 更新证书 @@ -142,10 +146,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPem stri }, } updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) + d.logger.Debug("sdk request 'waf.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'waf.UpdateCertificate'") - } else { - d.logger.Logt("已更新 WAF 证书", updateCertificateResp) } return nil @@ -161,7 +164,7 @@ func (d *DeployerProvider) deployToCloudServer(ctx context.Context, certPem stri if err != nil { return xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 遍历查询云模式防护域名列表，获取防护域名 ID @@ -176,6 +179,7 @@ func (d *DeployerProvider) deployToCloudServer(ctx context.Context, certPem stri Pagesize: hwsdk.Int32Ptr(listHostPageSize), } listHostResp, err := d.sdkClient.ListHost(listHostReq) + d.logger.Debug("sdk request 'waf.ListHost'", slog.Any("request", listHostReq), slog.Any("response", listHostResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'waf.ListHost'") } @@ -209,10 +213,9 @@ func (d *DeployerProvider) deployToCloudServer(ctx context.Context, certPem stri }, } updateHostResp, err := d.sdkClient.UpdateHost(updateHostReq) + d.logger.Debug("sdk request 'waf.UpdateHost'", slog.Any("request", updateHostReq), slog.Any("response", updateHostResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'waf.UpdateHost'") - } else { - d.logger.Logt("已更新云模式防护域名的配置", updateHostResp) } return nil @@ -228,7 +231,7 @@ func (d *DeployerProvider) deployToPremiumHost(ctx context.Context, certPem stri if err != nil { return xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 遍历查询独享模式域名列表，获取防护域名 ID @@ -243,6 +246,7 @@ func (d *DeployerProvider) deployToPremiumHost(ctx context.Context, certPem stri Pagesize: hwsdk.StringPtr(fmt.Sprintf("%d", listPremiumHostPageSize)), } listPremiumHostResp, err := d.sdkClient.ListPremiumHost(listPremiumHostReq) + d.logger.Debug("sdk request 'waf.ListPremiumHost'", slog.Any("request", listPremiumHostReq), slog.Any("response", listPremiumHostResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'waf.ListPremiumHost'") } @@ -276,10 +280,9 @@ func (d *DeployerProvider) deployToPremiumHost(ctx context.Context, certPem stri }, } updatePremiumHostResp, err := d.sdkClient.UpdatePremiumHost(updatePremiumHostReq) + d.logger.Debug("sdk request 'waf.UpdatePremiumHost'", slog.Any("request", updatePremiumHostReq), slog.Any("response", updatePremiumHostResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'waf.UpdatePremiumHost'") - } else { - d.logger.Logt("已修改独享模式域名配置", updatePremiumHostResp) } return nil diff --git a/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go b/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go index 41625b64..30d93457 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go +++ b/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "strings" jdCore "github.com/jdcloud-api/jdcloud-sdk-go/core" @@ -14,7 +15,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/jdcloud-ssl" "github.com/usual2970/certimate/internal/pkg/utils/slices" @@ -42,7 +42,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *jdLbClient.LbClient sslUploader uploader.Uploader } @@ -69,14 +69,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -86,7 +91,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 根据部署资源类型决定部署方式 @@ -117,10 +122,9 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId // REF: https://docs.jdcloud.com/cn/load-balancer/api/describeloadbalancer describeLoadBalancerReq := jdLbApi.NewDescribeLoadBalancerRequest(d.config.RegionId, d.config.LoadbalancerId) describeLoadBalancerResp, err := d.sdkClient.DescribeLoadBalancer(describeLoadBalancerReq) + d.logger.Debug("sdk request 'lb.DescribeLoadBalancer'", slog.Any("request", describeLoadBalancerReq), slog.Any("response", describeLoadBalancerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'lb.DescribeLoadBalancer'") - } else { - d.logger.Logt("已查询到负载均衡器详情", describeLoadBalancerResp) } // 查询监听器列表 @@ -134,6 +138,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeListenersReq.SetPageSize(describeListenersPageNumber) describeListenersReq.SetPageSize(describeListenersPageSize) describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) + d.logger.Debug("sdk request 'lb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'lb.DescribeListeners'") } @@ -153,9 +158,9 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId // 遍历更新监听器证书 if len(listenerIds) == 0 { - return errors.New("listener not found") + d.logger.Info("no listeners to deploy") } else { - d.logger.Logt("已查询到负载均衡器下的全部 HTTPS/TLS 监听器", listenerIds) + d.logger.Info("found https/tls listeners to deploy", slog.Any("listenerIds", listenerIds)) var errs []error @@ -191,10 +196,9 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL // REF: https://docs.jdcloud.com/cn/load-balancer/api/describelistener describeListenerReq := jdLbApi.NewDescribeListenerRequest(d.config.RegionId, cloudListenerId) describeListenerResp, err := d.sdkClient.DescribeListener(describeListenerReq) + d.logger.Debug("sdk request 'lb.DescribeListener'", slog.Any("request", describeListenerReq), slog.Any("response", describeListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'lb.DescribeListener'") - } else { - d.logger.Logt("已查询到监听器详情", describeListenerResp) } if d.config.Domain == "" { @@ -205,10 +209,9 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL updateListenerReq := jdLbApi.NewUpdateListenerRequest(d.config.RegionId, cloudListenerId) updateListenerReq.SetCertificateSpecs([]jdLbModel.CertificateSpec{{CertificateId: cloudCertId}}) updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) + d.logger.Debug("sdk request 'lb.UpdateListener'", slog.Any("request", updateListenerReq), slog.Any("response", updateListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'lb.UpdateListener'") - } else { - d.logger.Logt("已修改监听器信息", updateListenerResp) } } else { // 指定 SNI，需部署到扩展证书 @@ -234,10 +237,9 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL }), ) updateListenerCertificatesResp, err := d.sdkClient.UpdateListenerCertificates(updateListenerCertificatesReq) + d.logger.Debug("sdk request 'lb.UpdateListenerCertificates'", slog.Any("request", updateListenerCertificatesReq), slog.Any("response", updateListenerCertificatesResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'lb.UpdateListenerCertificates'") - } else { - d.logger.Logt("已批量修改扩展证书", updateListenerCertificatesResp) } } diff --git a/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go b/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go index d5bdae4f..3c473961 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" jdCore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdCdnApi "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/apis" @@ -9,7 +10,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/jdcloud-ssl" ) @@ -25,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *jdCdnClient.CdnClient sslUploader uploader.Uploader } @@ -52,14 +52,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -68,10 +73,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // REF: https://docs.jdcloud.com/cn/cdn/api/querydomainconfig queryDomainConfigReq := jdCdnApi.NewQueryDomainConfigRequest(d.config.Domain) queryDomainConfigResp, err := d.sdkClient.QueryDomainConfig(queryDomainConfigReq) + d.logger.Debug("sdk request 'cdn.QueryDomainConfig'", slog.Any("request", queryDomainConfigReq), slog.Any("response", queryDomainConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.QueryDomainConfig'") - } else { - d.logger.Logt("已查询到域名配置信息", queryDomainConfigResp) } // 上传证书到 SSL @@ -79,7 +83,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 设置通讯协议 @@ -92,10 +96,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe setHttpTypeReq.SetSslCertId(upres.CertId) setHttpTypeReq.SetJumpType(queryDomainConfigResp.Result.HttpsJumpType) setHttpTypeResp, err := d.sdkClient.SetHttpType(setHttpTypeReq) + d.logger.Debug("sdk request 'cdn.QueryDomainConfig'", slog.Any("request", setHttpTypeReq), slog.Any("response", setHttpTypeResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.SetHttpType'") - } else { - d.logger.Logt("已设置通讯协议", setHttpTypeResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go b/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go index 7998fb16..ea125408 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go +++ b/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" jdCore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdLiveApi "github.com/jdcloud-api/jdcloud-sdk-go/services/live/apis" @@ -9,7 +10,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -23,7 +23,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *jdLiveClient.LiveClient } @@ -41,13 +41,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -58,10 +62,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe setLiveDomainCertificateReq.SetCert(certPem) setLiveDomainCertificateReq.SetKey(privkeyPem) setLiveDomainCertificateResp, err := d.sdkClient.SetLiveDomainCertificate(setLiveDomainCertificateReq) + d.logger.Debug("sdk request 'live.SetLiveDomainCertificate'", slog.Any("request", setLiveDomainCertificateReq), slog.Any("response", setLiveDomainCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.SetLiveDomainCertificate'") - } else { - d.logger.Logt("已设置直播证书", setLiveDomainCertificateResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go index b83fd430..69410c78 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go +++ b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "strconv" "time" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" ) type DeployerConfig struct { @@ -26,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *jdVodClient.VodClient } @@ -44,13 +44,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -65,6 +69,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe listDomainsReq.SetPageNumber(1) listDomainsReq.SetPageSize(100) listDomainsResp, err := d.sdkClient.ListDomains(listDomainsReq) + d.logger.Debug("sdk request 'vod.ListDomains'", slog.Any("request", listDomainsReq), slog.Any("response", listDomainsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.ListDomains'") } @@ -90,10 +95,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // REF: https://docs.jdcloud.com/cn/video-on-demand/api/gethttpssl getHttpSslReq := jdVodApi.NewGetHttpSslRequest(domainId) getHttpSslResp, err := d.sdkClient.GetHttpSsl(getHttpSslReq) + d.logger.Debug("sdk request 'vod.GetHttpSsl'", slog.Any("request", getHttpSslReq), slog.Any("response", getHttpSslResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.GetHttpSsl'") - } else { - d.logger.Logt("已查询到域名 SSL 配置", getHttpSslResp) } // 设置域名 SSL 配置 @@ -106,10 +110,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe setHttpSslReq.SetJumpType(getHttpSslResp.Result.JumpType) setHttpSslReq.SetEnabled(true) setHttpSslResp, err := d.sdkClient.SetHttpSsl(setHttpSslReq) + d.logger.Debug("sdk request 'vod.SetHttpSsl'", slog.Any("request", setHttpSslReq), slog.Any("response", setHttpSslResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.SetHttpSsl'") - } else { - d.logger.Logt("已设置域名 SSL 配置", setHttpSslResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go index c97e4386..e27070c8 100644 --- a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go +++ b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go @@ -1,8 +1,9 @@ -package k8ssecret +package k8ssecret import ( "context" "errors" + "log/slog" "strings" xerrors "github.com/pkg/errors" @@ -13,7 +14,6 @@ import ( "k8s.io/client-go/tools/clientcmd" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/certs" ) @@ -34,7 +34,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger } var _ deployer.Deployer = (*DeployerProvider)(nil) @@ -45,13 +45,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { } return &DeployerProvider{ - logger: logger.NewNilLogger(), + logger: slog.Default(), config: config, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -110,11 +114,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe secretPayload.Data[d.config.SecretDataKeyForCrt] = []byte(certPem) secretPayload.Data[d.config.SecretDataKeyForKey] = []byte(privkeyPem) - _, err = client.CoreV1().Secrets(d.config.Namespace).Create(context.TODO(), secretPayload, k8sMeta.CreateOptions{}) + secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Create(context.TODO(), secretPayload, k8sMeta.CreateOptions{}) + d.logger.Debug("k8s operate 'Secrets.Create'", slog.String("namespace", d.config.Namespace), slog.Any("secret", secretPayload)) if err != nil { return nil, xerrors.Wrap(err, "failed to create k8s secret") } else { - d.logger.Logf("k8s secret created", secretPayload) return &deployer.DeployResult{}, nil } } @@ -134,12 +138,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe secretPayload.Data[d.config.SecretDataKeyForCrt] = []byte(certPem) secretPayload.Data[d.config.SecretDataKeyForKey] = []byte(privkeyPem) secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Update(context.TODO(), secretPayload, k8sMeta.UpdateOptions{}) + d.logger.Debug("k8s operate 'Secrets.Update'", slog.String("namespace", d.config.Namespace), slog.Any("secret", secretPayload)) if err != nil { return nil, xerrors.Wrap(err, "failed to update k8s secret") } - d.logger.Logf("k8s secret updated", secretPayload) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/local/local.go b/internal/pkg/core/deployer/providers/local/local.go index 7952f63c..1f28df33 100644 --- a/internal/pkg/core/deployer/providers/local/local.go +++ b/internal/pkg/core/deployer/providers/local/local.go @@ -1,16 +1,16 @@ -package local +package local import ( "bytes" "context" "fmt" + "log/slog" "os/exec" "runtime" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/certs" "github.com/usual2970/certimate/internal/pkg/utils/files" ) @@ -45,7 +45,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger } var _ deployer.Deployer = (*DeployerProvider)(nil) @@ -57,12 +57,16 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -70,11 +74,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // 执行前置命令 if d.config.PreCommand != "" { stdout, stderr, err := execCommand(d.config.ShellEnv, d.config.PreCommand) + d.logger.Debug("run pre-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { return nil, xerrors.Wrapf(err, "failed to execute pre-command, stdout: %s, stderr: %s", stdout, stderr) } - - d.logger.Logt("pre-command executed", stdout) } // 写入证书和私钥文件 @@ -83,42 +86,36 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err := files.WriteString(d.config.OutputCertPath, certPem); err != nil { return nil, xerrors.Wrap(err, "failed to save certificate file") } - - d.logger.Logt("certificate file saved") + d.logger.Info("ssl certificate file saved", slog.String("path", d.config.OutputCertPath)) if err := files.WriteString(d.config.OutputKeyPath, privkeyPem); err != nil { return nil, xerrors.Wrap(err, "failed to save private key file") } - - d.logger.Logt("private key file saved") + d.logger.Info("ssl private key file saved", slog.String("path", d.config.OutputKeyPath)) case OUTPUT_FORMAT_PFX: pfxData, err := certs.TransformCertificateFromPEMToPFX(certPem, privkeyPem, d.config.PfxPassword) if err != nil { return nil, xerrors.Wrap(err, "failed to transform certificate to PFX") } - - d.logger.Logt("certificate transformed to PFX") + d.logger.Info("ssl certificate transformed to pfx") if err := files.Write(d.config.OutputCertPath, pfxData); err != nil { return nil, xerrors.Wrap(err, "failed to save certificate file") } - - d.logger.Logt("certificate file saved") + d.logger.Info("ssl certificate file saved", slog.String("path", d.config.OutputCertPath)) case OUTPUT_FORMAT_JKS: jksData, err := certs.TransformCertificateFromPEMToJKS(certPem, privkeyPem, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass) if err != nil { return nil, xerrors.Wrap(err, "failed to transform certificate to JKS") } - - d.logger.Logt("certificate transformed to JKS") + d.logger.Info("ssl certificate transformed to jks") if err := files.Write(d.config.OutputCertPath, jksData); err != nil { return nil, xerrors.Wrap(err, "failed to save certificate file") } - - d.logger.Logt("certificate file uploaded") + d.logger.Info("ssl certificate file saved", slog.String("path", d.config.OutputCertPath)) default: return nil, fmt.Errorf("unsupported output format: %s", d.config.OutputFormat) @@ -127,11 +124,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // 执行后置命令 if d.config.PostCommand != "" { stdout, stderr, err := execCommand(d.config.ShellEnv, d.config.PostCommand) + d.logger.Debug("run post-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { return nil, xerrors.Wrapf(err, "failed to execute post-command, stdout: %s, stderr: %s", stdout, stderr) } - - d.logger.Logt("post-command executed", stdout) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go index cdb62b8c..02dac427 100644 --- a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -2,13 +2,13 @@ import ( "context" + "log/slog" "strings" xerrors "github.com/pkg/errors" "github.com/qiniu/go-sdk/v7/auth" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/qiniu-sslcert" qiniusdk "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk" @@ -25,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *qiniusdk.Client sslUploader uploader.Uploader } @@ -49,14 +49,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -65,38 +70,35 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // "*.example.com" → ".example.com"，适配七牛云 CDN 要求的泛域名格式 domain := strings.TrimPrefix(d.config.Domain, "*") // 获取域名信息 // REF: https://developer.qiniu.com/fusion/4246/the-domain-name getDomainInfoResp, err := d.sdkClient.GetDomainInfo(context.TODO(), domain) + d.logger.Debug("sdk request 'cdn.GetDomainInfo'", slog.String("request.domain", domain), slog.Any("response", getDomainInfoResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.GetDomainInfo'") } - d.logger.Logt("已获取域名信息", getDomainInfoResp) - // 判断域名是否已启用 HTTPS。如果已启用，修改域名证书；否则，启用 HTTPS // REF: https://developer.qiniu.com/fusion/4246/the-domain-name if getDomainInfoResp.Https != nil && getDomainInfoResp.Https.CertID != "" { modifyDomainHttpsConfResp, err := d.sdkClient.ModifyDomainHttpsConf(context.TODO(), domain, upres.CertId, getDomainInfoResp.Https.ForceHttps, getDomainInfoResp.Https.Http2Enable) + d.logger.Debug("sdk request 'cdn.ModifyDomainHttpsConf'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", modifyDomainHttpsConfResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ModifyDomainHttpsConf'") } - - d.logger.Logt("已修改域名证书", modifyDomainHttpsConfResp) } else { enableDomainHttpsResp, err := d.sdkClient.EnableDomainHttps(context.TODO(), domain, upres.CertId, true, true) + d.logger.Debug("sdk request 'cdn.EnableDomainHttps'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", enableDomainHttpsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.EnableDomainHttps'") } - - d.logger.Logt("已将域名升级为 HTTPS", enableDomainHttpsResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go b/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go index b9121694..f684253b 100644 --- a/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go +++ b/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go @@ -2,12 +2,12 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" "github.com/qiniu/go-sdk/v7/pili" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/qiniu-sslcert" ) @@ -25,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *pili.Manager sslUploader uploader.Uploader } @@ -49,14 +49,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: manager, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -65,10 +70,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 修改域名证书配置 // REF: https://developer.qiniu.com/pili/9910/pili-service-sdk#66 setDomainCertReq := pili.SetDomainCertRequest{ @@ -77,11 +82,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe CertName: upres.CertName, } err = d.sdkClient.SetDomainCert(context.TODO(), setDomainCertReq) + d.logger.Debug("sdk request 'pili.SetDomainCert'", slog.Any("request", setDomainCertReq)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'pili.SetDomainCert'") } - d.logger.Logt("已修改域名证书配置") - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/safeline/safeline.go b/internal/pkg/core/deployer/providers/safeline/safeline.go index d0186100..8079027f 100644 --- a/internal/pkg/core/deployer/providers/safeline/safeline.go +++ b/internal/pkg/core/deployer/providers/safeline/safeline.go @@ -5,12 +5,12 @@ import ( "crypto/tls" "errors" "fmt" + "log/slog" "net/url" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" safelinesdk "github.com/usual2970/certimate/internal/pkg/vendors/safeline-sdk" ) @@ -30,7 +30,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *safelinesdk.Client } @@ -48,13 +48,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -88,10 +92,9 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPem stri }, } updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) + d.logger.Debug("sdk request 'safeline.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'safeline.UpdateCertificate'") - } else { - d.logger.Logt("已更新证书", updateCertificateResp) } return nil diff --git a/internal/pkg/core/deployer/providers/ssh/ssh.go b/internal/pkg/core/deployer/providers/ssh/ssh.go index a1617327..1a9c0841 100644 --- a/internal/pkg/core/deployer/providers/ssh/ssh.go +++ b/internal/pkg/core/deployer/providers/ssh/ssh.go @@ -1,9 +1,10 @@ -package ssh +package ssh import ( "bytes" "context" "fmt" + "log/slog" "os" "path/filepath" @@ -13,7 +14,6 @@ import ( "golang.org/x/crypto/ssh" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/certs" ) @@ -60,7 +60,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger } var _ deployer.Deployer = (*DeployerProvider)(nil) @@ -72,12 +72,16 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -96,16 +100,15 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe } defer client.Close() - d.logger.Logt("SSH connected") + d.logger.Info("ssh connected") // 执行前置命令 if d.config.PreCommand != "" { stdout, stderr, err := execSshCommand(client, d.config.PreCommand) + d.logger.Debug("run pre-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { return nil, xerrors.Wrapf(err, "failed to execute pre-command: stdout: %s, stderr: %s", stdout, stderr) } - - d.logger.Logt("SSH pre-command executed", stdout) } // 上传证书和私钥文件 @@ -114,42 +117,36 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err := writeFileString(client, d.config.UseSCP, d.config.OutputCertPath, certPem); err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } - - d.logger.Logt("certificate file uploaded") + d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath)) if err := writeFileString(client, d.config.UseSCP, d.config.OutputKeyPath, privkeyPem); err != nil { return nil, xerrors.Wrap(err, "failed to upload private key file") } - - d.logger.Logt("private key file uploaded") + d.logger.Info("ssl private key file uploaded", slog.String("path", d.config.OutputKeyPath)) case OUTPUT_FORMAT_PFX: pfxData, err := certs.TransformCertificateFromPEMToPFX(certPem, privkeyPem, d.config.PfxPassword) if err != nil { return nil, xerrors.Wrap(err, "failed to transform certificate to PFX") } - - d.logger.Logt("certificate transformed to PFX") + d.logger.Info("ssl certificate transformed to pfx") if err := writeFile(client, d.config.UseSCP, d.config.OutputCertPath, pfxData); err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } - - d.logger.Logt("certificate file uploaded") + d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath)) case OUTPUT_FORMAT_JKS: jksData, err := certs.TransformCertificateFromPEMToJKS(certPem, privkeyPem, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass) if err != nil { return nil, xerrors.Wrap(err, "failed to transform certificate to JKS") } - - d.logger.Logt("certificate transformed to JKS") + d.logger.Info("ssl certificate transformed to jks") if err := writeFile(client, d.config.UseSCP, d.config.OutputCertPath, jksData); err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } - - d.logger.Logt("certificate file uploaded") + d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath)) default: return nil, fmt.Errorf("unsupported output format: %s", d.config.OutputFormat) @@ -158,11 +155,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // 执行后置命令 if d.config.PostCommand != "" { stdout, stderr, err := execSshCommand(client, d.config.PostCommand) + d.logger.Debug("run post-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { return nil, xerrors.Wrapf(err, "failed to execute post-command, stdout: %s, stderr: %s", stdout, stderr) } - - d.logger.Logt("SSH post-command executed", stdout) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index 1784354d..da76c955 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "strings" xerrors "github.com/pkg/errors" @@ -12,7 +13,6 @@ import ( "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -28,7 +28,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -60,14 +60,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClients: clients, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -76,10 +81,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 获取待部署的 CDN 实例 // 如果是泛域名，根据证书匹配 CDN 实例 instanceIds := make([]string, 0) @@ -111,8 +116,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe } if len(instanceIds) == 0 { - d.logger.Logt("已部署过或没有要部署的 CDN 实例") + d.logger.Info("no cdn instances to deploy") } else { + d.logger.Info("found cdn instances to deploy", slog.Any("instanceIds", instanceIds)) + // 证书部署到 CDN 实例 // REF: https://cloud.tencent.com/document/product/400/91667 deployCertificateInstanceReq := tcSsl.NewDeployCertificateInstanceRequest() @@ -121,11 +128,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe deployCertificateInstanceReq.Status = common.Int64Ptr(1) deployCertificateInstanceReq.InstanceIdList = common.StringPtrs(instanceIds) deployCertificateInstanceResp, err := d.sdkClients.ssl.DeployCertificateInstance(deployCertificateInstanceReq) + d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") } - - d.logger.Logt("已部署证书到云资源实例", deployCertificateInstanceResp.Response) } return &deployer.DeployResult{}, nil @@ -138,6 +144,7 @@ func (d *DeployerProvider) getDomainsByCertificateId(cloudCertId string) ([]stri describeCertDomainsReq.CertId = common.StringPtr(cloudCertId) describeCertDomainsReq.Product = common.StringPtr("cdn") describeCertDomainsResp, err := d.sdkClients.cdn.DescribeCertDomains(describeCertDomainsReq) + d.logger.Debug("sdk request 'cdn.DescribeCertDomains'", slog.Any("request", describeCertDomainsReq), slog.Any("response", describeCertDomainsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertDomains'") } @@ -159,6 +166,7 @@ func (d *DeployerProvider) getDeployedDomainsByCertificateId(cloudCertId string) describeDeployedResourcesReq.CertificateIds = common.StringPtrs([]string{cloudCertId}) describeDeployedResourcesReq.ResourceType = common.StringPtr("cdn") describeDeployedResourcesResp, err := d.sdkClients.ssl.DescribeDeployedResources(describeDeployedResourcesReq) + d.logger.Debug("sdk request 'cdn.DescribeDeployedResources'", slog.Any("request", describeDeployedResourcesReq), slog.Any("response", describeDeployedResourcesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeDeployedResources'") } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go b/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go index 521f3e34..3f4e6600 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" xerrors "github.com/pkg/errors" tcClb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" @@ -12,7 +13,6 @@ import ( tcSsl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -39,7 +39,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -71,14 +71,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClients: clients, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -87,10 +92,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_VIA_SSLDEPLOY: @@ -142,12 +147,11 @@ func (d *DeployerProvider) deployViaSslService(ctx context.Context, cloudCertId deployCertificateInstanceReq.InstanceIdList = common.StringPtrs([]string{fmt.Sprintf("%s|%s|%s", d.config.LoadbalancerId, d.config.ListenerId, d.config.Domain)}) } deployCertificateInstanceResp, err := d.sdkClients.ssl.DeployCertificateInstance(deployCertificateInstanceReq) + d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") } - d.logger.Logt("已部署证书到云资源实例", deployCertificateInstanceResp.Response) - return nil } @@ -162,6 +166,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeListenersReq := tcClb.NewDescribeListenersRequest() describeListenersReq.LoadBalancerId = common.StringPtr(d.config.LoadbalancerId) describeListenersResp, err := d.sdkClients.clb.DescribeListeners(describeListenersReq) + d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'clb.DescribeListeners'") } else { @@ -176,12 +181,11 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId } } - d.logger.Logt("已查询到负载均衡器下的监听器", listenerIds) - // 遍历更新监听器证书 if len(listenerIds) == 0 { - return errors.New("listener not found") + d.logger.Info("no clb listeners to deploy") } else { + d.logger.Info("found https/tcpssl/quic listeners to deploy", slog.Any("listenerIds", listenerIds)) var errs []error for _, listenerId := range listenerIds { @@ -236,12 +240,11 @@ func (d *DeployerProvider) deployToRuleDomain(ctx context.Context, cloudCertId s CertId: common.StringPtr(cloudCertId), } modifyDomainAttributesResp, err := d.sdkClients.clb.ModifyDomainAttributes(modifyDomainAttributesReq) + d.logger.Debug("sdk request 'clb.ModifyDomainAttributes'", slog.Any("request", modifyDomainAttributesReq), slog.Any("response", modifyDomainAttributesResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'clb.ModifyDomainAttributes'") } - d.logger.Logt("已修改七层监听器转发规则的域名级别属性", modifyDomainAttributesResp.Response) - return nil } @@ -252,15 +255,13 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL describeListenersReq.LoadBalancerId = common.StringPtr(cloudLoadbalancerId) describeListenersReq.ListenerIds = common.StringPtrs([]string{cloudListenerId}) describeListenersResp, err := d.sdkClients.clb.DescribeListeners(describeListenersReq) + d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'clb.DescribeListeners'") - } - if len(describeListenersResp.Response.Listeners) == 0 { + } else if len(describeListenersResp.Response.Listeners) == 0 { return errors.New("listener not found") } - d.logger.Logt("已查询到监听器属性", describeListenersResp.Response) - // 修改监听器属性 // REF: https://cloud.tencent.com/document/product/214/30681 modifyListenerReq := tcClb.NewModifyListenerRequest() @@ -274,12 +275,11 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL modifyListenerReq.Certificate.SSLMode = common.StringPtr("UNIDIRECTIONAL") } modifyListenerResp, err := d.sdkClients.clb.ModifyListener(modifyListenerReq) + d.logger.Debug("sdk request 'clb.ModifyListener'", slog.Any("request", modifyListenerReq), slog.Any("response", modifyListenerResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'clb.ModifyListener'") } - d.logger.Logt("已修改监听器属性", modifyListenerResp.Response) - return nil } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go b/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go index becceab6..6bfa5976 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" @@ -11,7 +12,6 @@ import ( tcSsl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -31,7 +31,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *tcSsl.Client sslUploader uploader.Uploader } @@ -58,14 +58,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -81,10 +86,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 证书部署到 COS 实例 // REF: https://cloud.tencent.com/document/product/400/91667 deployCertificateInstanceReq := tcSsl.NewDeployCertificateInstanceRequest() @@ -93,12 +98,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe deployCertificateInstanceReq.Status = common.Int64Ptr(1) deployCertificateInstanceReq.InstanceIdList = common.StringPtrs([]string{fmt.Sprintf("%s#%s#%s", d.config.Region, d.config.Bucket, d.config.Domain)}) deployCertificateInstanceResp, err := d.sdkClient.DeployCertificateInstance(deployCertificateInstanceReq) + d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") } - d.logger.Logt("已部署证书到云资源实例", deployCertificateInstanceResp.Response) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go index ad5dbed5..66c6d57d 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" @@ -9,7 +10,6 @@ import ( tcLive "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -25,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *tcLive.Client sslUploader uploader.Uploader } @@ -52,14 +52,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -68,10 +73,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 绑定证书对应的播放域名 // REF: https://cloud.tencent.com/document/product/267/78655 modifyLiveDomainCertBindingsReq := &tcLive.ModifyLiveDomainCertBindingsRequest{ @@ -84,12 +89,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe CloudCertId: common.StringPtr(upres.CertId), } modifyLiveDomainCertBindingsResp, err := d.sdkClient.ModifyLiveDomainCertBindings(modifyLiveDomainCertBindingsReq) + d.logger.Debug("sdk request 'live.ModifyLiveDomainCertBindings'", slog.Any("request", modifyLiveDomainCertBindingsReq), slog.Any("response", modifyLiveDomainCertBindingsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ModifyLiveDomainCertBindings'") } - d.logger.Logt("已部署证书到云资源实例", modifyLiveDomainCertBindingsResp.Response) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index e9438898..3cfe70ff 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "strings" xerrors "github.com/pkg/errors" @@ -11,7 +12,6 @@ import ( tcSsl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -27,7 +27,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -59,14 +59,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClients: clients, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -75,10 +80,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 获取待部署的 CDN 实例 // 如果是泛域名，根据证书匹配 CDN 实例 instanceIds := make([]string, 0) @@ -94,8 +99,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe } if len(instanceIds) == 0 { - d.logger.Logt("已部署过或没有要部署的 ECDN 实例") + d.logger.Info("no ecdn instances to deploy") } else { + d.logger.Info("found ecdn instances to deploy", slog.Any("instanceIds", instanceIds)) + // 证书部署到 ECDN 实例 // REF: https://cloud.tencent.com/document/product/400/91667 deployCertificateInstanceReq := tcSsl.NewDeployCertificateInstanceRequest() @@ -104,11 +111,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe deployCertificateInstanceReq.Status = common.Int64Ptr(1) deployCertificateInstanceReq.InstanceIdList = common.StringPtrs(instanceIds) deployCertificateInstanceResp, err := d.sdkClients.ssl.DeployCertificateInstance(deployCertificateInstanceReq) + d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") } - - d.logger.Logt("已部署证书到云资源实例", deployCertificateInstanceResp.Response) } return &deployer.DeployResult{}, nil @@ -121,6 +127,7 @@ func (d *DeployerProvider) getDomainsByCertificateId(cloudCertId string) ([]stri describeCertDomainsReq.CertId = common.StringPtr(cloudCertId) describeCertDomainsReq.Product = common.StringPtr("ecdn") describeCertDomainsResp, err := d.sdkClients.cdn.DescribeCertDomains(describeCertDomainsReq) + d.logger.Debug("sdk request 'cdn.DescribeCertDomains'", slog.Any("request", describeCertDomainsReq), slog.Any("response", describeCertDomainsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertDomains'") } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go b/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go index 99669038..d28c7f5a 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -3,6 +3,7 @@ import ( "context" "errors" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" @@ -11,7 +12,6 @@ import ( tcTeo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -29,7 +29,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -61,14 +61,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClients: clients, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -81,10 +86,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 配置域名证书 // REF: https://cloud.tencent.com/document/product/1552/80764 modifyHostsCertificateReq := tcTeo.NewModifyHostsCertificateRequest() @@ -93,12 +98,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe modifyHostsCertificateReq.Hosts = common.StringPtrs([]string{d.config.Domain}) modifyHostsCertificateReq.ServerCertInfo = []*tcTeo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}} modifyHostsCertificateResp, err := d.sdkClients.teo.ModifyHostsCertificate(modifyHostsCertificateReq) + d.logger.Debug("sdk request 'teo.ModifyHostsCertificate'", slog.Any("request", modifyHostsCertificateReq), slog.Any("response", modifyHostsCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'teo.ModifyHostsCertificate'") } - d.logger.Logt("已配置域名证书", modifyHostsCertificateResp.Response) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go b/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go index 3a3aeb82..f136fa53 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" @@ -9,7 +10,6 @@ import ( tcScf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -27,7 +27,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *tcScf.Client sslUploader uploader.Uploader } @@ -54,14 +54,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -71,10 +76,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe getCustomDomainReq := tcScf.NewGetCustomDomainRequest() getCustomDomainReq.Domain = common.StringPtr(d.config.Domain) getCustomDomainResp, err := d.sdkClient.GetCustomDomain(getCustomDomainReq) + d.logger.Debug("sdk request 'scf.GetCustomDomain'", slog.Any("request", getCustomDomainReq), slog.Any("response", getCustomDomainResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'scf.GetCustomDomain'") - } else { - d.logger.Logt("已查看云函数自定义域名详情", getCustomDomainResp.Response) } // 上传证书到 SSL @@ -82,7 +86,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 更新云函数自定义域名 @@ -94,10 +98,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe } updateCustomDomainReq.Protocol = getCustomDomainResp.Response.Protocol updateCustomDomainResp, err := d.sdkClient.UpdateCustomDomain(updateCustomDomainReq) + d.logger.Debug("sdk request 'scf.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'scf.UpdateCustomDomain'") - } else { - d.logger.Logt("已设置点播域名 HTTPS 证书", updateCustomDomainResp.Response) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go b/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go index f943ad6e..acebc43e 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "time" xerrors "github.com/pkg/errors" @@ -12,7 +13,6 @@ import ( tcSsl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -32,7 +32,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *tcSsl.Client sslUploader uploader.Uploader } @@ -59,14 +59,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -82,10 +87,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 证书部署到云资源实例列表 // REF: https://cloud.tencent.com/document/product/400/91667 deployCertificateInstanceReq := tcSsl.NewDeployCertificateInstanceRequest() @@ -94,14 +99,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe deployCertificateInstanceReq.InstanceIdList = common.StringPtrs(d.config.ResourceIds) deployCertificateInstanceReq.Status = common.Int64Ptr(1) deployCertificateInstanceResp, err := d.sdkClient.DeployCertificateInstance(deployCertificateInstanceReq) + d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") } else if deployCertificateInstanceResp.Response == nil || deployCertificateInstanceResp.Response.DeployRecordId == nil { return nil, errors.New("failed to create deploy record") } - d.logger.Logt("已部署证书到云资源实例", deployCertificateInstanceResp.Response) - // 循环获取部署任务详情，等待任务状态变更 // REF: https://cloud.tencent.com.cn/document/api/400/91658 for { @@ -113,12 +117,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe describeHostDeployRecordDetailReq.DeployRecordId = common.StringPtr(fmt.Sprintf("%d", *deployCertificateInstanceResp.Response.DeployRecordId)) describeHostDeployRecordDetailReq.Limit = common.Uint64Ptr(100) describeHostDeployRecordDetailResp, err := d.sdkClient.DescribeHostDeployRecordDetail(describeHostDeployRecordDetailReq) + d.logger.Debug("sdk request 'ssl.DescribeHostDeployRecordDetail'", slog.Any("request", describeHostDeployRecordDetailReq), slog.Any("response", describeHostDeployRecordDetailResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DescribeHostDeployRecordDetail'") } if describeHostDeployRecordDetailResp.Response.TotalCount == nil { - return nil, errors.New("部署任务状态异常") + return nil, errors.New("unexpected deployment job status") } else { acc := int64(0) if describeHostDeployRecordDetailResp.Response.SuccessTotalCount != nil { @@ -129,12 +134,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe } if acc == *describeHostDeployRecordDetailResp.Response.TotalCount { - d.logger.Logt("已获取部署任务详情", describeHostDeployRecordDetailResp) break } } - d.logger.Logt("部署任务未完成 ...") + d.logger.Info("waiting for deployment job completion ...") time.Sleep(time.Second * 5) } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go b/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go index 77177469..92469390 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" @@ -9,7 +10,6 @@ import ( tcVod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -27,7 +27,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *tcVod.Client sslUploader uploader.Uploader } @@ -54,14 +54,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -71,7 +76,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 设置点播域名 HTTPS 证书 @@ -84,10 +89,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe setVodDomainCertificateReq.SubAppId = common.Uint64Ptr(uint64(d.config.SubAppId)) } setVodDomainCertificateResp, err := d.sdkClient.SetVodDomainCertificate(setVodDomainCertificateReq) + d.logger.Debug("sdk request 'vod.SetVodDomainCertificate'", slog.Any("request", setVodDomainCertificateReq), slog.Any("response", setVodDomainCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.SetVodDomainCertificate'") - } else { - d.logger.Logt("已设置点播域名 HTTPS 证书", setVodDomainCertificateResp.Response) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go b/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go index c84067ce..400b96b8 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go @@ -3,6 +3,7 @@ import ( "context" "errors" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" @@ -10,7 +11,6 @@ import ( tcWaf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -32,7 +32,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *tcWaf.Client sslUploader uploader.Uploader } @@ -59,14 +59,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -86,7 +91,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 查询单个 SaaS 型 WAF 域名详情 @@ -96,10 +101,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe describeDomainDetailsSaasReq.DomainId = common.StringPtr(d.config.DomainId) describeDomainDetailsSaasReq.InstanceId = common.StringPtr(d.config.InstanceId) describeDomainDetailsSaasResp, err := d.sdkClient.DescribeDomainDetailsSaas(describeDomainDetailsSaasReq) + d.logger.Debug("sdk request 'waf.DescribeDomainDetailsSaas'", slog.Any("request", describeDomainDetailsSaasReq), slog.Any("response", describeDomainDetailsSaasResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDomainDetailsSaas'") - } else { - d.logger.Logt("已查询到 SaaS 型 WAF 域名详情", describeDomainDetailsSaasResp.Response) } // 编辑 SaaS 型 WAF 域名 @@ -111,10 +115,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe modifySpartaProtectionReq.CertType = common.Int64Ptr(2) modifySpartaProtectionReq.SSLId = common.StringPtr(upres.CertId) modifySpartaProtectionResp, err := d.sdkClient.ModifySpartaProtection(modifySpartaProtectionReq) + d.logger.Debug("sdk request 'waf.ModifySpartaProtection'", slog.Any("request", modifySpartaProtectionReq), slog.Any("response", modifySpartaProtectionResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifySpartaProtection'") - } else { - d.logger.Logt("已编辑 SaaS 型 WAF 域名", modifySpartaProtectionResp.Response) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go b/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go index 8c19621b..117cf9fb 100644 --- a/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go +++ b/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go @@ -3,6 +3,7 @@ import ( "context" "errors" + "log/slog" "strconv" xerrors "github.com/pkg/errors" @@ -11,7 +12,6 @@ import ( uAuth "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/ucloud-ussl" ) @@ -29,7 +29,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *uCdn.UCDNClient sslUploader uploader.Uploader } @@ -57,14 +57,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -73,10 +78,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 获取加速域名配置 // REF: https://docs.ucloud.cn/api/ucdn-api/get_ucdn_domain_config getUcdnDomainConfigReq := d.sdkClient.NewGetUcdnDomainConfigRequest() @@ -85,14 +90,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe getUcdnDomainConfigReq.ProjectId = usdk.String(d.config.ProjectId) } getUcdnDomainConfigResp, err := d.sdkClient.GetUcdnDomainConfig(getUcdnDomainConfigReq) + d.logger.Debug("sdk request 'ucdn.GetUcdnDomainConfig'", slog.Any("request", getUcdnDomainConfigReq), slog.Any("response", getUcdnDomainConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ucdn.GetUcdnDomainConfig'") } else if len(getUcdnDomainConfigResp.DomainList) == 0 { return nil, errors.New("no domain found") } - d.logger.Logt("已查询到加速域名配置", getUcdnDomainConfigResp) - // 更新 HTTPS 加速配置 // REF: https://docs.ucloud.cn/api/ucdn-api/update_ucdn_domain_https_config_v2 certId, _ := strconv.Atoi(upres.CertId) @@ -108,12 +112,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe updateUcdnDomainHttpsConfigV2Req.ProjectId = usdk.String(d.config.ProjectId) } updateUcdnDomainHttpsConfigV2Resp, err := d.sdkClient.UpdateUcdnDomainHttpsConfigV2(updateUcdnDomainHttpsConfigV2Req) + d.logger.Debug("sdk request 'ucdn.UpdateUcdnDomainHttpsConfigV2'", slog.Any("request", updateUcdnDomainHttpsConfigV2Req), slog.Any("response", updateUcdnDomainHttpsConfigV2Resp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ucdn.UpdateUcdnDomainHttpsConfigV2'") } - d.logger.Logt("已更新 HTTPS 加速配置", updateUcdnDomainHttpsConfigV2Resp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go b/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go index 592a1cf6..2d043a5d 100644 --- a/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go +++ b/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go @@ -2,13 +2,13 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" usdk "github.com/ucloud/ucloud-sdk-go/ucloud" uAuth "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/ucloud-ussl" usdkFile "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ufile" @@ -31,7 +31,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *usdkFile.UFileClient sslUploader uploader.Uploader } @@ -59,14 +59,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -75,10 +80,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 添加 SSL 证书 // REF: https://docs.ucloud.cn/api/ufile-api/add_ufile_ssl_cert addUFileSSLCertReq := d.sdkClient.NewAddUFileSSLCertRequest() @@ -90,12 +95,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe addUFileSSLCertReq.ProjectId = usdk.String(d.config.ProjectId) } addUFileSSLCertResp, err := d.sdkClient.AddUFileSSLCert(addUFileSSLCertReq) + d.logger.Debug("sdk request 'us3.AddUFileSSLCert'", slog.Any("request", addUFileSSLCertReq), slog.Any("response", addUFileSSLCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ucdn.AddUFileSSLCert'") + return nil, xerrors.Wrap(err, "failed to execute sdk request 'us3.AddUFileSSLCert'") } - d.logger.Logt("添加 SSL 证书", addUFileSSLCertResp) - return &deployer.DeployResult{}, nil } diff --git a/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go b/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go index 229c3c01..88f05415 100644 --- a/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go +++ b/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go @@ -3,14 +3,13 @@ import ( "context" "errors" - "fmt" + "log/slog" "strings" xerrors "github.com/pkg/errors" veCdn "github.com/volcengine/volc-sdk-golang/service/cdn" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-cdn" ) @@ -26,7 +25,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *veCdn.CDN sslUploader uploader.Uploader } @@ -52,14 +51,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -68,10 +72,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - domains := make([]string, 0) if strings.HasPrefix(d.config.Domain, "*.") { // 获取指定证书可关联的域名 @@ -80,6 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe CertId: upres.CertId, } describeCertConfigResp, err := d.sdkClient.DescribeCertConfig(describeCertConfigReq) + d.logger.Debug("sdk request 'cdn.DescribeCertConfig'", slog.Any("request", describeCertConfigReq), slog.Any("response", describeCertConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertConfig'") } @@ -99,6 +104,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if len(domains) == 0 { if len(describeCertConfigResp.Result.SpecifiedCertConfig) > 0 { // 所有可关联的域名都配置了该证书，跳过部署 + d.logger.Info("no domains to deploy") } else { return nil, errors.New("domain not found") } @@ -118,10 +124,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe Domain: domain, } batchDeployCertResp, err := d.sdkClient.BatchDeployCert(batchDeployCertReq) + d.logger.Debug("sdk request 'cdn.BatchDeployCert'", slog.Any("request", batchDeployCertReq), slog.Any("response", batchDeployCertResp)) if err != nil { errs = append(errs, err) - } else { - d.logger.Logt(fmt.Sprintf("已关联证书到域名 %s", domain), batchDeployCertResp) } } diff --git a/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go b/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go index 2b248adc..b3ba7241 100644 --- a/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go +++ b/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" xerrors "github.com/pkg/errors" veClb "github.com/volcengine/volcengine-go-sdk/service/clb" @@ -11,7 +12,6 @@ import ( veSession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-certcenter" ) @@ -32,7 +32,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *veClb.CLB sslUploader uploader.Uploader } @@ -60,14 +60,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -76,10 +81,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_LISTENER: @@ -107,10 +112,9 @@ func (d *DeployerProvider) deployToListener(ctx context.Context, cloudCertId str CertCenterCertificateId: ve.String(cloudCertId), } modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) + d.logger.Debug("sdk request 'clb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'clb.ModifyListenerAttributes'") - } else { - d.logger.Logt("已修改监听器", modifyListenerAttributesResp) } return nil diff --git a/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go b/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go index 835eae4b..0b9de8a7 100644 --- a/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go +++ b/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "strings" xerrors "github.com/pkg/errors" @@ -10,7 +11,6 @@ import ( veSession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-certcenter" ) @@ -28,7 +28,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *veDcdn.DCDN sslUploader uploader.Uploader } @@ -56,14 +56,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -72,10 +77,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // "*.example.com" → ".example.com"，适配火山引擎 DCDN 要求的泛域名格式 domain := strings.TrimPrefix(d.config.Domain, "*") @@ -87,10 +92,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe DomainNames: ve.StringSlice([]string{domain}), } createCertBindResp, err := d.sdkClient.CreateCertBind(createCertBindReq) + d.logger.Debug("sdk request 'dcdn.CreateCertBind'", slog.Any("request", createCertBindReq), slog.Any("response", createCertBindResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'dcdn.CreateCertBind'") - } else { - d.logger.Logt("已绑定证书", createCertBindResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go b/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go index 1bd6d109..f3ac68bf 100644 --- a/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go +++ b/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go @@ -3,13 +3,13 @@ import ( "context" "errors" + "log/slog" xerrors "github.com/pkg/errors" veBase "github.com/volcengine/volc-sdk-golang/base" veImageX "github.com/volcengine/volc-sdk-golang/service/imagex/v2" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-certcenter" ) @@ -29,7 +29,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *veImageX.Imagex sslUploader uploader.Uploader } @@ -57,14 +57,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -81,7 +86,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") } else { - d.logger.Logt("certificate file uploaded", upres) + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } // 获取域名配置 @@ -91,10 +96,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe DomainName: d.config.Domain, } getDomainConfigResp, err := d.sdkClient.GetDomainConfig(context.TODO(), getDomainConfigReq) + d.logger.Debug("sdk request 'imagex.GetDomainConfig'", slog.Any("request", getDomainConfigReq), slog.Any("response", getDomainConfigResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'imagex.GetDomainConfig'") - } else { - d.logger.Logt("已获取域名配置", getDomainConfigResp) } // 更新 HTTPS 配置 @@ -121,10 +125,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe updateHttpsReq.UpdateHTTPSBody.HTTPS.ForceRedirectCode = getDomainConfigResp.Result.HTTPSConfig.ForceRedirectCode } updateHttpsResp, err := d.sdkClient.UpdateHTTPS(context.TODO(), updateHttpsReq) + d.logger.Debug("sdk request 'imagex.UpdateHttps'", slog.Any("request", updateHttpsReq), slog.Any("response", updateHttpsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'imagex.UpdateHttps'") - } else { - d.logger.Logt("已更新 HTTPS 配置", updateHttpsResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go b/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go index 240e5c9c..15073743 100644 --- a/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go +++ b/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go @@ -3,7 +3,7 @@ import ( "context" "errors" - "fmt" + "log/slog" "strings" xerrors "github.com/pkg/errors" @@ -11,7 +11,6 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-live" ) @@ -27,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *veLive.Live sslUploader uploader.Uploader } @@ -53,14 +52,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -69,10 +73,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - domains := make([]string, 0) if strings.HasPrefix(d.config.Domain, "*.") { listDomainDetailPageNum := int32(1) @@ -86,6 +90,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe PageSize: listDomainDetailPageSize, } listDomainDetailResp, err := d.sdkClient.ListDomainDetail(ctx, listDomainDetailReq) + d.logger.Debug("sdk request 'live.ListDomainDetail'", slog.Any("request", listDomainDetailReq), slog.Any("response", listDomainDetailResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ListDomainDetail'") } @@ -110,7 +115,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe } if len(domains) == 0 { - return nil, xerrors.Errorf("未查询到匹配的域名: %s", d.config.Domain) + return nil, errors.New("domain not found") } } else { domains = append(domains, d.config.Domain) @@ -128,10 +133,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe HTTPS: ve.Bool(true), } bindCertResp, err := d.sdkClient.BindCert(ctx, bindCertReq) + d.logger.Debug("sdk request 'live.BindCert'", slog.Any("request", bindCertReq), slog.Any("response", bindCertResp)) if err != nil { errs = append(errs, err) - } else { - d.logger.Logt(fmt.Sprintf("已绑定证书到域名 %s", domain), bindCertResp) } } diff --git a/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go b/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go index 142a8b9f..d4bd6e59 100644 --- a/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go +++ b/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go @@ -4,12 +4,12 @@ import ( "context" "errors" "fmt" + "log/slog" xerrors "github.com/pkg/errors" veTos "github.com/volcengine/ve-tos-golang-sdk/v2/tos" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-certcenter" ) @@ -29,7 +29,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger sdkClient *veTos.ClientV2 sslUploader uploader.Uploader } @@ -57,14 +57,19 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), sdkClient: client, sslUploader: uploader, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) return d } @@ -80,10 +85,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - d.logger.Logt("certificate file uploaded", upres) - // 设置自定义域名 // REF: https://www.volcengine.com/docs/6559/1250189 putBucketCustomDomainReq := &veTos.PutBucketCustomDomainInput{ @@ -94,10 +99,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe }, } putBucketCustomDomainResp, err := d.sdkClient.PutBucketCustomDomain(context.TODO(), putBucketCustomDomainReq) + d.logger.Debug("sdk request 'tos.PutBucketCustomDomain'", slog.Any("request", putBucketCustomDomainReq), slog.Any("response", putBucketCustomDomainResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'tos.PutBucketCustomDomain'") - } else { - d.logger.Logt("已设置自定义域名", putBucketCustomDomainResp) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/webhook/webhook.go b/internal/pkg/core/deployer/providers/webhook/webhook.go index 6a1e8a21..3cfd85ca 100644 --- a/internal/pkg/core/deployer/providers/webhook/webhook.go +++ b/internal/pkg/core/deployer/providers/webhook/webhook.go @@ -4,6 +4,7 @@ import ( "context" "crypto/tls" "encoding/json" + "log/slog" "strings" "time" @@ -11,7 +12,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" - "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/certs" ) @@ -26,7 +26,7 @@ type DeployerConfig struct { type DeployerProvider struct { config *DeployerConfig - logger logger.Logger + logger *slog.Logger httpClient *resty.Client } @@ -47,13 +47,17 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return &DeployerProvider{ config: config, - logger: logger.NewNilLogger(), + logger: slog.Default(), httpClient: client, }, nil } -func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { - d.logger = logger +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } return d } @@ -86,18 +90,18 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe return nil, xerrors.Errorf("unexpected webhook response status code: %d", resp.StatusCode()) } - d.logger.Logt("Webhook request sent", resp.String()) + d.logger.Debug("webhook responded", slog.Any("response", resp.String())) return &deployer.DeployResult{}, nil } func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { switch v := data.(type) { - case map[string]interface{}: + case map[string]any: for k, val := range v { v[k] = replaceJsonValueRecursively(val, oldStr, newStr) } - case []interface{}: + case []any: for i, val := range v { v[i] = replaceJsonValueRecursively(val, oldStr, newStr) } diff --git a/internal/pkg/core/logger/builtin.go b/internal/pkg/core/logger/builtin.go deleted file mode 100644 index fa8932dc..00000000 --- a/internal/pkg/core/logger/builtin.go +++ /dev/null @@ -1,94 +0,0 @@ -package logger - -import ( - "encoding/json" - "fmt" - "reflect" - "strings" - - "github.com/usual2970/certimate/internal/pkg/utils/types" -) - -// 表示默认的日志记录器类型。 -type DefaultLogger struct { - records []string -} - -var _ Logger = (*DefaultLogger)(nil) - -func (l *DefaultLogger) Logt(tag string, data ...any) { - l.ensureInitialized() - - temp := make([]string, len(data)+1) - temp[0] = tag - for i, v := range data { - s := "" - if types.IsNil(v) { - s = "" - } else { - switch reflect.ValueOf(v).Kind() { - case reflect.String: - s = v.(string) - case reflect.Bool, - reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, - reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, - reflect.Float32, reflect.Float64: - s = fmt.Sprintf("%v", v) - default: - jbytes, _ := json.Marshal(v) - s = string(jbytes) - } - } - - temp[i+1] = s - } - - l.records = append(l.records, strings.Join(temp, ": ")) -} - -func (l *DefaultLogger) Logf(format string, args ...any) { - l.ensureInitialized() - - l.records = append(l.records, fmt.Sprintf(format, args...)) -} - -func (l *DefaultLogger) GetRecords() []string { - l.ensureInitialized() - - temp := make([]string, len(l.records)) - copy(temp, l.records) - return temp -} - -func (l *DefaultLogger) FlushRecords() { - l.records = make([]string, 0) -} - -func (l *DefaultLogger) ensureInitialized() { - if l.records == nil { - l.records = make([]string, 0) - } -} - -func NewDefaultLogger() *DefaultLogger { - return &DefaultLogger{ - records: make([]string, 0), - } -} - -// 表示空的日志记录器类型。 -// 该日志记录器不会执行任何操作。 -type NilLogger struct{} - -var _ Logger = (*NilLogger)(nil) - -func (l *NilLogger) Logt(string, ...any) {} -func (l *NilLogger) Logf(string, ...any) {} -func (l *NilLogger) GetRecords() []string { - return make([]string, 0) -} -func (l *NilLogger) FlushRecords() {} - -func NewNilLogger() *NilLogger { - return &NilLogger{} -} diff --git a/internal/pkg/core/logger/logger.go b/internal/pkg/core/logger/logger.go deleted file mode 100644 index cc6284cd..00000000 --- a/internal/pkg/core/logger/logger.go +++ /dev/null @@ -1,27 +0,0 @@ -package logger - -// 表示定义日志记录器的抽象类型接口。 -type Logger interface { - // 追加一条日志记录。 - // 该方法会将 `data` 以 JSON 序列化后拼接到 `tag` 结尾。 - // - // 入参： - // - tag：标签。 - // - data：数据。 - Logt(tag string, data ...any) - - // 追加一条日志记录。 - // 该方法会将 `args` 以 `format` 格式化。 - // - // 入参： - // - format：格式化字符串。 - // - args：格式化参数。 - Logf(format string, args ...any) - - // 获取所有日志记录。 - // TODO: 记录时间 - GetRecords() []string - - // 清空所有日志记录。 - FlushRecords() -} diff --git a/internal/pkg/core/logger/logger_test.go b/internal/pkg/core/logger/logger_test.go deleted file mode 100644 index e131a7b1..00000000 --- a/internal/pkg/core/logger/logger_test.go +++ /dev/null @@ -1,56 +0,0 @@ -package logger_test - -import ( - "testing" - - "github.com/usual2970/certimate/internal/pkg/core/logger" -) - -/* -Shell command to run this test: - - go test -v ./logger_test.go -*/ -func TestLogger(t *testing.T) { - t.Run("Logger_Appendt", func(t *testing.T) { - logger := logger.NewDefaultLogger() - - logger.Logt("test") - logger.Logt("test_nil", nil) - logger.Logt("test_int", 1024) - logger.Logt("test_string", "certimate") - logger.Logt("test_map", map[string]interface{}{"key": "value"}) - logger.Logt("test_struct", struct{ Name string }{Name: "certimate"}) - logger.Logt("test_slice", []string{"certimate"}) - t.Log(logger.GetRecords()) - if len(logger.GetRecords()) != 7 { - t.Errorf("expected 7 records, got %d", len(logger.GetRecords())) - } - - logger.FlushRecords() - if len(logger.GetRecords()) != 0 { - t.Errorf("expected 0 records, got %d", len(logger.GetRecords())) - } - }) - - t.Run("Logger_Appendf", func(t *testing.T) { - logger := logger.NewDefaultLogger() - - logger.Logf("test") - logger.Logf("test_nil: %v", nil) - logger.Logf("test_int: %v", 1024) - logger.Logf("test_string: %v", "certimate") - logger.Logf("test_map: %v", map[string]interface{}{"key": "value"}) - logger.Logf("test_struct: %v", struct{ Name string }{Name: "certimate"}) - logger.Logf("test_slice: %v", []string{"certimate"}) - t.Log(logger.GetRecords()) - if len(logger.GetRecords()) != 7 { - t.Errorf("expected 7 records, got %d", len(logger.GetRecords())) - } - - logger.FlushRecords() - if len(logger.GetRecords()) != 0 { - t.Errorf("expected 0 records, got %d", len(logger.GetRecords())) - } - }) -} diff --git a/internal/pkg/core/notifier/notifier.go b/internal/pkg/core/notifier/notifier.go index 22fc8574..97485215 100644 --- a/internal/pkg/core/notifier/notifier.go +++ b/internal/pkg/core/notifier/notifier.go @@ -1,9 +1,14 @@ package notifier -import "context" +import ( + "context" + "log/slog" +) // 表示定义消息通知器的抽象类型接口。 type Notifier interface { + WithLogger(logger *slog.Logger) Notifier + // 发送通知。 // // 入参： diff --git a/internal/pkg/core/notifier/providers/bark/bark.go b/internal/pkg/core/notifier/providers/bark/bark.go index f9589096..a6833ae1 100644 --- a/internal/pkg/core/notifier/providers/bark/bark.go +++ b/internal/pkg/core/notifier/providers/bark/bark.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "github.com/nikoksr/notify" "github.com/nikoksr/notify/service/bark" @@ -19,6 +20,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -33,6 +35,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { var srv notify.Notifier if n.config.ServerUrl == "" { diff --git a/internal/pkg/core/notifier/providers/dingtalk/dingtalk.go b/internal/pkg/core/notifier/providers/dingtalk/dingtalk.go index f8eba8a7..f0ab4741 100644 --- a/internal/pkg/core/notifier/providers/dingtalk/dingtalk.go +++ b/internal/pkg/core/notifier/providers/dingtalk/dingtalk.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "github.com/nikoksr/notify/service/dingding" @@ -17,6 +18,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -31,6 +33,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { srv := dingding.New(&dingding.Config{ Token: n.config.AccessToken, diff --git a/internal/pkg/core/notifier/providers/email/email.go b/internal/pkg/core/notifier/providers/email/email.go index 4a69d50a..ebf2d150 100644 --- a/internal/pkg/core/notifier/providers/email/email.go +++ b/internal/pkg/core/notifier/providers/email/email.go @@ -4,6 +4,7 @@ import ( "context" "crypto/tls" "fmt" + "log/slog" "net/smtp" "github.com/domodwyer/mailyak/v3" @@ -31,6 +32,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -45,6 +47,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { var smtpAuth smtp.Auth if n.config.Username != "" || n.config.Password != "" { diff --git a/internal/pkg/core/notifier/providers/lark/lark.go b/internal/pkg/core/notifier/providers/lark/lark.go index 9c92691a..150f4e04 100644 --- a/internal/pkg/core/notifier/providers/lark/lark.go +++ b/internal/pkg/core/notifier/providers/lark/lark.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "github.com/nikoksr/notify/service/lark" @@ -15,6 +16,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -29,6 +31,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { srv := lark.NewWebhookService(n.config.WebhookUrl) diff --git a/internal/pkg/core/notifier/providers/serverchan/serverchan.go b/internal/pkg/core/notifier/providers/serverchan/serverchan.go index 51df0893..ac4d9fe6 100644 --- a/internal/pkg/core/notifier/providers/serverchan/serverchan.go +++ b/internal/pkg/core/notifier/providers/serverchan/serverchan.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "net/http" notifyHttp "github.com/nikoksr/notify/service/http" @@ -16,6 +17,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -30,6 +32,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { srv := notifyHttp.New() diff --git a/internal/pkg/core/notifier/providers/telegram/telegram.go b/internal/pkg/core/notifier/providers/telegram/telegram.go index 6a1889b3..c3a2e973 100644 --- a/internal/pkg/core/notifier/providers/telegram/telegram.go +++ b/internal/pkg/core/notifier/providers/telegram/telegram.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "github.com/nikoksr/notify/service/telegram" @@ -17,6 +18,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -31,6 +33,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { srv, err := telegram.New(n.config.ApiToken) if err != nil { diff --git a/internal/pkg/core/notifier/providers/webhook/webhook.go b/internal/pkg/core/notifier/providers/webhook/webhook.go index f753645a..e11e5487 100644 --- a/internal/pkg/core/notifier/providers/webhook/webhook.go +++ b/internal/pkg/core/notifier/providers/webhook/webhook.go @@ -3,6 +3,7 @@ import ( "context" "crypto/tls" + "log/slog" "net/http" webhook "github.com/nikoksr/notify/service/http" @@ -19,6 +20,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -33,6 +35,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { srv := webhook.New() srv.AddReceiversURLs(n.config.Url) diff --git a/internal/pkg/core/notifier/providers/wecom/wecom.go b/internal/pkg/core/notifier/providers/wecom/wecom.go index 63342cb5..ef76e97f 100644 --- a/internal/pkg/core/notifier/providers/wecom/wecom.go +++ b/internal/pkg/core/notifier/providers/wecom/wecom.go @@ -2,6 +2,7 @@ import ( "context" + "log/slog" "net/http" notifyHttp "github.com/nikoksr/notify/service/http" @@ -16,6 +17,7 @@ type NotifierConfig struct { type NotifierProvider struct { config *NotifierConfig + logger *slog.Logger } var _ notifier.Notifier = (*NotifierProvider)(nil) @@ -30,6 +32,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { }, nil } +func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { + if logger == nil { + n.logger = slog.Default() + } else { + n.logger = logger + } + return n +} + func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) { srv := notifyHttp.New() diff --git a/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go b/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go index bb612bec..ee00c06a 100644 --- a/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go +++ b/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "net/url" "strings" "time" @@ -23,6 +24,7 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig + logger *slog.Logger sdkClient *opsdk.Client } @@ -40,15 +42,26 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 遍历证书列表，避免重复上传 if res, err := u.getExistCert(ctx, certPem, privkeyPem); err != nil { return nil, err } else if res != nil { + u.logger.Info("ssl certificate already exists") return res, nil } @@ -63,6 +76,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe PrivateKey: privkeyPem, } uploadWebsiteSSLResp, err := u.sdkClient.UploadWebsiteSSL(uploadWebsiteSSLReq) + u.logger.Debug("sdk request '1panel.UploadWebsiteSSL'", slog.Any("request", uploadWebsiteSSLReq), slog.Any("response", uploadWebsiteSSLResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.UploadWebsiteSSL'") } @@ -86,6 +100,7 @@ func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string, pri PageSize: searchWebsiteSSLPageSize, } searchWebsiteSSLResp, err := u.sdkClient.SearchWebsiteSSL(searchWebsiteSSLReq) + u.logger.Debug("sdk request '1panel.SearchWebsiteSSL'", slog.Any("request", searchWebsiteSSLReq), slog.Any("response", searchWebsiteSSLResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.SearchWebsiteSSL'") } @@ -93,7 +108,7 @@ func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string, pri for _, sslItem := range searchWebsiteSSLResp.Data.Items { if strings.TrimSpace(sslItem.PEM) == strings.TrimSpace(certPem) && strings.TrimSpace(sslItem.PrivateKey) == strings.TrimSpace(privkeyPem) { - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 return &uploader.UploadResult{ CertId: fmt.Sprintf("%d", sslItem.ID), CertName: sslItem.Description, diff --git a/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go b/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go index 2b582409..ed53f214 100644 --- a/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go +++ b/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go @@ -3,11 +3,12 @@ import ( "context" "fmt" + "log/slog" "strings" "time" - aliyunCas "github.com/alibabacloud-go/cas-20200407/v3/client" - aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" + alicas "github.com/alibabacloud-go/cas-20200407/v3/client" + aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" xerrors "github.com/pkg/errors" @@ -26,7 +27,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *aliyunCas.Client + logger *slog.Logger + sdkClient *alicas.Client } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -36,21 +38,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKeyId, - config.AccessKeySecret, - config.Region, - ) + client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -64,12 +72,13 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listUserCertificateOrderPage := int64(1) listUserCertificateOrderLimit := int64(50) for { - listUserCertificateOrderReq := &aliyunCas.ListUserCertificateOrderRequest{ + listUserCertificateOrderReq := &alicas.ListUserCertificateOrderRequest{ CurrentPage: tea.Int64(listUserCertificateOrderPage), ShowSize: tea.Int64(listUserCertificateOrderLimit), OrderType: tea.String("CERT"), } listUserCertificateOrderResp, err := u.sdkClient.ListUserCertificateOrder(listUserCertificateOrderReq) + u.logger.Debug("sdk request 'cas.ListUserCertificateOrder'", slog.Any("request", listUserCertificateOrderReq), slog.Any("response", listUserCertificateOrderResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.ListUserCertificateOrder'") } @@ -77,10 +86,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe if listUserCertificateOrderResp.Body.CertificateOrderList != nil { for _, certDetail := range listUserCertificateOrderResp.Body.CertificateOrderList { if strings.EqualFold(certX509.SerialNumber.Text(16), *certDetail.SerialNo) { - getUserCertificateDetailReq := &aliyunCas.GetUserCertificateDetailRequest{ + getUserCertificateDetailReq := &alicas.GetUserCertificateDetailRequest{ CertId: certDetail.CertificateId, } getUserCertificateDetailResp, err := u.sdkClient.GetUserCertificateDetail(getUserCertificateDetailReq) + u.logger.Debug("sdk request 'cas.GetUserCertificateDetail'", slog.Any("request", getUserCertificateDetailReq), slog.Any("response", getUserCertificateDetailResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.GetUserCertificateDetail'") } @@ -97,8 +107,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe isSameCert = certs.EqualCertificate(certX509, oldCertX509) } - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: fmt.Sprintf("%d", tea.Int64Value(certDetail.CertificateId)), CertName: *certDetail.Name, @@ -121,12 +132,13 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://help.aliyun.com/zh/ssl-certificate/developer-reference/api-cas-2020-04-07-uploadusercertificate - uploadUserCertificateReq := &aliyunCas.UploadUserCertificateRequest{ + uploadUserCertificateReq := &alicas.UploadUserCertificateRequest{ Name: tea.String(certName), Cert: tea.String(certPem), Key: tea.String(privkeyPem), } uploadUserCertificateResp, err := u.sdkClient.UploadUserCertificate(uploadUserCertificateReq) + u.logger.Debug("sdk request 'cas.UploadUserCertificate'", slog.Any("request", uploadUserCertificateReq), slog.Any("response", uploadUserCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.UploadUserCertificate'") } @@ -138,7 +150,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunCas.Client, error) { +func createSdkClient(accessKeyId, accessKeySecret, region string) (*alicas.Client, error) { if region == "" { region = "cn-hangzhou" // CAS 服务默认区域：华东一杭州 } @@ -152,13 +164,13 @@ func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunCas.Cl endpoint = fmt.Sprintf("cas.%s.aliyuncs.com", region) } - config := &aliyunOpen.Config{ + config := &aliopen.Config{ Endpoint: tea.String(endpoint), AccessKeyId: tea.String(accessKeyId), AccessKeySecret: tea.String(accessKeySecret), } - client, err := aliyunCas.NewClient(config) + client, err := alicas.NewClient(config) if err != nil { return nil, err } diff --git a/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go b/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go index d687822a..4dcdd7ba 100644 --- a/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go +++ b/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go @@ -5,12 +5,13 @@ import ( "crypto/sha256" "encoding/hex" "fmt" + "log/slog" "regexp" "strings" "time" - aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - aliyunSlb "github.com/alibabacloud-go/slb-20140515/v4/client" + aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" + alislb "github.com/alibabacloud-go/slb-20140515/v4/client" "github.com/alibabacloud-go/tea/tea" xerrors "github.com/pkg/errors" @@ -29,7 +30,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *aliyunSlb.Client + logger *slog.Logger + sdkClient *alislb.Client } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -39,21 +41,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKeyId, - config.AccessKeySecret, - config.Region, - ) + client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -63,10 +71,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 查询证书列表，避免重复上传 // REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-describeservercertificates - describeServerCertificatesReq := &aliyunSlb.DescribeServerCertificatesRequest{ + describeServerCertificatesReq := &alislb.DescribeServerCertificatesRequest{ RegionId: tea.String(u.config.Region), } describeServerCertificatesResp, err := u.sdkClient.DescribeServerCertificates(describeServerCertificatesReq) + u.logger.Debug("sdk request 'slb.DescribeServerCertificates'", slog.Any("request", describeServerCertificatesReq), slog.Any("response", describeServerCertificatesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeServerCertificates'") } @@ -78,8 +87,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe isSameCert := *certDetail.IsAliCloudCertificate == 0 && strings.EqualFold(fingerprintHex, strings.ReplaceAll(*certDetail.Fingerprint, ":", "")) && strings.EqualFold(certX509.Subject.CommonName, *certDetail.CommonName) - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: *certDetail.ServerCertificateId, CertName: *certDetail.ServerCertificateName, @@ -100,13 +110,14 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-uploadservercertificate - uploadServerCertificateReq := &aliyunSlb.UploadServerCertificateRequest{ + uploadServerCertificateReq := &alislb.UploadServerCertificateRequest{ RegionId: tea.String(u.config.Region), ServerCertificateName: tea.String(certName), ServerCertificate: tea.String(certPem), PrivateKey: tea.String(privkeyPem), } uploadServerCertificateResp, err := u.sdkClient.UploadServerCertificate(uploadServerCertificateReq) + u.logger.Debug("sdk request 'slb.UploadServerCertificate'", slog.Any("request", uploadServerCertificateReq), slog.Any("response", uploadServerCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'slb.UploadServerCertificate'") } @@ -118,7 +129,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunSlb.Client, error) { +func createSdkClient(accessKeyId, accessKeySecret, region string) (*alislb.Client, error) { // 接入点一览 https://api.aliyun.com/product/Slb var endpoint string switch region { @@ -132,13 +143,13 @@ func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunSlb.Cl endpoint = fmt.Sprintf("slb.%s.aliyuncs.com", region) } - config := &aliyunOpen.Config{ + config := &aliopen.Config{ Endpoint: tea.String(endpoint), AccessKeyId: tea.String(accessKeyId), AccessKeySecret: tea.String(accessKeySecret), } - client, err := aliyunSlb.NewClient(config) + client, err := alislb.NewClient(config) if err != nil { return nil, err } diff --git a/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go b/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go index 2f5db477..df7bb9c9 100644 --- a/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go +++ b/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go @@ -2,11 +2,12 @@ import ( "context" + "log/slog" aws "github.com/aws/aws-sdk-go-v2/aws" - awsCfg "github.com/aws/aws-sdk-go-v2/config" - awsCred "github.com/aws/aws-sdk-go-v2/credentials" - awsAcm "github.com/aws/aws-sdk-go-v2/service/acm" + awscfg "github.com/aws/aws-sdk-go-v2/config" + awscred "github.com/aws/aws-sdk-go-v2/credentials" + awsacm "github.com/aws/aws-sdk-go-v2/service/acm" xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" @@ -25,7 +26,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *awsAcm.Client + logger *slog.Logger + sdkClient *awsacm.Client } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -42,10 +44,20 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -62,11 +74,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listCertificatesNextToken := new(string) listCertificatesMaxItems := int32(1000) for { - listCertificatesReq := &awsAcm.ListCertificatesInput{ + listCertificatesReq := &awsacm.ListCertificatesInput{ NextToken: listCertificatesNextToken, MaxItems: aws.Int32(listCertificatesMaxItems), } listCertificatesResp, err := u.sdkClient.ListCertificates(context.TODO(), listCertificatesReq) + u.logger.Debug("sdk request 'acm.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'acm.ListCertificates'") } @@ -87,7 +100,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 最后对比证书内容 // REF: https://docs.aws.amazon.com/en_us/acm/latest/APIReference/API_ListTagsForCertificate.html - getCertificateReq := &awsAcm.GetCertificateInput{ + getCertificateReq := &awsacm.GetCertificateInput{ CertificateArn: certSummary.CertificateArn, } getCertificateResp, err := u.sdkClient.GetCertificate(context.TODO(), getCertificateReq) @@ -110,6 +123,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } // 如果以上信息都一致，则视为已存在相同证书，直接返回 + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: *certSummary.CertificateArn, }, nil @@ -124,12 +138,13 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 导入证书 // REF: https://docs.aws.amazon.com/en_us/acm/latest/APIReference/API_ImportCertificate.html - importCertificateReq := &awsAcm.ImportCertificateInput{ + importCertificateReq := &awsacm.ImportCertificateInput{ Certificate: ([]byte)(scertPem), CertificateChain: ([]byte)(bcertPem), PrivateKey: ([]byte)(privkeyPem), } importCertificateResp, err := u.sdkClient.ImportCertificate(context.TODO(), importCertificateReq) + u.logger.Debug("sdk request 'acm.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'acm.ImportCertificate'") } @@ -139,15 +154,15 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, secretAccessKey, region string) (*awsAcm.Client, error) { - cfg, err := awsCfg.LoadDefaultConfig(context.TODO()) +func createSdkClient(accessKeyId, secretAccessKey, region string) (*awsacm.Client, error) { + cfg, err := awscfg.LoadDefaultConfig(context.TODO()) if err != nil { return nil, err } - client := awsAcm.NewFromConfig(cfg, func(o *awsAcm.Options) { + client := awsacm.NewFromConfig(cfg, func(o *awsacm.Options) { o.Region = region - o.Credentials = aws.NewCredentialsCache(awsCred.NewStaticCredentialsProvider(accessKeyId, secretAccessKey, "")) + o.Credentials = aws.NewCredentialsCache(awscred.NewStaticCredentialsProvider(accessKeyId, secretAccessKey, "")) }) return client, nil } diff --git a/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go b/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go index 16109171..3862325d 100644 --- a/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go +++ b/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go @@ -4,6 +4,7 @@ import ( "context" "crypto/x509" "fmt" + "log/slog" "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" @@ -32,6 +33,7 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig + logger *slog.Logger sdkClient *azcertificates.Client } @@ -49,10 +51,20 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -103,6 +115,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 最后对比证书内容 getCertificateResp, err := u.sdkClient.GetCertificate(context.TODO(), certItem.ID.Name(), certItem.ID.Version(), nil) + u.logger.Debug("sdk request 'keyvault.GetCertificate'", slog.String("request.certificateName", certItem.ID.Name()), slog.String("request.certificateVersion", certItem.ID.Version()), slog.Any("response", getCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.GetCertificate'") } else { @@ -117,6 +130,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } // 如果以上信息都一致，则视为已存在相同证书，直接返回 + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: string(*certItem.ID), CertName: certItem.ID.Name(), @@ -142,6 +156,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, } importCertificateResp, err := u.sdkClient.ImportCertificate(context.TODO(), certName, importCertificateParams, nil) + u.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("request.certificateName", certName), slog.Any("request.parameters", importCertificateParams), slog.Any("response", importCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.ImportCertificate'") } diff --git a/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go b/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go index 04116e31..463f70b2 100644 --- a/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go +++ b/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go @@ -6,10 +6,11 @@ import ( "crypto/sha256" "encoding/hex" "fmt" + "log/slog" "strings" "time" - bpCdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" + bytepluscdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -25,7 +26,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *bpCdn.CDN + logger *slog.Logger + sdkClient *bytepluscdn.CDN } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -35,16 +37,26 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client := bpCdn.NewInstance() + client := bytepluscdn.NewInstance() client.Client.SetAccessKey(config.AccessKey) client.Client.SetSecretKey(config.SecretKey) return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -57,13 +69,14 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listCertInfoPageNum := int64(1) listCertInfoPageSize := int64(100) listCertInfoTotal := 0 - listCertInfoReq := &bpCdn.ListCertInfoRequest{ - PageNum: bpCdn.GetInt64Ptr(listCertInfoPageNum), - PageSize: bpCdn.GetInt64Ptr(listCertInfoPageSize), - Source: bpCdn.GetStrPtr("cert_center"), + listCertInfoReq := &bytepluscdn.ListCertInfoRequest{ + PageNum: bytepluscdn.GetInt64Ptr(listCertInfoPageNum), + PageSize: bytepluscdn.GetInt64Ptr(listCertInfoPageSize), + Source: bytepluscdn.GetStrPtr("cert_center"), } for { listCertInfoResp, err := u.sdkClient.ListCertInfo(listCertInfoReq) + u.logger.Debug("sdk request 'cdn.ListCertInfo'", slog.Any("request", listCertInfoReq), slog.Any("response", listCertInfoResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ListCertInfo'") } @@ -74,8 +87,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe fingerprintSha256 := sha256.Sum256(certX509.Raw) isSameCert := strings.EqualFold(hex.EncodeToString(fingerprintSha1[:]), certDetail.CertFingerprint.Sha1) && strings.EqualFold(hex.EncodeToString(fingerprintSha256[:]), certDetail.CertFingerprint.Sha256) - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certDetail.CertId, CertName: certDetail.Desc, @@ -99,13 +113,14 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://docs.byteplus.com/en/docs/byteplus-cdn/reference-addcertificate - addCertificateReq := &bpCdn.AddCertificateRequest{ + addCertificateReq := &bytepluscdn.AddCertificateRequest{ Certificate: certPem, PrivateKey: privkeyPem, - Source: bpCdn.GetStrPtr("cert_center"), - Desc: bpCdn.GetStrPtr(certName), + Source: bytepluscdn.GetStrPtr("cert_center"), + Desc: bytepluscdn.GetStrPtr(certName), } addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq) + u.logger.Debug("sdk request 'cdn.AddCertificate'", slog.Any("request", addCertificateReq), slog.Any("response", addCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.AddCertificate'") } diff --git a/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go b/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go index 82856b6e..420f93bc 100644 --- a/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go +++ b/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go @@ -3,12 +3,13 @@ import ( "context" "fmt" + "log/slog" "time" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" - doge "github.com/usual2970/certimate/internal/pkg/vendors/dogecloud-sdk" + dogesdk "github.com/usual2970/certimate/internal/pkg/vendors/dogecloud-sdk" ) type UploaderConfig struct { @@ -20,7 +21,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *doge.Client + logger *slog.Logger + sdkClient *dogesdk.Client } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -30,20 +32,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKey, - config.SecretKey, - ) + client, err := createSdkClient(config.AccessKey, config.SecretKey) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 生成新证书名（需符合多吉云命名规则） var certId, certName string @@ -52,6 +61,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://docs.dogecloud.com/cdn/api-cert-upload uploadSslCertResp, err := u.sdkClient.UploadCdnCert(certName, certPem, privkeyPem) + u.logger.Debug("sdk request 'cdn.UploadCdnCert'", slog.Any("response", uploadSslCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadCdnCert'") } @@ -63,7 +73,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKey, secretKey string) (*doge.Client, error) { - client := doge.NewClient(accessKey, secretKey) +func createSdkClient(accessKey, secretKey string) (*dogesdk.Client, error) { + client := dogesdk.NewClient(accessKey, secretKey) return client, nil } diff --git a/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go b/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go index b990c694..7f0a6580 100644 --- a/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go +++ b/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log/slog" "time" gprovider "github.com/G-Core/gcorelabscdn-go/gcore/provider" @@ -21,6 +22,7 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig + logger *slog.Logger sdkClient *gsslcerts.Service } @@ -38,10 +40,20 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 生成新证书名（需符合 Gcore 命名规则） var certId, certName string @@ -57,6 +69,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe ValidateRootCA: false, } createCertificateResp, err := u.sdkClient.Create(context.TODO(), createCertificateReq) + u.logger.Debug("sdk request 'sslcerts.Create'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'sslcerts.Create'") } diff --git a/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go b/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go index 96a1ff7b..5a902af8 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go @@ -4,16 +4,17 @@ import ( "context" "errors" "fmt" + "log/slog" "time" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hcElb "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" - hcElbModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" - hcElbRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region" - hcIam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hcIamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hcIamRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hcelb "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" + hcelbmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" + hcelbregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region" + hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -32,7 +33,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *hcElb.ElbClient + logger *slog.Logger + sdkClient *hcelb.ElbClient } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -42,21 +44,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKeyId, - config.SecretAccessKey, - config.Region, - ) + client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -69,12 +77,13 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listCertificatesLimit := int32(2000) var listCertificatesMarker *string = nil for { - listCertificatesReq := &hcElbModel.ListCertificatesRequest{ + listCertificatesReq := &hcelbmodel.ListCertificatesRequest{ Limit: hwsdk.Int32Ptr(listCertificatesLimit), Marker: listCertificatesMarker, Type: &[]string{"server"}, } listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq) + u.logger.Debug("sdk request 'elb.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'elb.ListCertificates'") } @@ -93,8 +102,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe isSameCert = certs.EqualCertificate(certX509, oldCertX509) } - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certDetail.Id, CertName: certDetail.Name, @@ -123,9 +133,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 创建新证书 // REF: https://support.huaweicloud.com/api-elb/CreateCertificate.html - createCertificateReq := &hcElbModel.CreateCertificateRequest{ - Body: &hcElbModel.CreateCertificateRequestBody{ - Certificate: &hcElbModel.CreateCertificateOption{ + createCertificateReq := &hcelbmodel.CreateCertificateRequest{ + Body: &hcelbmodel.CreateCertificateRequestBody{ + Certificate: &hcelbmodel.CreateCertificateOption{ ProjectId: hwsdk.StringPtr(projectId), Name: hwsdk.StringPtr(certName), Certificate: hwsdk.StringPtr(certPem), @@ -134,6 +144,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, } createCertificateResp, err := u.sdkClient.CreateCertificate(createCertificateReq) + u.logger.Debug("sdk request 'elb.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'elb.CreateCertificate'") } @@ -146,7 +157,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcElb.ElbClient, error) { +func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcelb.ElbClient, error) { if region == "" { region = "cn-north-4" // ELB 服务默认区域：华北四北京 } @@ -159,12 +170,12 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcElb.ElbCli return nil, err } - hcRegion, err := hcElbRegion.SafeValueOf(region) + hcRegion, err := hcelbregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcElb.ElbClientBuilder(). + hcClient, err := hcelb.ElbClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -172,7 +183,7 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcElb.ElbCli return nil, err } - client := hcElb.NewElbClient(hcClient) + client := hcelb.NewElbClient(hcClient) return client, nil } @@ -189,12 +200,12 @@ func getSdkProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hcIamRegion.SafeValueOf(region) + hcRegion, err := hciamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hcIam.IamClientBuilder(). + hcClient, err := hciam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -202,9 +213,9 @@ func getSdkProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hcIam.NewIamClient(hcClient) + client := hciam.NewIamClient(hcClient) - request := &hcIamModel.KeystoneListProjectsRequest{ + request := &hciammodel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go b/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go index 9406c55d..c32e347e 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go @@ -3,12 +3,13 @@ import ( "context" "fmt" + "log/slog" "time" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" - hcScm "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" - hcScmModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model" - hcScmRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region" + hcscm "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" + hcscmmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model" + hcscmregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -27,7 +28,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *hcScm.ScmClient + logger *slog.Logger + sdkClient *hcscm.ScmClient } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -37,21 +39,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKeyId, - config.SecretAccessKey, - config.Region, - ) + client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -65,23 +73,25 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listCertificatesLimit := int32(50) listCertificatesOffset := int32(0) for { - listCertificatesReq := &hcScmModel.ListCertificatesRequest{ + listCertificatesReq := &hcscmmodel.ListCertificatesRequest{ Limit: hwsdk.Int32Ptr(listCertificatesLimit), Offset: hwsdk.Int32Ptr(listCertificatesOffset), SortDir: hwsdk.StringPtr("DESC"), SortKey: hwsdk.StringPtr("certExpiredTime"), } listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq) + u.logger.Debug("sdk request 'scm.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'scm.ListCertificates'") } if listCertificatesResp.Certificates != nil { for _, certDetail := range *listCertificatesResp.Certificates { - exportCertificateReq := &hcScmModel.ExportCertificateRequest{ + exportCertificateReq := &hcscmmodel.ExportCertificateRequest{ CertificateId: certDetail.Id, } exportCertificateResp, err := u.sdkClient.ExportCertificate(exportCertificateReq) + u.logger.Debug("sdk request 'scm.ExportCertificate'", slog.Any("request", exportCertificateReq), slog.Any("response", exportCertificateResp)) if err != nil { if exportCertificateResp != nil && exportCertificateResp.HttpStatusCode == 404 { continue @@ -101,8 +111,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe isSameCert = certs.EqualCertificate(certX509, oldCertX509) } - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certDetail.Id, CertName: certDetail.Name, @@ -124,14 +135,15 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://support.huaweicloud.com/api-ccm/ImportCertificate.html - importCertificateReq := &hcScmModel.ImportCertificateRequest{ - Body: &hcScmModel.ImportCertificateRequestBody{ + importCertificateReq := &hcscmmodel.ImportCertificateRequest{ + Body: &hcscmmodel.ImportCertificateRequestBody{ Name: certName, Certificate: certPem, PrivateKey: privkeyPem, }, } importCertificateResp, err := u.sdkClient.ImportCertificate(importCertificateReq) + u.logger.Debug("sdk request 'scm.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'scm.ImportCertificate'") } @@ -143,7 +155,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcScm.ScmClient, error) { +func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcscm.ScmClient, error) { if region == "" { region = "cn-north-4" // SCM 服务默认区域：华北四北京 } @@ -156,12 +168,12 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcScm.ScmCli return nil, err } - hcRegion, err := hcScmRegion.SafeValueOf(region) + hcRegion, err := hcscmregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcScm.ScmClientBuilder(). + hcClient, err := hcscm.ScmClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -169,6 +181,6 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcScm.ScmCli return nil, err } - client := hcScm.NewScmClient(hcClient) + client := hcscm.NewScmClient(hcClient) return client, nil } diff --git a/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go b/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go index 19e7cea7..da243ff1 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go @@ -4,16 +4,17 @@ import ( "context" "errors" "fmt" + "log/slog" "time" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hcIam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hcIamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hcIamRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" - hcWaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" - hcWafModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" - hcWafRegion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" + hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hcwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" + hcwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" + hcwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -32,7 +33,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *hcWaf.WafClient + logger *slog.Logger + sdkClient *hcwaf.WafClient } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -42,21 +44,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKeyId, - config.SecretAccessKey, - config.Region, - ) + client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -70,21 +78,23 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listCertificatesPage := int32(1) listCertificatesPageSize := int32(100) for { - listCertificatesReq := &hcWafModel.ListCertificatesRequest{ + listCertificatesReq := &hcwafmodel.ListCertificatesRequest{ Page: hwsdk.Int32Ptr(listCertificatesPage), Pagesize: hwsdk.Int32Ptr(listCertificatesPageSize), } listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq) + u.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ListCertificates'") } if listCertificatesResp.Items != nil { for _, certItem := range *listCertificatesResp.Items { - showCertificateReq := &hcWafModel.ShowCertificateRequest{ + showCertificateReq := &hcwafmodel.ShowCertificateRequest{ CertificateId: certItem.Id, } showCertificateResp, err := u.sdkClient.ShowCertificate(showCertificateReq) + u.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", showCertificateReq), slog.Any("response", showCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ShowCertificate'") } @@ -101,8 +111,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe isSameCert = certs.EqualCertificate(certX509, oldCertX509) } - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certItem.Id, CertName: certItem.Name, @@ -124,14 +135,15 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 创建证书 // REF: https://support.huaweicloud.com/api-waf/CreateCertificate.html - createCertificateReq := &hcWafModel.CreateCertificateRequest{ - Body: &hcWafModel.CreateCertificateRequestBody{ + createCertificateReq := &hcwafmodel.CreateCertificateRequest{ + Body: &hcwafmodel.CreateCertificateRequestBody{ Name: certName, Content: certPem, Key: privkeyPem, }, } createCertificateResp, err := u.sdkClient.CreateCertificate(createCertificateReq) + u.logger.Debug("sdk request 'waf.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.CreateCertificate'") } @@ -144,7 +156,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcWaf.WafClient, error) { +func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcwaf.WafClient, error) { projectId, err := getSdkProjectId(accessKeyId, secretAccessKey, region) if err != nil { return nil, err @@ -159,12 +171,12 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcWaf.WafCli return nil, err } - hcRegion, err := hcWafRegion.SafeValueOf(region) + hcRegion, err := hcwafregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcWaf.WafClientBuilder(). + hcClient, err := hcwaf.WafClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -172,7 +184,7 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcWaf.WafCli return nil, err } - client := hcWaf.NewWafClient(hcClient) + client := hcwaf.NewWafClient(hcClient) return client, nil } @@ -185,12 +197,12 @@ func getSdkProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hcIamRegion.SafeValueOf(region) + hcRegion, err := hciamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hcIam.IamClientBuilder(). + hcClient, err := hciam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -198,9 +210,9 @@ func getSdkProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hcIam.NewIamClient(hcClient) + client := hciam.NewIamClient(hcClient) - request := &hcIamModel.KeystoneListProjectsRequest{ + request := &hciammodel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go b/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go index 6518bf41..fad48ff2 100644 --- a/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go @@ -5,12 +5,13 @@ import ( "crypto/sha256" "encoding/hex" "fmt" + "log/slog" "strings" "time" - jdCore "github.com/jdcloud-api/jdcloud-sdk-go/core" - jdSslApi "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" - jdSslClient "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client" + jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" + jdsslapi "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" + jdsslclient "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client" xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" @@ -27,7 +28,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *jdSslClient.SslClient + logger *slog.Logger + sdkClient *jdsslclient.SslClient } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -44,10 +46,20 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -66,11 +78,12 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe describeCertsPageNumber := 1 describeCertsPageSize := 10 for { - describeCertsReq := jdSslApi.NewDescribeCertsRequest() + describeCertsReq := jdsslapi.NewDescribeCertsRequest() describeCertsReq.SetDomainName(certX509.Subject.CommonName) describeCertsReq.SetPageNumber(describeCertsPageNumber) describeCertsReq.SetPageSize(describeCertsPageSize) describeCertsResp, err := u.sdkClient.DescribeCerts(describeCertsReq) + u.logger.Debug("sdk request 'ssl.DescribeCerts'", slog.Any("request", describeCertsReq), slog.Any("response", describeCertsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DescribeCerts'") } @@ -101,6 +114,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } // 如果以上信息都一致，则视为已存在相同证书，直接返回 + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certDetail.CertId, CertName: certDetail.CertName, @@ -119,8 +133,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传证书 // REF: https://docs.jdcloud.com/cn/ssl-certificate/api/uploadcert - uploadCertReq := jdSslApi.NewUploadCertRequest(certName, privkeyPem, certPem) + uploadCertReq := jdsslapi.NewUploadCertRequest(certName, privkeyPem, certPem) uploadCertResp, err := u.sdkClient.UploadCert(uploadCertReq) + u.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("request", uploadCertReq), slog.Any("response", uploadCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.UploadCertificate'") } @@ -131,9 +146,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, accessKeySecret string) (*jdSslClient.SslClient, error) { - clientCredentials := jdCore.NewCredentials(accessKeyId, accessKeySecret) - client := jdSslClient.NewSslClient(clientCredentials) - client.SetLogger(jdCore.NewDefaultLogger(jdCore.LogWarn)) +func createSdkClient(accessKeyId, accessKeySecret string) (*jdsslclient.SslClient, error) { + clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) + client := jdsslclient.NewSslClient(clientCredentials) + client.SetLogger(jdcore.NewDefaultLogger(jdcore.LogWarn)) return client, nil } diff --git a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go index 05c57be8..45f1b740 100644 --- a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go @@ -3,6 +3,7 @@ import ( "context" "fmt" + "log/slog" "time" xerrors "github.com/pkg/errors" @@ -10,7 +11,7 @@ import ( "github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/utils/certs" - qiniuEx "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk" + qiniusdk "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk" ) type UploaderConfig struct { @@ -22,7 +23,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *qiniuEx.Client + logger *slog.Logger + sdkClient *qiniusdk.Client } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -32,20 +34,27 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.AccessKey, - config.SecretKey, - ) + client, err := createSdkClient(config.AccessKey, config.SecretKey) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -60,6 +69,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://developer.qiniu.com/fusion/8593/interface-related-certificate uploadSslCertResp, err := u.sdkClient.UploadSslCert(context.TODO(), certName, certX509.Subject.CommonName, certPem, privkeyPem) + u.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("response", uploadSslCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadSslCert'") } @@ -71,8 +81,8 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKey, secretKey string) (*qiniuEx.Client, error) { +func createSdkClient(accessKey, secretKey string) (*qiniusdk.Client, error) { credential := auth.New(accessKey, secretKey) - client := qiniuEx.NewClient(credential) + client := qiniusdk.NewClient(credential) return client, nil } diff --git a/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go b/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go index a76bf2a0..45c7ba9e 100644 --- a/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -2,11 +2,12 @@ import ( "context" + "log/slog" xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcSsl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" + tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/usual2970/certimate/internal/pkg/core/uploader" ) @@ -20,7 +21,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *tcSsl.Client + logger *slog.Logger + sdkClient *tcssl.Client } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -30,28 +32,36 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client, err := createSdkClient( - config.SecretId, - config.SecretKey, - ) + client, err := createSdkClient(config.SecretId, config.SecretKey) if err != nil { return nil, xerrors.Wrap(err, "failed to create sdk client") } return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 上传新证书 // REF: https://cloud.tencent.com/document/product/400/41665 - uploadCertificateReq := tcSsl.NewUploadCertificateRequest() + uploadCertificateReq := tcssl.NewUploadCertificateRequest() uploadCertificateReq.CertificatePublicKey = common.StringPtr(certPem) uploadCertificateReq.CertificatePrivateKey = common.StringPtr(privkeyPem) uploadCertificateReq.Repeatable = common.BoolPtr(false) uploadCertificateResp, err := u.sdkClient.UploadCertificate(uploadCertificateReq) + u.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("request", uploadCertificateReq), slog.Any("response", uploadCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.UploadCertificate'") } @@ -63,9 +73,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(secretId, secretKey string) (*tcSsl.Client, error) { +func createSdkClient(secretId, secretKey string) (*tcssl.Client, error) { credential := common.NewCredential(secretId, secretKey) - client, err := tcSsl.NewClient(credential, "", profile.NewClientProfile()) + client, err := tcssl.NewClient(credential, "", profile.NewClientProfile()) if err != nil { return nil, err } diff --git a/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go b/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go index 67506bf4..616f7617 100644 --- a/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go +++ b/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go @@ -8,16 +8,17 @@ import ( "encoding/hex" "errors" "fmt" + "log/slog" "strings" "time" xerrors "github.com/pkg/errors" - usdk "github.com/ucloud/ucloud-sdk-go/ucloud" - uAuth "github.com/ucloud/ucloud-sdk-go/ucloud/auth" + "github.com/ucloud/ucloud-sdk-go/ucloud" + ucloudauth "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/utils/certs" - usdkSsl "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ussl" + usslsdk "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ussl" ) type UploaderConfig struct { @@ -31,7 +32,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *usdkSsl.USSLClient + logger *slog.Logger + sdkClient *usslsdk.USSLClient } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -48,10 +50,20 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 生成新证书名（需符合优刻得命名规则） var certId, certName string @@ -66,14 +78,15 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传托管证书 // REF: https://docs.ucloud.cn/api/usslcertificate-api/upload_normal_certificate uploadNormalCertificateReq := u.sdkClient.NewUploadNormalCertificateRequest() - uploadNormalCertificateReq.CertificateName = usdk.String(certName) - uploadNormalCertificateReq.SslPublicKey = usdk.String(certPemBase64) - uploadNormalCertificateReq.SslPrivateKey = usdk.String(privkeyPemBase64) - uploadNormalCertificateReq.SslMD5 = usdk.String(certMd5Hex) + uploadNormalCertificateReq.CertificateName = ucloud.String(certName) + uploadNormalCertificateReq.SslPublicKey = ucloud.String(certPemBase64) + uploadNormalCertificateReq.SslPrivateKey = ucloud.String(privkeyPemBase64) + uploadNormalCertificateReq.SslMD5 = ucloud.String(certMd5Hex) if u.config.ProjectId != "" { - uploadNormalCertificateReq.ProjectId = usdk.String(u.config.ProjectId) + uploadNormalCertificateReq.ProjectId = ucloud.String(u.config.ProjectId) } uploadNormalCertificateResp, err := u.sdkClient.UploadNormalCertificate(uploadNormalCertificateReq) + u.logger.Debug("sdk request 'ussl.UploadNormalCertificate'", slog.Any("request", uploadNormalCertificateReq), slog.Any("response", uploadNormalCertificateResp)) if err != nil { if uploadNormalCertificateResp != nil && uploadNormalCertificateResp.GetRetCode() == 80035 { if res, err := u.getExistCert(ctx, certPem); err != nil { @@ -81,6 +94,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } else if res == nil { return nil, errors.New("no certificate found") } else { + u.logger.Info("ssl certificate already exists") return res, nil } } @@ -92,7 +106,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe return &uploader.UploadResult{ CertId: certId, CertName: certName, - ExtendedData: map[string]interface{}{ + ExtendedData: map[string]any{ "resourceId": uploadNormalCertificateResp.LongResourceID, }, }, nil @@ -112,15 +126,16 @@ func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string) (re getCertificateListLimit := int(1000) for { getCertificateListReq := u.sdkClient.NewGetCertificateListRequest() - getCertificateListReq.Mode = usdk.String("trust") - getCertificateListReq.Domain = usdk.String(certX509.Subject.CommonName) - getCertificateListReq.Sort = usdk.String("2") - getCertificateListReq.Page = usdk.Int(getCertificateListPage) - getCertificateListReq.PageSize = usdk.Int(getCertificateListLimit) + getCertificateListReq.Mode = ucloud.String("trust") + getCertificateListReq.Domain = ucloud.String(certX509.Subject.CommonName) + getCertificateListReq.Sort = ucloud.String("2") + getCertificateListReq.Page = ucloud.Int(getCertificateListPage) + getCertificateListReq.PageSize = ucloud.Int(getCertificateListLimit) if u.config.ProjectId != "" { - getCertificateListReq.ProjectId = usdk.String(u.config.ProjectId) + getCertificateListReq.ProjectId = ucloud.String(u.config.ProjectId) } getCertificateListResp, err := u.sdkClient.GetCertificateList(getCertificateListReq) + u.logger.Debug("sdk request 'ussl.GetCertificateList'", slog.Any("request", getCertificateListReq), slog.Any("response", getCertificateListResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ussl.GetCertificateList'") } @@ -143,9 +158,9 @@ func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string) (re } getCertificateDetailInfoReq := u.sdkClient.NewGetCertificateDetailInfoRequest() - getCertificateDetailInfoReq.CertificateID = usdk.Int(certInfo.CertificateID) + getCertificateDetailInfoReq.CertificateID = ucloud.Int(certInfo.CertificateID) if u.config.ProjectId != "" { - getCertificateDetailInfoReq.ProjectId = usdk.String(u.config.ProjectId) + getCertificateDetailInfoReq.ProjectId = ucloud.String(u.config.ProjectId) } getCertificateDetailInfoResp, err := u.sdkClient.GetCertificateDetailInfo(getCertificateDetailInfoReq) if err != nil { @@ -197,7 +212,7 @@ func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string) (re return &uploader.UploadResult{ CertId: fmt.Sprintf("%d", certInfo.CertificateID), CertName: certInfo.Name, - ExtendedData: map[string]interface{}{ + ExtendedData: map[string]any{ "resourceId": certInfo.CertificateSN, }, }, nil @@ -214,13 +229,13 @@ func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string) (re return nil, nil } -func createSdkClient(privateKey, publicKey string) (*usdkSsl.USSLClient, error) { - cfg := usdk.NewConfig() +func createSdkClient(privateKey, publicKey string) (*usslsdk.USSLClient, error) { + cfg := ucloud.NewConfig() - credential := uAuth.NewCredential() + credential := ucloudauth.NewCredential() credential.PrivateKey = privateKey credential.PublicKey = publicKey - client := usdkSsl.NewClient(&cfg, &credential) + client := usslsdk.NewClient(&cfg, &credential) return client, nil } diff --git a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go index 9b5c9b56..36f20876 100644 --- a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go +++ b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go @@ -6,11 +6,12 @@ import ( "crypto/sha256" "encoding/hex" "fmt" + "log/slog" "strings" "time" xerrors "github.com/pkg/errors" - veCdn "github.com/volcengine/volc-sdk-golang/service/cdn" + vecdn "github.com/volcengine/volc-sdk-golang/service/cdn" ve "github.com/volcengine/volcengine-go-sdk/volcengine" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -26,7 +27,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *veCdn.CDN + logger *slog.Logger + sdkClient *vecdn.CDN } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -36,16 +38,26 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client := veCdn.NewInstance() + client := vecdn.NewInstance() client.Client.SetAccessKey(config.AccessKeyId) client.Client.SetSecretKey(config.AccessKeySecret) return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -58,13 +70,14 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe listCertInfoPageNum := int64(1) listCertInfoPageSize := int64(100) listCertInfoTotal := 0 - listCertInfoReq := &veCdn.ListCertInfoRequest{ + listCertInfoReq := &vecdn.ListCertInfoRequest{ PageNum: ve.Int64(listCertInfoPageNum), PageSize: ve.Int64(listCertInfoPageSize), Source: "volc_cert_center", } for { listCertInfoResp, err := u.sdkClient.ListCertInfo(listCertInfoReq) + u.logger.Debug("sdk request 'cdn.ListCertInfo'", slog.Any("request", listCertInfoReq), slog.Any("response", listCertInfoResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ListCertInfo'") } @@ -75,8 +88,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe fingerprintSha256 := sha256.Sum256(certX509.Raw) isSameCert := strings.EqualFold(hex.EncodeToString(fingerprintSha1[:]), certDetail.CertFingerprint.Sha1) && strings.EqualFold(hex.EncodeToString(fingerprintSha256[:]), certDetail.CertFingerprint.Sha256) - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certDetail.CertId, CertName: certDetail.Desc, @@ -100,13 +114,14 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://www.volcengine.com/docs/6454/1245763 - addCertificateReq := &veCdn.AddCertificateRequest{ + addCertificateReq := &vecdn.AddCertificateRequest{ Certificate: certPem, PrivateKey: privkeyPem, Source: ve.String("volc_cert_center"), Desc: ve.String(certName), } addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq) + u.logger.Debug("sdk request 'cdn.AddCertificate'", slog.Any("request", addCertificateResp), slog.Any("response", addCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.AddCertificate'") } diff --git a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go index 1ff133e5..990d9550 100644 --- a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go @@ -2,13 +2,14 @@ package volcenginecertcenter import ( "context" + "log/slog" xerrors "github.com/pkg/errors" ve "github.com/volcengine/volcengine-go-sdk/volcengine" - veSession "github.com/volcengine/volcengine-go-sdk/volcengine/session" + vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/usual2970/certimate/internal/pkg/core/uploader" - vesdkCc "github.com/usual2970/certimate/internal/pkg/vendors/volcengine-sdk/certcenter" + veccsdk "github.com/usual2970/certimate/internal/pkg/vendors/volcengine-sdk/certcenter" ) type UploaderConfig struct { @@ -22,7 +23,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *vesdkCc.CertCenter + logger *slog.Logger + sdkClient *veccsdk.CertCenter } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -39,21 +41,32 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 上传证书 // REF: https://www.volcengine.com/docs/6638/1365580 - importCertificateReq := &vesdkCc.ImportCertificateInput{ - CertificateInfo: &vesdkCc.ImportCertificateInputCertificateInfo{ + importCertificateReq := &veccsdk.ImportCertificateInput{ + CertificateInfo: &veccsdk.ImportCertificateInputCertificateInfo{ CertificateChain: ve.String(certPem), PrivateKey: ve.String(privkeyPem), }, Repeatable: ve.Bool(false), } importCertificateResp, err := u.sdkClient.ImportCertificate(importCertificateReq) + u.logger.Debug("sdk request 'certcenter.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'certcenter.ImportCertificate'") } @@ -70,18 +83,18 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe }, nil } -func createSdkClient(accessKeyId, accessKeySecret, region string) (*vesdkCc.CertCenter, error) { +func createSdkClient(accessKeyId, accessKeySecret, region string) (*veccsdk.CertCenter, error) { if region == "" { region = "cn-beijing" // 证书中心默认区域：北京 } config := ve.NewConfig().WithRegion(region).WithAkSk(accessKeyId, accessKeySecret) - session, err := veSession.NewSession(config) + session, err := vesession.NewSession(config) if err != nil { return nil, err } - client := vesdkCc.New(session) + client := veccsdk.New(session) return client, nil } diff --git a/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go b/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go index 3a7a39eb..70a281d3 100644 --- a/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go +++ b/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go @@ -3,11 +3,12 @@ package volcenginelive import ( "context" "fmt" + "log/slog" "strings" "time" xerrors "github.com/pkg/errors" - veLive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" + velive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" ve "github.com/volcengine/volcengine-go-sdk/volcengine" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -23,7 +24,8 @@ type UploaderConfig struct { type UploaderProvider struct { config *UploaderConfig - sdkClient *veLive.Live + logger *slog.Logger + sdkClient *velive.Live } var _ uploader.Uploader = (*UploaderProvider)(nil) @@ -33,16 +35,26 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { panic("config is nil") } - client := veLive.NewInstance() + client := velive.NewInstance() client.SetAccessKey(config.AccessKeyId) client.SetSecretKey(config.AccessKeySecret) return &UploaderProvider{ config: config, + logger: slog.Default(), sdkClient: client, }, nil } +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { // 解析证书内容 certX509, err := certs.ParseCertificateFromPEM(certPem) @@ -52,8 +64,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 查询证书列表，避免重复上传 // REF: https://www.volcengine.com/docs/6469/1186278#%E6%9F%A5%E8%AF%A2%E8%AF%81%E4%B9%A6%E5%88%97%E8%A1%A8 - listCertReq := &veLive.ListCertV2Body{} + listCertReq := &velive.ListCertV2Body{} listCertResp, err := u.sdkClient.ListCertV2(ctx, listCertReq) + u.logger.Debug("sdk request 'live.ListCertV2'", slog.Any("request", listCertReq), slog.Any("response", listCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ListCertV2'") } @@ -61,10 +74,11 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe for _, certDetail := range listCertResp.Result.CertList { // 查询证书详细信息 // REF: https://www.volcengine.com/docs/6469/1186278#%E6%9F%A5%E7%9C%8B%E8%AF%81%E4%B9%A6%E8%AF%A6%E6%83%85 - describeCertDetailSecretReq := &veLive.DescribeCertDetailSecretV2Body{ + describeCertDetailSecretReq := &velive.DescribeCertDetailSecretV2Body{ ChainID: ve.String(certDetail.ChainID), } describeCertDetailSecretResp, err := u.sdkClient.DescribeCertDetailSecretV2(ctx, describeCertDetailSecretReq) + u.logger.Debug("sdk request 'live.DescribeCertDetailSecretV2'", slog.Any("request", describeCertDetailSecretReq), slog.Any("response", describeCertDetailSecretResp)) if err != nil { continue } @@ -82,8 +96,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe isSameCert = certs.EqualCertificate(certX509, oldCertX509) } - // 如果已存在相同证书，直接返回已有的证书信息 + // 如果已存在相同证书，直接返回 if isSameCert { + u.logger.Info("ssl certificate already exists") return &uploader.UploadResult{ CertId: certDetail.ChainID, CertName: certDetail.CertName, @@ -98,16 +113,17 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://www.volcengine.com/docs/6469/1186278#%E6%B7%BB%E5%8A%A0%E8%AF%81%E4%B9%A6 - createCertReq := &veLive.CreateCertBody{ + createCertReq := &velive.CreateCertBody{ CertName: ve.String(certName), UseWay: "https", ProjectName: ve.String("default"), - Rsa: veLive.CreateCertBodyRsa{ + Rsa: velive.CreateCertBodyRsa{ Prikey: privkeyPem, Pubkey: certPem, }, } createCertResp, err := u.sdkClient.CreateCert(ctx, createCertReq) + u.logger.Debug("sdk request 'live.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.CreateCert'") } diff --git a/internal/pkg/core/uploader/uploader.go b/internal/pkg/core/uploader/uploader.go index 76748a99..06cecec0 100644 --- a/internal/pkg/core/uploader/uploader.go +++ b/internal/pkg/core/uploader/uploader.go @@ -1,11 +1,16 @@ package uploader -import "context" +import ( + "context" + "log/slog" +) // 表示定义证书上传器的抽象类型接口。 // 云服务商通常会提供 SSL 证书管理服务，可供用户集中管理证书。 // 注意与 `Deployer` 区分，“上传”通常为“部署”的前置操作。 type Uploader interface { + WithLogger(logger *slog.Logger) Uploader + // 上传证书。 // // 入参： From af5d7465a10bf1e152f21646bb92d7d7b60e3397 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 17 Mar 2025 22:50:25 +0800 Subject: [PATCH 03/23] feat: adapt new logging to workflow node processors --- internal/deployer/deployer.go | 10 + internal/domain/workflow_log.go | 29 ++ internal/domain/workflow_run.go | 39 +-- internal/pkg/logging/handler.go | 8 +- internal/pkg/utils/maps/maps.go | 2 +- internal/repository/workflow_log.go | 110 ++++++ internal/repository/workflow_run.go | 8 +- internal/workflow/dispatcher/dispatcher.go | 137 ++++---- internal/workflow/dispatcher/invoker.go | 51 +-- internal/workflow/dispatcher/singleton.go | 10 +- .../workflow/node-processor/apply_node.go | 37 +- .../workflow/node-processor/condition_node.go | 6 +- .../workflow/node-processor/deploy_node.go | 37 +- .../node-processor/execute_failure_node.go | 8 +- .../node-processor/execute_success_node.go | 8 +- .../workflow/node-processor/notify_node.go | 16 +- internal/workflow/node-processor/processor.go | 58 ++-- .../workflow/node-processor/start_node.go | 8 +- .../workflow/node-processor/upload_node.go | 40 +-- internal/workflow/service.go | 7 +- ...ctions_hotfix.go => 1740050400_upgrade.go} | 39 ++- migrations/1742209200_upgrade.go | 320 ++++++++++++++++++ 22 files changed, 714 insertions(+), 274 deletions(-) create mode 100644 internal/domain/workflow_log.go create mode 100644 internal/repository/workflow_log.go rename migrations/{1740050400_collections_hotfix.go => 1740050400_upgrade.go} (83%) create mode 100644 migrations/1742209200_upgrade.go diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index 1fc1925f..3a892404 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -11,6 +11,8 @@ import ( ) type Deployer interface { + SetLogger(*slog.Logger) + Deploy(ctx context.Context) error } @@ -67,6 +69,14 @@ type proxyDeployer struct { deployPrivateKey string } +func (d *proxyDeployer) SetLogger(logger *slog.Logger) { + if logger == nil { + panic("logger is nil") + } + + d.logger = logger +} + func (d *proxyDeployer) Deploy(ctx context.Context) error { _, err := d.deployer.Deploy(ctx, d.deployCertificate, d.deployPrivateKey) return err diff --git a/internal/domain/workflow_log.go b/internal/domain/workflow_log.go new file mode 100644 index 00000000..a33c5480 --- /dev/null +++ b/internal/domain/workflow_log.go @@ -0,0 +1,29 @@ +package domain + +import "strings" + +const CollectionNameWorkflowLog = "workflow_logs" + +type WorkflowLog struct { + Meta + WorkflowId string `json:"workflowId" db:"workflowId"` + RunId string `json:"workflorunIdwId" db:"runId"` + NodeId string `json:"nodeId"` + NodeName string `json:"nodeName"` + Level string `json:"level" db:"level"` + Message string `json:"message" db:"message"` + Data map[string]any `json:"data" db:"data"` +} + +type WorkflowLogs []WorkflowLog + +func (r WorkflowLogs) ErrorString() string { + var builder strings.Builder + for _, log := range r { + if log.Level == "ERROR" { + builder.WriteString(log.Message) + builder.WriteString("\n") + } + } + return strings.TrimSpace(builder.String()) +} diff --git a/internal/domain/workflow_run.go b/internal/domain/workflow_run.go index ff5424c5..407afc73 100644 --- a/internal/domain/workflow_run.go +++ b/internal/domain/workflow_run.go @@ -1,7 +1,6 @@ package domain import ( - "strings" "time" ) @@ -14,7 +13,7 @@ type WorkflowRun struct { Trigger WorkflowTriggerType `json:"trigger" db:"trigger"` StartedAt time.Time `json:"startedAt" db:"startedAt"` EndedAt time.Time `json:"endedAt" db:"endedAt"` - Logs []WorkflowRunLog `json:"logs" db:"logs"` + Detail *WorkflowNode `json:"detail" db:"detail"` Error string `json:"error" db:"error"` } @@ -27,39 +26,3 @@ const ( WorkflowRunStatusTypeFailed WorkflowRunStatusType = "failed" WorkflowRunStatusTypeCanceled WorkflowRunStatusType = "canceled" ) - -type WorkflowRunLog struct { - NodeId string `json:"nodeId"` - NodeName string `json:"nodeName"` - Records []WorkflowRunLogRecord `json:"records"` - Error string `json:"error"` -} - -type WorkflowRunLogRecord struct { - Time string `json:"time"` - Level WorkflowRunLogLevel `json:"level"` - Content string `json:"content"` - Error string `json:"error"` -} - -type WorkflowRunLogLevel string - -const ( - WorkflowRunLogLevelDebug WorkflowRunLogLevel = "DEBUG" - WorkflowRunLogLevelInfo WorkflowRunLogLevel = "INFO" - WorkflowRunLogLevelWarn WorkflowRunLogLevel = "WARN" - WorkflowRunLogLevelError WorkflowRunLogLevel = "ERROR" -) - -type WorkflowRunLogs []WorkflowRunLog - -func (r WorkflowRunLogs) ErrorString() string { - var builder strings.Builder - for _, log := range r { - if log.Error != "" { - builder.WriteString(log.Error) - builder.WriteString("\n") - } - } - return builder.String() -} diff --git a/internal/pkg/logging/handler.go b/internal/pkg/logging/handler.go index 5e932d1f..36174b45 100644 --- a/internal/pkg/logging/handler.go +++ b/internal/pkg/logging/handler.go @@ -24,10 +24,14 @@ type HookHandler struct { attrs []slog.Attr } -func NewHookHandler(options HookHandlerOptions) *HookHandler { +func NewHookHandler(opts *HookHandlerOptions) *HookHandler { + if opts == nil { + opts = &HookHandlerOptions{} + } + h := &HookHandler{ mutex: &sync.Mutex{}, - options: &options, + options: opts, } if h.options.WriteFunc == nil { diff --git a/internal/pkg/utils/maps/maps.go b/internal/pkg/utils/maps/maps.go index 4a4417d0..6fd20bc7 100644 --- a/internal/pkg/utils/maps/maps.go +++ b/internal/pkg/utils/maps/maps.go @@ -184,7 +184,7 @@ func GetValueOrDefaultAsBool(dict map[string]any, key string, defaultValue bool) } // 将字典填充到指定类型的结构体。 -// 与 [json.Unmarshal] 类似，但传入的是一个 [map[string]interface{}] 对象而非 JSON 格式的字符串。 +// 与 [json.Unmarshal] 类似，但传入的是一个 [map[string]any] 对象而非 JSON 格式的字符串。 // // 入参： // - dict: 字典。 diff --git a/internal/repository/workflow_log.go b/internal/repository/workflow_log.go new file mode 100644 index 00000000..95bc2e7d --- /dev/null +++ b/internal/repository/workflow_log.go @@ -0,0 +1,110 @@ +package repository + +import ( + "context" + "database/sql" + "errors" + "fmt" + + "github.com/pocketbase/dbx" + "github.com/pocketbase/pocketbase/core" + "github.com/usual2970/certimate/internal/app" + "github.com/usual2970/certimate/internal/domain" +) + +type WorkflowLogRepository struct{} + +func NewWorkflowLogRepository() *WorkflowLogRepository { + return &WorkflowLogRepository{} +} + +func (r *WorkflowLogRepository) ListByWorkflowRunId(ctx context.Context, workflowRunId string) ([]*domain.WorkflowLog, error) { + records, err := app.GetApp().FindRecordsByFilter( + domain.CollectionNameWorkflowLog, + "runId={:runId}", + "-created", + 0, 0, + dbx.Params{"runId": workflowRunId}, + ) + if err != nil { + return nil, err + } + + workflowLogs := make([]*domain.WorkflowLog, 0) + for _, record := range records { + workflowLog, err := r.castRecordToModel(record) + if err != nil { + return nil, err + } + + workflowLogs = append(workflowLogs, workflowLog) + } + + return workflowLogs, nil +} + +func (r *WorkflowLogRepository) Save(ctx context.Context, workflowLog *domain.WorkflowLog) (*domain.WorkflowLog, error) { + collection, err := app.GetApp().FindCollectionByNameOrId(domain.CollectionNameWorkflowLog) + if err != nil { + return workflowLog, err + } + + var record *core.Record + if workflowLog.Id == "" { + record = core.NewRecord(collection) + } else { + record, err = app.GetApp().FindRecordById(collection, workflowLog.Id) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return workflowLog, err + } + record = core.NewRecord(collection) + } + } + + record.Set("workflowId", workflowLog.WorkflowId) + record.Set("runId", workflowLog.RunId) + record.Set("nodeId", workflowLog.NodeId) + record.Set("nodeName", workflowLog.NodeName) + record.Set("level", workflowLog.Level) + record.Set("message", workflowLog.Message) + record.Set("data", workflowLog.Data) + record.Set("created", workflowLog.CreatedAt) + err = app.GetApp().Save(record) + if err != nil { + return workflowLog, err + } + + workflowLog.Id = record.Id + workflowLog.CreatedAt = record.GetDateTime("created").Time() + workflowLog.UpdatedAt = record.GetDateTime("updated").Time() + + return workflowLog, nil +} + +func (r *WorkflowLogRepository) castRecordToModel(record *core.Record) (*domain.WorkflowLog, error) { + if record == nil { + return nil, fmt.Errorf("record is nil") + } + + logdata := make(map[string]any) + if err := record.UnmarshalJSONField("data", &logdata); err != nil { + return nil, err + } + + workflowLog := &domain.WorkflowLog{ + Meta: domain.Meta{ + Id: record.Id, + CreatedAt: record.GetDateTime("created").Time(), + UpdatedAt: record.GetDateTime("updated").Time(), + }, + WorkflowId: record.GetString("workflowId"), + RunId: record.GetString("runId"), + NodeId: record.GetString("nodeId"), + NodeName: record.GetString("nodeName"), + Level: record.GetString("level"), + Message: record.GetString("message"), + Data: logdata, + } + return workflowLog, nil +} diff --git a/internal/repository/workflow_run.go b/internal/repository/workflow_run.go index b1a5234b..aef61ac3 100644 --- a/internal/repository/workflow_run.go +++ b/internal/repository/workflow_run.go @@ -54,7 +54,7 @@ func (r *WorkflowRunRepository) Save(ctx context.Context, workflowRun *domain.Wo record.Set("status", string(workflowRun.Status)) record.Set("startedAt", workflowRun.StartedAt) record.Set("endedAt", workflowRun.EndedAt) - record.Set("logs", workflowRun.Logs) + record.Set("detail", workflowRun.Detail) record.Set("error", workflowRun.Error) err = txApp.Save(record) if err != nil { @@ -101,8 +101,8 @@ func (r *WorkflowRunRepository) castRecordToModel(record *core.Record) (*domain. return nil, fmt.Errorf("record is nil") } - logs := make([]domain.WorkflowRunLog, 0) - if err := record.UnmarshalJSONField("logs", &logs); err != nil { + detail := &domain.WorkflowNode{} + if err := record.UnmarshalJSONField("detail", &detail); err != nil { return nil, err } @@ -117,7 +117,7 @@ func (r *WorkflowRunRepository) castRecordToModel(record *core.Record) (*domain. Trigger: domain.WorkflowTriggerType(record.GetString("trigger")), StartedAt: record.GetDateTime("startedAt").Time(), EndedAt: record.GetDateTime("endedAt").Time(), - Logs: logs, + Detail: detail, Error: record.GetString("error"), } return workflowRun, nil diff --git a/internal/workflow/dispatcher/dispatcher.go b/internal/workflow/dispatcher/dispatcher.go index 53081b6b..8f1adf18 100644 --- a/internal/workflow/dispatcher/dispatcher.go +++ b/internal/workflow/dispatcher/dispatcher.go @@ -51,9 +51,10 @@ type WorkflowDispatcher struct { workflowRepo workflowRepository workflowRunRepo workflowRunRepository + workflowLogRepo workflowLogRepository } -func newWorkflowDispatcher(workflowRepo workflowRepository, workflowRunRepo workflowRunRepository) *WorkflowDispatcher { +func newWorkflowDispatcher(workflowRepo workflowRepository, workflowRunRepo workflowRunRepository, workflowLogRepo workflowLogRepository) *WorkflowDispatcher { dispatcher := &WorkflowDispatcher{ semaphore: make(chan struct{}, maxWorkers), @@ -69,6 +70,7 @@ func newWorkflowDispatcher(workflowRepo workflowRepository, workflowRunRepo work workflowRepo: workflowRepo, workflowRunRepo: workflowRunRepo, + workflowLogRepo: workflowLogRepo, } go func() { @@ -86,139 +88,139 @@ func newWorkflowDispatcher(workflowRepo workflowRepository, workflowRunRepo work return dispatcher } -func (w *WorkflowDispatcher) Dispatch(data *WorkflowWorkerData) { +func (d *WorkflowDispatcher) Dispatch(data *WorkflowWorkerData) { if data == nil { panic("worker data is nil") } - w.enqueueWorker(data) + d.enqueueWorker(data) select { - case w.chWork <- data: + case d.chWork <- data: default: } } -func (w *WorkflowDispatcher) Cancel(runId string) { +func (d *WorkflowDispatcher) Cancel(runId string) { hasWorker := false // 取消正在执行的 WorkflowRun - w.workerMutex.Lock() - if workflowId, ok := w.workerIdMap[runId]; ok { - if worker, ok := w.workers[workflowId]; ok { + d.workerMutex.Lock() + if workflowId, ok := d.workerIdMap[runId]; ok { + if worker, ok := d.workers[workflowId]; ok { hasWorker = true worker.Cancel() - delete(w.workers, workflowId) - delete(w.workerIdMap, runId) + delete(d.workers, workflowId) + delete(d.workerIdMap, runId) } } - w.workerMutex.Unlock() + d.workerMutex.Unlock() // 移除排队中的 WorkflowRun - w.queueMutex.Lock() - w.queue = slices.Filter(w.queue, func(d *WorkflowWorkerData) bool { + d.queueMutex.Lock() + d.queue = slices.Filter(d.queue, func(d *WorkflowWorkerData) bool { return d.RunId != runId }) - w.queueMutex.Unlock() + d.queueMutex.Unlock() // 已挂起，查询 WorkflowRun 并更新其状态为 Canceled if !hasWorker { - if run, err := w.workflowRunRepo.GetById(context.Background(), runId); err == nil { + if run, err := d.workflowRunRepo.GetById(context.Background(), runId); err == nil { if run.Status == domain.WorkflowRunStatusTypePending || run.Status == domain.WorkflowRunStatusTypeRunning { run.Status = domain.WorkflowRunStatusTypeCanceled - w.workflowRunRepo.Save(context.Background(), run) + d.workflowRunRepo.Save(context.Background(), run) } } } } -func (w *WorkflowDispatcher) Shutdown() { +func (d *WorkflowDispatcher) Shutdown() { // 清空排队中的 WorkflowRun - w.queueMutex.Lock() - w.queue = make([]*WorkflowWorkerData, 0) - w.queueMutex.Unlock() + d.queueMutex.Lock() + d.queue = make([]*WorkflowWorkerData, 0) + d.queueMutex.Unlock() // 等待所有正在执行的 WorkflowRun 完成 - w.workerMutex.Lock() - for _, worker := range w.workers { + d.workerMutex.Lock() + for _, worker := range d.workers { worker.Cancel() - delete(w.workers, worker.Data.WorkflowId) - delete(w.workerIdMap, worker.Data.RunId) + delete(d.workers, worker.Data.WorkflowId) + delete(d.workerIdMap, worker.Data.RunId) } - w.workerMutex.Unlock() - w.wg.Wait() + d.workerMutex.Unlock() + d.wg.Wait() } -func (w *WorkflowDispatcher) enqueueWorker(data *WorkflowWorkerData) { - w.queueMutex.Lock() - defer w.queueMutex.Unlock() - w.queue = append(w.queue, data) +func (d *WorkflowDispatcher) enqueueWorker(data *WorkflowWorkerData) { + d.queueMutex.Lock() + defer d.queueMutex.Unlock() + d.queue = append(d.queue, data) } -func (w *WorkflowDispatcher) dequeueWorker() { +func (d *WorkflowDispatcher) dequeueWorker() { for { select { - case w.semaphore <- struct{}{}: + case d.semaphore <- struct{}{}: default: // 达到最大并发数 return } - w.queueMutex.Lock() - if len(w.queue) == 0 { - w.queueMutex.Unlock() - <-w.semaphore + d.queueMutex.Lock() + if len(d.queue) == 0 { + d.queueMutex.Unlock() + <-d.semaphore return } - data := w.queue[0] - w.queue = w.queue[1:] - w.queueMutex.Unlock() + data := d.queue[0] + d.queue = d.queue[1:] + d.queueMutex.Unlock() // 检查是否有相同 WorkflowId 的 WorkflowRun 正在执行 // 如果有，则重新排队，以保证同一个工作流同一时间内只有一个正在执行 // 即不同 WorkflowId 的任务并行化，相同 WorkflowId 的任务串行化 - w.workerMutex.Lock() - if _, exists := w.workers[data.WorkflowId]; exists { - w.queueMutex.Lock() - w.queue = append(w.queue, data) - w.queueMutex.Unlock() - w.workerMutex.Unlock() + d.workerMutex.Lock() + if _, exists := d.workers[data.WorkflowId]; exists { + d.queueMutex.Lock() + d.queue = append(d.queue, data) + d.queueMutex.Unlock() + d.workerMutex.Unlock() - <-w.semaphore + <-d.semaphore continue } ctx, cancel := context.WithCancel(context.Background()) - w.workers[data.WorkflowId] = &workflowWorker{data, cancel} - w.workerIdMap[data.RunId] = data.WorkflowId - w.workerMutex.Unlock() + d.workers[data.WorkflowId] = &workflowWorker{data, cancel} + d.workerIdMap[data.RunId] = data.WorkflowId + d.workerMutex.Unlock() - w.wg.Add(1) - go w.work(ctx, data) + d.wg.Add(1) + go d.work(ctx, data) } } -func (w *WorkflowDispatcher) work(ctx context.Context, data *WorkflowWorkerData) { +func (d *WorkflowDispatcher) work(ctx context.Context, data *WorkflowWorkerData) { defer func() { - <-w.semaphore - w.workerMutex.Lock() - delete(w.workers, data.WorkflowId) - delete(w.workerIdMap, data.RunId) - w.workerMutex.Unlock() + <-d.semaphore + d.workerMutex.Lock() + delete(d.workers, data.WorkflowId) + delete(d.workerIdMap, data.RunId) + d.workerMutex.Unlock() - w.wg.Done() + d.wg.Done() // 尝试取出排队中的其他 WorkflowRun 继续执行 select { - case w.chCandi <- struct{}{}: + case d.chCandi <- struct{}{}: default: } }() // 查询 WorkflowRun - run, err := w.workflowRunRepo.GetById(ctx, data.RunId) + run, err := d.workflowRunRepo.GetById(ctx, data.RunId) if err != nil { if !(errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)) { app.GetLogger().Error(fmt.Sprintf("failed to get workflow run #%s", data.RunId), "err", err) @@ -228,13 +230,13 @@ func (w *WorkflowDispatcher) work(ctx context.Context, data *WorkflowWorkerData) return } else if ctx.Err() != nil { run.Status = domain.WorkflowRunStatusTypeCanceled - w.workflowRunRepo.Save(ctx, run) + d.workflowRunRepo.Save(ctx, run) return } // 更新 WorkflowRun 状态为 Running run.Status = domain.WorkflowRunStatusTypeRunning - if _, err := w.workflowRunRepo.Save(ctx, run); err != nil { + if _, err := d.workflowRunRepo.Save(ctx, run); err != nil { if !(errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)) { panic(err) } @@ -242,19 +244,17 @@ func (w *WorkflowDispatcher) work(ctx context.Context, data *WorkflowWorkerData) } // 执行工作流 - invoker := newWorkflowInvokerWithData(w.workflowRunRepo, data) + invoker := newWorkflowInvokerWithData(d.workflowLogRepo, data) if runErr := invoker.Invoke(ctx); runErr != nil { if errors.Is(runErr, context.Canceled) { run.Status = domain.WorkflowRunStatusTypeCanceled - run.Logs = invoker.GetLogs() } else { run.Status = domain.WorkflowRunStatusTypeFailed run.EndedAt = time.Now() - run.Logs = invoker.GetLogs() run.Error = runErr.Error() } - if _, err := w.workflowRunRepo.Save(ctx, run); err != nil { + if _, err := d.workflowRunRepo.Save(ctx, run); err != nil { if !(errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)) { panic(err) } @@ -265,14 +265,13 @@ func (w *WorkflowDispatcher) work(ctx context.Context, data *WorkflowWorkerData) // 更新 WorkflowRun 状态为 Succeeded/Failed run.EndedAt = time.Now() - run.Logs = invoker.GetLogs() - run.Error = domain.WorkflowRunLogs(invoker.GetLogs()).ErrorString() + run.Error = invoker.GetLogs().ErrorString() if run.Error == "" { run.Status = domain.WorkflowRunStatusTypeSucceeded } else { run.Status = domain.WorkflowRunStatusTypeFailed } - if _, err := w.workflowRunRepo.Save(ctx, run); err != nil { + if _, err := d.workflowRunRepo.Save(ctx, run); err != nil { if !(errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)) { panic(err) } diff --git a/internal/workflow/dispatcher/invoker.go b/internal/workflow/dispatcher/invoker.go index d35cca3e..23d70f01 100644 --- a/internal/workflow/dispatcher/invoker.go +++ b/internal/workflow/dispatcher/invoker.go @@ -3,8 +3,10 @@ package dispatcher import ( "context" "errors" + "log/slog" "github.com/usual2970/certimate/internal/domain" + "github.com/usual2970/certimate/internal/pkg/logging" nodes "github.com/usual2970/certimate/internal/workflow/node-processor" ) @@ -12,24 +14,23 @@ type workflowInvoker struct { workflowId string workflowContent *domain.WorkflowNode runId string - runLogs []domain.WorkflowRunLog + logs []domain.WorkflowLog - workflowRunRepo workflowRunRepository + workflowLogRepo workflowLogRepository } -func newWorkflowInvokerWithData(workflowRunRepo workflowRunRepository, data *WorkflowWorkerData) *workflowInvoker { +func newWorkflowInvokerWithData(workflowLogRepo workflowLogRepository, data *WorkflowWorkerData) *workflowInvoker { if data == nil { panic("worker data is nil") } - // TODO: 待优化，日志与执行解耦 return &workflowInvoker{ workflowId: data.WorkflowId, workflowContent: data.WorkflowContent, runId: data.RunId, - runLogs: make([]domain.WorkflowRunLog, 0), + logs: make([]domain.WorkflowLog, 0), - workflowRunRepo: workflowRunRepo, + workflowLogRepo: workflowLogRepo, } } @@ -39,8 +40,8 @@ func (w *workflowInvoker) Invoke(ctx context.Context) error { return w.processNode(ctx, w.workflowContent) } -func (w *workflowInvoker) GetLogs() []domain.WorkflowRunLog { - return w.runLogs +func (w *workflowInvoker) GetLogs() domain.WorkflowLogs { + return w.logs } func (w *workflowInvoker) processNode(ctx context.Context, node *domain.WorkflowNode) error { @@ -68,21 +69,33 @@ func (w *workflowInvoker) processNode(ctx context.Context, node *domain.Workflow if current.Type != domain.WorkflowNodeTypeBranch && current.Type != domain.WorkflowNodeTypeExecuteResultBranch { processor, procErr = nodes.GetProcessor(current) if procErr != nil { - break + panic(procErr) } + processor.SetLogger(slog.New(logging.NewHookHandler(&logging.HookHandlerOptions{ + Level: slog.LevelDebug, + WriteFunc: func(ctx context.Context, record *logging.Record) error { + log := domain.WorkflowLog{} + log.WorkflowId = w.workflowId + log.RunId = w.runId + log.NodeId = current.Id + log.NodeName = current.Name + log.Level = record.Level.String() + log.Message = record.Message + log.Data = record.Data + log.CreatedAt = record.Time + if _, err := w.workflowLogRepo.Save(ctx, &log); err != nil { + return err + } + + w.logs = append(w.logs, log) + return nil + }, + }))) + procErr = processor.Process(ctx) - log := processor.GetLog(ctx) - if log != nil { - w.runLogs = append(w.runLogs, *log) - - // TODO: 待优化，把 /pkg/core/* 包下的输出写入到 DEBUG 级别的日志中 - if run, err := w.workflowRunRepo.GetById(ctx, w.runId); err == nil { - run.Logs = w.runLogs - w.workflowRunRepo.Save(ctx, run) - } - } if procErr != nil { + processor.GetLogger().Error(procErr.Error()) break } } diff --git a/internal/workflow/dispatcher/singleton.go b/internal/workflow/dispatcher/singleton.go index b5834c48..20fdde97 100644 --- a/internal/workflow/dispatcher/singleton.go +++ b/internal/workflow/dispatcher/singleton.go @@ -5,6 +5,7 @@ import ( "sync" "github.com/usual2970/certimate/internal/domain" + "github.com/usual2970/certimate/internal/repository" ) type workflowRepository interface { @@ -17,15 +18,18 @@ type workflowRunRepository interface { Save(ctx context.Context, workflowRun *domain.WorkflowRun) (*domain.WorkflowRun, error) } +type workflowLogRepository interface { + Save(ctx context.Context, workflowLog *domain.WorkflowLog) (*domain.WorkflowLog, error) +} + var ( instance *WorkflowDispatcher intanceOnce sync.Once ) -func GetSingletonDispatcher(workflowRepo workflowRepository, workflowRunRepo workflowRunRepository) *WorkflowDispatcher { - // TODO: 待优化构造过程 +func GetSingletonDispatcher() *WorkflowDispatcher { intanceOnce.Do(func() { - instance = newWorkflowDispatcher(workflowRepo, workflowRunRepo) + instance = newWorkflowDispatcher(repository.NewWorkflowRepository(), repository.NewWorkflowRunRepository(), repository.NewWorkflowLogRepository()) }) return instance diff --git a/internal/workflow/node-processor/apply_node.go b/internal/workflow/node-processor/apply_node.go index 26ff6b9e..2fc6c223 100644 --- a/internal/workflow/node-processor/apply_node.go +++ b/internal/workflow/node-processor/apply_node.go @@ -15,7 +15,7 @@ import ( type applyNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor certRepo certificateRepository outputRepo workflowOutputRepository @@ -23,8 +23,8 @@ type applyNode struct { func NewApplyNode(node *domain.WorkflowNode) *applyNode { return &applyNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), certRepo: repository.NewCertificateRepository(), outputRepo: repository.NewWorkflowOutputRepository(), @@ -32,40 +32,40 @@ func NewApplyNode(node *domain.WorkflowNode) *applyNode { } func (n *applyNode) Process(ctx context.Context) error { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "进入申请证书节点") + n.logger.Info("ready to apply ...") // 查询上次执行结果 lastOutput, err := n.outputRepo.GetByNodeId(ctx, n.node.Id) if err != nil && !domain.IsRecordNotFoundError(err) { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "查询申请记录失败", err.Error()) return err } // 检测是否可以跳过本次执行 if skippable, skipReason := n.checkCanSkip(ctx, lastOutput); skippable { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, skipReason) + n.logger.Warn(fmt.Sprintf("skip this application, because %s", skipReason)) return nil + } else if skipReason != "" { + n.logger.Info(fmt.Sprintf("continue to apply, because %s", skipReason)) } // 初始化申请器 applicant, err := applicant.NewWithApplyNode(n.node) if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "获取申请对象失败", err.Error()) + n.logger.Warn("failed to create applicant provider") return err } // 申请证书 applyResult, err := applicant.Apply() if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "申请失败", err.Error()) + n.logger.Warn("failed to apply") return err } - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "申请成功") // 解析证书并生成实体 certX509, err := certs.ParseCertificateFromPEM(applyResult.CertificateFullChain) if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "解析证书失败", err.Error()) + n.logger.Warn("failed to parse certificate, may be the CA responded error") return err } certificate := &domain.Certificate{ @@ -89,10 +89,11 @@ func (n *applyNode) Process(ctx context.Context) error { Outputs: n.node.Outputs, } if _, err := n.outputRepo.SaveWithCertificate(ctx, output, certificate); err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "保存申请记录失败", err.Error()) + n.logger.Warn("failed to save node output") return err } - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "保存申请记录成功") + + n.logger.Info("apply completed") return nil } @@ -103,19 +104,19 @@ func (n *applyNode) checkCanSkip(ctx context.Context, lastOutput *domain.Workflo currentNodeConfig := n.node.GetConfigForApply() lastNodeConfig := lastOutput.Node.GetConfigForApply() if currentNodeConfig.Domains != lastNodeConfig.Domains { - return false, "配置项变化：域名" + return false, "the configuration item 'Domains' changed" } if currentNodeConfig.ContactEmail != lastNodeConfig.ContactEmail { - return false, "配置项变化：联系邮箱" + return false, "the configuration item 'ContactEmail' changed" } if currentNodeConfig.ProviderAccessId != lastNodeConfig.ProviderAccessId { - return false, "配置项变化：DNS 提供商授权" + return false, "the configuration item 'ProviderAccessId' changed" } if !maps.Equal(currentNodeConfig.ProviderConfig, lastNodeConfig.ProviderConfig) { - return false, "配置项变化：DNS 提供商参数" + return false, "the configuration item 'ProviderConfig' changed" } if currentNodeConfig.KeyAlgorithm != lastNodeConfig.KeyAlgorithm { - return false, "配置项变化：数字签名算法" + return false, "the configuration item 'KeyAlgorithm' changed" } lastCertificate, _ := n.certRepo.GetByWorkflowNodeId(ctx, n.node.Id) @@ -123,7 +124,7 @@ func (n *applyNode) checkCanSkip(ctx context.Context, lastOutput *domain.Workflo renewalInterval := time.Duration(currentNodeConfig.SkipBeforeExpiryDays) * time.Hour * 24 expirationTime := time.Until(lastCertificate.ExpireAt) if expirationTime > renewalInterval { - return true, fmt.Sprintf("已申请过证书，且证书尚未临近过期（尚余 %d 天过期，不足 %d 天时续期），跳过此次申请", int(expirationTime.Hours()/24), currentNodeConfig.SkipBeforeExpiryDays) + return true, fmt.Sprintf("the certificate has already been issued (expires in %dD, next renewal in %dD)", int(expirationTime.Hours()/24), currentNodeConfig.SkipBeforeExpiryDays) } } } diff --git a/internal/workflow/node-processor/condition_node.go b/internal/workflow/node-processor/condition_node.go index 499a5004..2bac55fa 100644 --- a/internal/workflow/node-processor/condition_node.go +++ b/internal/workflow/node-processor/condition_node.go @@ -8,13 +8,13 @@ import ( type conditionNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor } func NewConditionNode(node *domain.WorkflowNode) *conditionNode { return &conditionNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), } } diff --git a/internal/workflow/node-processor/deploy_node.go b/internal/workflow/node-processor/deploy_node.go index 492f5385..556ca891 100644 --- a/internal/workflow/node-processor/deploy_node.go +++ b/internal/workflow/node-processor/deploy_node.go @@ -3,6 +3,7 @@ package nodeprocessor import ( "context" "fmt" + "log/slog" "strings" "github.com/usual2970/certimate/internal/deployer" @@ -13,7 +14,7 @@ import ( type deployNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor certRepo certificateRepository outputRepo workflowOutputRepository @@ -21,8 +22,8 @@ type deployNode struct { func NewDeployNode(node *domain.WorkflowNode) *deployNode { return &deployNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), certRepo: repository.NewCertificateRepository(), outputRepo: repository.NewWorkflowOutputRepository(), @@ -30,12 +31,11 @@ func NewDeployNode(node *domain.WorkflowNode) *deployNode { } func (n *deployNode) Process(ctx context.Context) error { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "开始执行") + n.logger.Info("ready to deploy ...") // 查询上次执行结果 lastOutput, err := n.outputRepo.GetByNodeId(ctx, n.node.Id) if err != nil && !domain.IsRecordNotFoundError(err) { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "查询部署记录失败", err.Error()) return err } @@ -43,20 +43,22 @@ func (n *deployNode) Process(ctx context.Context) error { previousNodeOutputCertificateSource := n.node.GetConfigForDeploy().Certificate previousNodeOutputCertificateSourceSlice := strings.Split(previousNodeOutputCertificateSource, "#") if len(previousNodeOutputCertificateSourceSlice) != 2 { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "证书来源配置错误", previousNodeOutputCertificateSource) - return fmt.Errorf("证书来源配置错误: %s", previousNodeOutputCertificateSource) + n.logger.Warn("invalid certificate source", slog.String("certificate.source", previousNodeOutputCertificateSource)) + return fmt.Errorf("invalid certificate source: %s", previousNodeOutputCertificateSource) } certificate, err := n.certRepo.GetByWorkflowNodeId(ctx, previousNodeOutputCertificateSourceSlice[0]) if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "获取证书失败", err.Error()) + n.logger.Warn("invalid certificate source", slog.String("certificate.source", previousNodeOutputCertificateSource)) return err } // 检测是否可以跳过本次执行 if lastOutput != nil && certificate.CreatedAt.Before(lastOutput.UpdatedAt) { if skippable, skipReason := n.checkCanSkip(ctx, lastOutput); skippable { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, skipReason) + n.logger.Warn(fmt.Sprintf("skip this deployment, because %s", skipReason)) return nil + } else if skipReason != "" { + n.logger.Info(fmt.Sprintf("continue to deploy, because %s", skipReason)) } } @@ -66,16 +68,16 @@ func (n *deployNode) Process(ctx context.Context) error { PrivateKey string }{Certificate: certificate.Certificate, PrivateKey: certificate.PrivateKey}) if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "获取部署对象失败", err.Error()) + n.logger.Warn("failed to create deployer provider") return err } // 部署证书 + deployer.SetLogger(n.logger) if err := deployer.Deploy(ctx); err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "部署失败", err.Error()) + n.logger.Warn("failed to deploy") return err } - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "部署成功") // 保存执行结果 output := &domain.WorkflowOutput{ @@ -86,10 +88,11 @@ func (n *deployNode) Process(ctx context.Context) error { Succeeded: true, } if _, err := n.outputRepo.Save(ctx, output); err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "保存部署记录失败", err.Error()) + n.logger.Warn("failed to save node output") return err } - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "保存部署记录成功") + + n.logger.Info("apply completed") return nil } @@ -100,14 +103,14 @@ func (n *deployNode) checkCanSkip(ctx context.Context, lastOutput *domain.Workfl currentNodeConfig := n.node.GetConfigForDeploy() lastNodeConfig := lastOutput.Node.GetConfigForDeploy() if currentNodeConfig.ProviderAccessId != lastNodeConfig.ProviderAccessId { - return false, "配置项变化：主机提供商授权" + return false, "the configuration item 'ProviderAccessId' changed" } if !maps.Equal(currentNodeConfig.ProviderConfig, lastNodeConfig.ProviderConfig) { - return false, "配置项变化：主机提供商参数" + return false, "the configuration item 'ProviderConfig' changed" } if currentNodeConfig.SkipOnLastSucceeded { - return true, "已部署过证书，跳过此次部署" + return true, "the certificate has already been deployed" } } diff --git a/internal/workflow/node-processor/execute_failure_node.go b/internal/workflow/node-processor/execute_failure_node.go index 2516edb4..59f6a5bd 100644 --- a/internal/workflow/node-processor/execute_failure_node.go +++ b/internal/workflow/node-processor/execute_failure_node.go @@ -8,19 +8,19 @@ import ( type executeFailureNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor } func NewExecuteFailureNode(node *domain.WorkflowNode) *executeFailureNode { return &executeFailureNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), } } func (n *executeFailureNode) Process(ctx context.Context) error { // 此类型节点不需要执行任何操作，直接返回 - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "进入执行失败分支") + n.logger.Info("the previous node execution was failed") return nil } diff --git a/internal/workflow/node-processor/execute_success_node.go b/internal/workflow/node-processor/execute_success_node.go index a7833a53..e5b65860 100644 --- a/internal/workflow/node-processor/execute_success_node.go +++ b/internal/workflow/node-processor/execute_success_node.go @@ -8,19 +8,19 @@ import ( type executeSuccessNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor } func NewExecuteSuccessNode(node *domain.WorkflowNode) *executeSuccessNode { return &executeSuccessNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), } } func (n *executeSuccessNode) Process(ctx context.Context) error { // 此类型节点不需要执行任何操作，直接返回 - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "进入执行成功分支") + n.logger.Info("the previous node execution was succeeded") return nil } diff --git a/internal/workflow/node-processor/notify_node.go b/internal/workflow/node-processor/notify_node.go index e4c3da2d..1c2b49d8 100644 --- a/internal/workflow/node-processor/notify_node.go +++ b/internal/workflow/node-processor/notify_node.go @@ -2,6 +2,7 @@ package nodeprocessor import ( "context" + "log/slog" "github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/notify" @@ -10,45 +11,44 @@ import ( type notifyNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor settingsRepo settingsRepository } func NewNotifyNode(node *domain.WorkflowNode) *notifyNode { return ¬ifyNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), settingsRepo: repository.NewSettingsRepository(), } } func (n *notifyNode) Process(ctx context.Context) error { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "进入推送通知节点") + n.logger.Info("ready to notify ...") nodeConfig := n.node.GetConfigForNotify() // 获取通知配置 settings, err := n.settingsRepo.GetByName(ctx, "notifyChannels") if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "获取通知配置失败", err.Error()) return err } // 获取通知渠道 channelConfig, err := settings.GetNotifyChannelConfig(nodeConfig.Channel) if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "获取通知渠道配置失败", err.Error()) return err } // 发送通知 if err := notify.SendToChannel(nodeConfig.Subject, nodeConfig.Message, nodeConfig.Channel, channelConfig); err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "发送通知失败", err.Error()) + n.logger.Warn("failed to notify", slog.String("channel", nodeConfig.Channel)) return err } - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "发送通知成功") + + n.logger.Info("notify completed") return nil } diff --git a/internal/workflow/node-processor/processor.go b/internal/workflow/node-processor/processor.go index 08712280..4523b13a 100644 --- a/internal/workflow/node-processor/processor.go +++ b/internal/workflow/node-processor/processor.go @@ -2,21 +2,34 @@ package nodeprocessor import ( "context" - "errors" - "time" + "fmt" + "io" + "log/slog" "github.com/usual2970/certimate/internal/domain" ) type NodeProcessor interface { - Process(ctx context.Context) error + GetLogger() *slog.Logger + SetLogger(*slog.Logger) - GetLog(ctx context.Context) *domain.WorkflowRunLog - AppendLogRecord(ctx context.Context, level domain.WorkflowRunLogLevel, content string, err ...string) + Process(ctx context.Context) error } -type nodeLogger struct { - log *domain.WorkflowRunLog +type nodeProcessor struct { + logger *slog.Logger +} + +func (n *nodeProcessor) GetLogger() *slog.Logger { + return n.logger +} + +func (n *nodeProcessor) SetLogger(logger *slog.Logger) { + if logger == nil { + panic("logger is nil") + } + + n.logger = logger } type certificateRepository interface { @@ -33,34 +46,12 @@ type settingsRepository interface { GetByName(ctx context.Context, name string) (*domain.Settings, error) } -func newNodeLogger(node *domain.WorkflowNode) *nodeLogger { - return &nodeLogger{ - log: &domain.WorkflowRunLog{ - NodeId: node.Id, - NodeName: node.Name, - Records: make([]domain.WorkflowRunLogRecord, 0), - }, +func newNodeProcessor(node *domain.WorkflowNode) *nodeProcessor { + return &nodeProcessor{ + logger: slog.New(slog.NewTextHandler(io.Discard, nil)), } } -func (l *nodeLogger) GetLog(ctx context.Context) *domain.WorkflowRunLog { - return l.log -} - -func (l *nodeLogger) AppendLogRecord(ctx context.Context, level domain.WorkflowRunLogLevel, content string, err ...string) { - record := domain.WorkflowRunLogRecord{ - Time: time.Now().UTC().Format(time.RFC3339), - Level: level, - Content: content, - } - if len(err) > 0 { - record.Error = err[0] - l.log.Error = err[0] - } - - l.log.Records = append(l.log.Records, record) -} - func GetProcessor(node *domain.WorkflowNode) (NodeProcessor, error) { switch node.Type { case domain.WorkflowNodeTypeStart: @@ -80,7 +71,8 @@ func GetProcessor(node *domain.WorkflowNode) (NodeProcessor, error) { case domain.WorkflowNodeTypeExecuteFailure: return NewExecuteFailureNode(node), nil } - return nil, errors.New("not implemented") + + return nil, fmt.Errorf("supported node type: %s", string(node.Type)) } func getContextWorkflowId(ctx context.Context) string { diff --git a/internal/workflow/node-processor/start_node.go b/internal/workflow/node-processor/start_node.go index 7d04685a..5bbc1c09 100644 --- a/internal/workflow/node-processor/start_node.go +++ b/internal/workflow/node-processor/start_node.go @@ -8,19 +8,19 @@ import ( type startNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor } func NewStartNode(node *domain.WorkflowNode) *startNode { return &startNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), } } func (n *startNode) Process(ctx context.Context) error { // 此类型节点不需要执行任何操作，直接返回 - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "进入开始节点") + n.logger.Info("ready to start ...") return nil } diff --git a/internal/workflow/node-processor/upload_node.go b/internal/workflow/node-processor/upload_node.go index 99108481..a3640c2d 100644 --- a/internal/workflow/node-processor/upload_node.go +++ b/internal/workflow/node-processor/upload_node.go @@ -2,18 +2,16 @@ package nodeprocessor import ( "context" - "errors" + "fmt" "strings" - "time" "github.com/usual2970/certimate/internal/domain" - "github.com/usual2970/certimate/internal/pkg/utils/certs" "github.com/usual2970/certimate/internal/repository" ) type uploadNode struct { node *domain.WorkflowNode - *nodeLogger + *nodeProcessor certRepo certificateRepository outputRepo workflowOutputRepository @@ -21,8 +19,8 @@ type uploadNode struct { func NewUploadNode(node *domain.WorkflowNode) *uploadNode { return &uploadNode{ - node: node, - nodeLogger: newNodeLogger(node), + node: node, + nodeProcessor: newNodeProcessor(node), certRepo: repository.NewCertificateRepository(), outputRepo: repository.NewWorkflowOutputRepository(), @@ -30,33 +28,22 @@ func NewUploadNode(node *domain.WorkflowNode) *uploadNode { } func (n *uploadNode) Process(ctx context.Context) error { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "进入上传证书节点") + n.logger.Info("ready to upload ...") nodeConfig := n.node.GetConfigForUpload() // 查询上次执行结果 lastOutput, err := n.outputRepo.GetByNodeId(ctx, n.node.Id) if err != nil && !domain.IsRecordNotFoundError(err) { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "查询申请记录失败", err.Error()) return err } // 检测是否可以跳过本次执行 if skippable, skipReason := n.checkCanSkip(ctx, lastOutput); skippable { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, skipReason) + n.logger.Warn(fmt.Sprintf("skip this upload, because %s", skipReason)) return nil - } - - // 检查证书是否过期 - // 如果证书过期，则直接返回错误 - certX509, err := certs.ParseCertificateFromPEM(nodeConfig.Certificate) - if err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "解析证书失败") - return err - } - if time.Now().After(certX509.NotAfter) { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelWarn, "证书已过期") - return errors.New("certificate is expired") + } else if skipReason != "" { + n.logger.Info(fmt.Sprintf("continue to upload, because %s", skipReason)) } // 生成证书实体 @@ -75,10 +62,11 @@ func (n *uploadNode) Process(ctx context.Context) error { Outputs: n.node.Outputs, } if _, err := n.outputRepo.SaveWithCertificate(ctx, output, certificate); err != nil { - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelError, "保存上传记录失败", err.Error()) + n.logger.Warn("failed to save node output") return err } - n.AppendLogRecord(ctx, domain.WorkflowRunLogLevelInfo, "保存上传记录成功") + + n.logger.Info("upload completed") return nil } @@ -89,15 +77,15 @@ func (n *uploadNode) checkCanSkip(ctx context.Context, lastOutput *domain.Workfl currentNodeConfig := n.node.GetConfigForUpload() lastNodeConfig := lastOutput.Node.GetConfigForUpload() if strings.TrimSpace(currentNodeConfig.Certificate) != strings.TrimSpace(lastNodeConfig.Certificate) { - return false, "配置项变化：证书" + return false, "the configuration item 'Certificate' changed" } if strings.TrimSpace(currentNodeConfig.PrivateKey) != strings.TrimSpace(lastNodeConfig.PrivateKey) { - return false, "配置项变化：私钥" + return false, "the configuration item 'PrivateKey' changed" } lastCertificate, _ := n.certRepo.GetByWorkflowNodeId(ctx, n.node.Id) if lastCertificate != nil { - return true, "已上传过证书" + return true, "the certificate has already been uploaded" } } diff --git a/internal/workflow/service.go b/internal/workflow/service.go index d2236a8d..892ee00b 100644 --- a/internal/workflow/service.go +++ b/internal/workflow/service.go @@ -32,7 +32,7 @@ type WorkflowService struct { func NewWorkflowService(workflowRepo workflowRepository, workflowRunRepo workflowRunRepository) *WorkflowService { srv := &WorkflowService{ - dispatcher: dispatcher.GetSingletonDispatcher(workflowRepo, workflowRunRepo), + dispatcher: dispatcher.GetSingletonDispatcher(), workflowRepo: workflowRepo, workflowRunRepo: workflowRunRepo, @@ -83,6 +83,7 @@ func (s *WorkflowService) StartRun(ctx context.Context, req *dtos.WorkflowStartR Status: domain.WorkflowRunStatusTypePending, Trigger: req.RunTrigger, StartedAt: time.Now(), + Detail: workflow.Content, } if resp, err := s.workflowRunRepo.Save(ctx, run); err != nil { return err @@ -91,8 +92,8 @@ func (s *WorkflowService) StartRun(ctx context.Context, req *dtos.WorkflowStartR } s.dispatcher.Dispatch(&dispatcher.WorkflowWorkerData{ - WorkflowId: workflow.Id, - WorkflowContent: workflow.Content, + WorkflowId: run.WorkflowId, + WorkflowContent: run.Detail, RunId: run.Id, }) diff --git a/migrations/1740050400_collections_hotfix.go b/migrations/1740050400_upgrade.go similarity index 83% rename from migrations/1740050400_collections_hotfix.go rename to migrations/1740050400_upgrade.go index be193a17..93bc3f33 100644 --- a/migrations/1740050400_collections_hotfix.go +++ b/migrations/1740050400_upgrade.go @@ -7,11 +7,13 @@ import ( func init() { m.Register(func(app core.App) error { - certimateCollection, err := app.FindCollectionByNameOrId("4szxr9x43tpj6np") - if err != nil { - return err - } else { - // update field + // update collection `certificate` + { + certimateCollection, err := app.FindCollectionByNameOrId("4szxr9x43tpj6np") + if err != nil { + return err + } + if err := certimateCollection.Fields.AddMarshaledJSONAt(4, []byte(`{ "autogeneratePattern": "", "hidden": false, @@ -29,7 +31,6 @@ func init() { return err } - // update field if err := certimateCollection.Fields.AddMarshaledJSONAt(5, []byte(`{ "autogeneratePattern": "", "hidden": false, @@ -47,7 +48,6 @@ func init() { return err } - // update field if err := certimateCollection.Fields.AddMarshaledJSONAt(7, []byte(`{ "autogeneratePattern": "", "hidden": false, @@ -70,11 +70,13 @@ func init() { } } - workflowCollection, err := app.FindCollectionByNameOrId("tovyif5ax6j62ur") - if err != nil { - return err - } else { - // update field + // update collection `workflow` + { + workflowCollection, err := app.FindCollectionByNameOrId("tovyif5ax6j62ur") + if err != nil { + return err + } + if err := workflowCollection.Fields.AddMarshaledJSONAt(6, []byte(`{ "hidden": false, "id": "awlphkfe", @@ -88,7 +90,6 @@ func init() { return err } - // update field if err := workflowCollection.Fields.AddMarshaledJSONAt(7, []byte(`{ "hidden": false, "id": "g9ohkk5o", @@ -107,11 +108,13 @@ func init() { } } - workflowOutputCollection, err := app.FindCollectionByNameOrId("bqnxb95f2cooowp") - if err != nil { - return err - } else { - // update field + // update collection `workflow_output` + { + workflowOutputCollection, err := app.FindCollectionByNameOrId("bqnxb95f2cooowp") + if err != nil { + return err + } + if err := workflowOutputCollection.Fields.AddMarshaledJSONAt(4, []byte(`{ "hidden": false, "id": "c2rm9omj", diff --git a/migrations/1742209200_upgrade.go b/migrations/1742209200_upgrade.go new file mode 100644 index 00000000..8c9ede5f --- /dev/null +++ b/migrations/1742209200_upgrade.go @@ -0,0 +1,320 @@ +package migrations + +import ( + "encoding/json" + "strings" + + "github.com/pocketbase/pocketbase/core" + m "github.com/pocketbase/pocketbase/migrations" + + "github.com/usual2970/certimate/internal/domain" +) + +func init() { + m.Register(func(app core.App) error { + // create collection `workflow_logs` + { + jsonData := `{ + "createRule": null, + "deleteRule": null, + "fields": [ + { + "autogeneratePattern": "[a-z0-9]{15}", + "hidden": false, + "id": "text3208210256", + "max": 15, + "min": 15, + "name": "id", + "pattern": "^[a-z0-9]+$", + "presentable": false, + "primaryKey": true, + "required": true, + "system": true, + "type": "text" + }, + { + "cascadeDelete": true, + "collectionId": "tovyif5ax6j62ur", + "hidden": false, + "id": "relation3371272342", + "maxSelect": 1, + "minSelect": 0, + "name": "workflowId", + "presentable": false, + "required": false, + "system": false, + "type": "relation" + }, + { + "cascadeDelete": true, + "collectionId": "qjp8lygssgwyqyz", + "hidden": false, + "id": "relation821863227", + "maxSelect": 1, + "minSelect": 0, + "name": "runId", + "presentable": false, + "required": false, + "system": false, + "type": "relation" + }, + { + "autogeneratePattern": "", + "hidden": false, + "id": "text157423495", + "max": 0, + "min": 0, + "name": "nodeId", + "pattern": "", + "presentable": false, + "primaryKey": false, + "required": false, + "system": false, + "type": "text" + }, + { + "autogeneratePattern": "", + "hidden": false, + "id": "text3227511481", + "max": 0, + "min": 0, + "name": "nodeName", + "pattern": "", + "presentable": false, + "primaryKey": false, + "required": false, + "system": false, + "type": "text" + }, + { + "autogeneratePattern": "", + "hidden": false, + "id": "text2599078931", + "max": 0, + "min": 0, + "name": "level", + "pattern": "", + "presentable": false, + "primaryKey": false, + "required": false, + "system": false, + "type": "text" + }, + { + "autogeneratePattern": "", + "hidden": false, + "id": "text3065852031", + "max": 0, + "min": 0, + "name": "message", + "pattern": "", + "presentable": false, + "primaryKey": false, + "required": false, + "system": false, + "type": "text" + }, + { + "hidden": false, + "id": "json2918445923", + "maxSize": 0, + "name": "data", + "presentable": false, + "required": false, + "system": false, + "type": "json" + }, + { + "hidden": false, + "id": "autodate2990389176", + "name": "created", + "onCreate": true, + "onUpdate": false, + "presentable": false, + "system": false, + "type": "autodate" + } + ], + "id": "pbc_1682296116", + "indexes": [ + "CREATE INDEX ` + "`" + `idx_IOlpy6XuJ2` + "`" + ` ON ` + "`" + `workflow_logs` + "`" + ` (` + "`" + `workflowId` + "`" + `)", + "CREATE INDEX ` + "`" + `idx_qVlTb2yl7v` + "`" + ` ON ` + "`" + `workflow_logs` + "`" + ` (` + "`" + `runId` + "`" + `)" + ], + "listRule": null, + "name": "workflow_logs", + "system": false, + "type": "base", + "updateRule": null, + "viewRule": null + }` + + collection := &core.Collection{} + if err := json.Unmarshal([]byte(jsonData), &collection); err != nil { + return err + } + + if err := app.Save(collection); err != nil { + return err + } + } + + // migrate data + { + workflowRuns, err := app.FindAllRecords("workflow_run") + if err != nil { + return err + } + + for _, workflowRun := range workflowRuns { + type oldWorkflowRunLogRecord struct { + Time string `json:"time"` + Level string `json:"level"` + Content string `json:"content"` + Error string `json:"error"` + } + type oldWorkflowRunLog struct { + NodeId string `json:"nodeId"` + NodeName string `json:"nodeName"` + Records []oldWorkflowRunLogRecord `json:"records"` + Error string `json:"error"` + } + + logs := make([]oldWorkflowRunLog, 0) + if err := workflowRun.UnmarshalJSONField("logs", &logs); err != nil { + continue + } + + collection, err := app.FindCollectionByNameOrId("workflow_logs") + if err != nil { + return err + } + + for _, log := range logs { + for _, logRecord := range log.Records { + record := core.NewRecord(collection) + record.Set("workflowId", workflowRun.Get("workflowId")) + record.Set("runId", workflowRun.Get("id")) + record.Set("nodeId", log.NodeId) + record.Set("nodeName", log.NodeName) + record.Set("level", logRecord.Level) + record.Set("message", strings.TrimSpace(logRecord.Content+" "+logRecord.Error)) + record.Set("created", log.Records) + if err := app.Save(record); err != nil { + return err + } + } + } + } + } + + // update collection `workflow_run` + { + collection, err := app.FindCollectionByNameOrId("workflow_run") + if err != nil { + return err + } + + if err := collection.Fields.AddMarshaledJSONAt(6, []byte(`{ + "hidden": false, + "id": "json772177811", + "maxSize": 5000000, + "name": "detail", + "presentable": false, + "required": false, + "system": false, + "type": "json" + }`)); err != nil { + return err + } + + if err := app.Save(collection); err != nil { + return err + } + } + + // migrate data + { + workflowRuns, err := app.FindAllRecords("workflow_run") + if err != nil { + return err + } + + workflowOutputs, err := app.FindAllRecords("workflow_output") + if err != nil { + return err + } + + for _, workflowRun := range workflowRuns { + node := &domain.WorkflowNode{} + for _, workflowOutput := range workflowOutputs { + if workflowOutput.GetString("runId") != workflowRun.Get("id") { + continue + } + + if err := workflowOutput.UnmarshalJSONField("node", node); err != nil { + continue + } + + if node.Type != domain.WorkflowNodeTypeApply { + node = &domain.WorkflowNode{} + continue + } + } + + if node.Id == "" { + workflow, _ := app.FindRecordById("workflow", workflowRun.GetString("workflowId")) + if workflow != nil { + workflowRun.Set("detail", workflow.Get("content")) + } else { + workflowRun.Set("detail", make(map[string]any)) + } + } else { + workflow, _ := app.FindRecordById("workflow", workflowRun.GetString("workflowId")) + if workflow != nil { + rootNode := &domain.WorkflowNode{} + if err := workflow.UnmarshalJSONField("content", rootNode); err != nil { + return err + } + + rootNode.Next = node + workflowRun.Set("detail", rootNode) + } else { + rootNode := &domain.WorkflowNode{ + Id: core.GenerateDefaultRandomId(), + Type: domain.WorkflowNodeTypeStart, + Name: "开始", + Config: map[string]any{ + "trigger": "manual", + }, + Next: node, + Validated: true, + } + workflowRun.Set("detail", rootNode) + } + } + + if err := app.Save(workflowRun); err != nil { + return err + } + } + } + + // update collection `workflow_run` + { + collection, err := app.FindCollectionByNameOrId("workflow_run") + if err != nil { + return err + } + + collection.Fields.RemoveByName("logs") + + if err := app.Save(collection); err != nil { + return err + } + } + + return nil + }, func(app core.App) error { + return nil + }) +} From 92bae0c4399aa7f41ea7dd81b4de2e7f38c5230d Mon Sep 17 00:00:00 2001 From: root Date: Tue, 18 Mar 2025 16:48:19 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BD=E5=B1=B1?= =?UTF-8?q?=E4=BA=91API=20400209=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go | 2 +- internal/pkg/vendors/baishan-sdk/models.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index efb3353e..7e064979 100644 --- a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -59,7 +59,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // REF: https://portal.baishancloud.com/track/document/api/1/1065 getDomainConfigReq := &bssdk.GetDomainConfigRequest{ Domains: d.config.Domain, - Config: "https", + Config: []string{"https"}, } getDomainConfigResp, err := d.sdkClient.GetDomainConfig(getDomainConfigReq) if err != nil { diff --git a/internal/pkg/vendors/baishan-sdk/models.go b/internal/pkg/vendors/baishan-sdk/models.go index 78685571..100c1dbf 100644 --- a/internal/pkg/vendors/baishan-sdk/models.go +++ b/internal/pkg/vendors/baishan-sdk/models.go @@ -31,7 +31,7 @@ type CreateCertificateResponse struct { type GetDomainConfigRequest struct { Domains string `json:"domains"` - Config string `json:"config"` + Config []string `json:"config"` } type GetDomainConfigResponse struct { From 984d2a47b8c2f4bec3bf84087dee968835249253 Mon Sep 17 00:00:00 2001 From: RHQYZ Date: Tue, 18 Mar 2025 18:23:46 +0800 Subject: [PATCH 05/23] style: format code --- internal/pkg/vendors/baishan-sdk/models.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/vendors/baishan-sdk/models.go b/internal/pkg/vendors/baishan-sdk/models.go index 100c1dbf..e1c79c0e 100644 --- a/internal/pkg/vendors/baishan-sdk/models.go +++ b/internal/pkg/vendors/baishan-sdk/models.go @@ -31,7 +31,7 @@ type CreateCertificateResponse struct { type GetDomainConfigRequest struct { Domains string `json:"domains"` - Config []string `json:"config"` + Config []string `json:"config"` } type GetDomainConfigResponse struct { From fd6e41c566fac67f9ceb97ed8e25ccd4b3d67df8 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Tue, 18 Mar 2025 20:02:39 +0800 Subject: [PATCH 06/23] feat(ui): workflow logs --- internal/deployer/deployer.go | 4 +- .../workflow/node-processor/deploy_node.go | 2 +- .../components/workflow/WorkflowRunDetail.tsx | 152 +++++++++++++++--- ui/src/domain/workflowLog.ts | 7 + ui/src/domain/workflowRun.ts | 17 +- ui/src/i18n/locales/en/nls.dashboard.json | 2 +- ui/src/i18n/locales/zh/nls.dashboard.json | 2 +- ui/src/pages/certificates/CertificateList.tsx | 6 +- ui/src/pages/dashboard/Dashboard.tsx | 2 +- ui/src/pages/workflows/WorkflowList.tsx | 4 +- ui/src/repository/_pocketbase.ts | 1 + ui/src/repository/certificate.ts | 6 +- ui/src/repository/workflow.ts | 4 +- ui/src/repository/workflowLog.ts | 19 +++ ui/src/repository/workflowRun.ts | 4 +- ui/src/stores/access/index.ts | 4 +- 16 files changed, 173 insertions(+), 63 deletions(-) create mode 100644 ui/src/domain/workflowLog.ts create mode 100644 ui/src/repository/workflowLog.ts diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index 3a892404..36e92866 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -54,7 +54,6 @@ func NewWithDeployNode(node *domain.WorkflowNode, certdata struct { } return &proxyDeployer{ - logger: slog.Default(), deployer: deployer, deployCertificate: certdata.Certificate, deployPrivateKey: certdata.PrivateKey, @@ -63,7 +62,6 @@ func NewWithDeployNode(node *domain.WorkflowNode, certdata struct { // TODO: 暂时使用代理模式以兼容之前版本代码，后续重新实现此处逻辑 type proxyDeployer struct { - logger *slog.Logger deployer deployer.Deployer deployCertificate string deployPrivateKey string @@ -74,7 +72,7 @@ func (d *proxyDeployer) SetLogger(logger *slog.Logger) { panic("logger is nil") } - d.logger = logger + d.deployer.WithLogger(logger) } func (d *proxyDeployer) Deploy(ctx context.Context) error { diff --git a/internal/workflow/node-processor/deploy_node.go b/internal/workflow/node-processor/deploy_node.go index 556ca891..95d99bfa 100644 --- a/internal/workflow/node-processor/deploy_node.go +++ b/internal/workflow/node-processor/deploy_node.go @@ -92,7 +92,7 @@ func (n *deployNode) Process(ctx context.Context) error { return err } - n.logger.Info("apply completed") + n.logger.Info("deploy completed") return nil } diff --git a/ui/src/components/workflow/WorkflowRunDetail.tsx b/ui/src/components/workflow/WorkflowRunDetail.tsx index 785624f9..5fbe5520 100644 --- a/ui/src/components/workflow/WorkflowRunDetail.tsx +++ b/ui/src/components/workflow/WorkflowRunDetail.tsx @@ -1,16 +1,19 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; -import { SelectOutlined as SelectOutlinedIcon } from "@ant-design/icons"; +import { RightOutlined as RightOutlinedIcon, SelectOutlined as SelectOutlinedIcon } from "@ant-design/icons"; import { useRequest } from "ahooks"; -import { Alert, Button, Divider, Empty, Space, Table, type TableProps, Tooltip, Typography, notification } from "antd"; +import { Alert, Button, Collapse, Divider, Empty, Skeleton, Space, Spin, Table, type TableProps, Tooltip, Typography, notification } from "antd"; import dayjs from "dayjs"; import { ClientResponseError } from "pocketbase"; import CertificateDetailDrawer from "@/components/certificate/CertificateDetailDrawer"; import Show from "@/components/Show"; import { type CertificateModel } from "@/domain/certificate"; +import type { WorkflowLogModel } from "@/domain/workflowLog"; import { WORKFLOW_RUN_STATUSES, type WorkflowRunModel } from "@/domain/workflowRun"; -import { listByWorkflowRunId as listCertificateByWorkflowRunId } from "@/repository/certificate"; +import { listByWorkflowRunId as listCertificatesByWorkflowRunId } from "@/repository/certificate"; +import { listByWorkflowRunId as listLogsByWorkflowRunId } from "@/repository/workflowLog"; +import { mergeCls } from "@/utils/css"; import { getErrMsg } from "@/utils/error"; export type WorkflowRunDetailProps = { @@ -33,28 +36,7 @@ const WorkflowRunDetail = ({ data, ...props }: WorkflowRunDetailProps) => {
- {t("workflow_run.logs")} -
-
- {data.logs?.map((item, i) => { - return ( -
-
{item.nodeName}
-
- {item.records?.map((output, j) => { - return ( -
-
[{dayjs(output.time).format("YYYY-MM-DD HH:mm:ss")}]
- {output.error ?
{output.error}
:
{output.content}
} -
- ); - })} -
-
- ); - })} -
-
+
@@ -66,6 +48,124 @@ const WorkflowRunDetail = ({ data, ...props }: WorkflowRunDetailProps) => { ); }; +const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: string }) => { + const { t } = useTranslation(); + + type Log = Pick; + type LogGroup = { id: string; name: string; records: Log[] }; + + const [listData, setListData] = useState([]); + const { loading } = useRequest( + () => { + return listLogsByWorkflowRunId(runId); + }, + { + refreshDeps: [runId, runStatus], + pollingInterval: runStatus === WORKFLOW_RUN_STATUSES.PENDING || runStatus === WORKFLOW_RUN_STATUSES.RUNNING ? 5000 : 0, + pollingWhenHidden: false, + throttleWait: 500, + onBefore: () => { + setListData([]); + }, + onSuccess: (res) => { + setListData( + res.items.reduce((acc, e) => { + let group = acc.at(-1); + if (!group || group.id !== e.nodeId) { + group = { id: e.nodeId, name: e.nodeName, records: [] }; + acc.push(group); + } + group.records.push({ level: e.level, message: e.message, data: e.data, created: e.created }); + return acc; + }, [] as LogGroup[]) + ); + }, + onError: (err) => { + if (err instanceof ClientResponseError && err.isAbort) { + return; + } + + console.error(err); + + throw err; + }, + } + ); + + const renderLogRecord = (record: Log) => { + let message = <>{record.message}; + if (record.data != null && Object.keys(record.data).length > 0) { + message = ( +
+ {record.message} + {Object.entries(record.data).map(([key, value]) => ( +
+
{key}:
+
{JSON.stringify(value)}
+
+ ))} +
+ ); + } + + return ( +
+
[{dayjs(record.created).format("YYYY-MM-DD HH:mm:ss")}]
+
+ {message} +
+
+ ); + }; + + return ( + <> + {t("workflow_run.logs")} +
+ 0} + fallback={ + + + + } + > +
+ group.id)} + expandIcon={({ isActive }) => } + items={listData.map((group) => { + return { + key: group.id, + classNames: { + header: "text-sm text-stone-200", + body: "text-stone-200", + }, + style: { color: "inherit", border: "none" }, + styles: { + header: { color: "inherit" }, + }, + label: group.name, + children:
{group.records.map((record) => renderLogRecord(record))}
, + }; + })} + /> +
+ +
+ + ); +}; + const WorkflowRunArtifacts = ({ runId }: { runId: string }) => { const { t } = useTranslation(); @@ -117,7 +217,7 @@ const WorkflowRunArtifacts = ({ runId }: { runId: string }) => { const [tableData, setTableData] = useState([]); const { loading: tableLoading } = useRequest( () => { - return listCertificateByWorkflowRunId(runId); + return listCertificatesByWorkflowRunId(runId); }, { refreshDeps: [runId], diff --git a/ui/src/domain/workflowLog.ts b/ui/src/domain/workflowLog.ts new file mode 100644 index 00000000..ffe6fdd8 --- /dev/null +++ b/ui/src/domain/workflowLog.ts @@ -0,0 +1,7 @@ +export interface WorkflowLogModel extends Omit { + nodeId: string; + nodeName: string; + level: "DEBUG" | "INFO" | "WARN" | "ERROR"; + message: string; + data: Record; +} diff --git a/ui/src/domain/workflowRun.ts b/ui/src/domain/workflowRun.ts index 80872b31..6df4a406 100644 --- a/ui/src/domain/workflowRun.ts +++ b/ui/src/domain/workflowRun.ts @@ -6,27 +6,12 @@ export interface WorkflowRunModel extends BaseModel { trigger: string; startedAt: ISO8601String; endedAt: ISO8601String; - logs?: WorkflowRunLog[]; error?: string; expand?: { - workflowId?: WorkflowModel; + workflowId?: WorkflowModel; // TODO: ugly, maybe to use an alias? }; } -export type WorkflowRunLog = { - nodeId: string; - nodeName: string; - records?: WorkflowRunLogRecord[]; - error?: string; -}; - -export type WorkflowRunLogRecord = { - time: ISO8601String; - level: string; - content: string; - error?: string; -}; - export const WORKFLOW_RUN_STATUSES = Object.freeze({ PENDING: "pending", RUNNING: "running", diff --git a/ui/src/i18n/locales/en/nls.dashboard.json b/ui/src/i18n/locales/en/nls.dashboard.json index 8ae9d94d..38e20e1b 100644 --- a/ui/src/i18n/locales/en/nls.dashboard.json +++ b/ui/src/i18n/locales/en/nls.dashboard.json @@ -8,7 +8,7 @@ "dashboard.statistics.enabled_workflows": "Enabled workflows", "dashboard.statistics.unit": "", - "dashboard.latest_workflow_run": "Latest workflow run", + "dashboard.latest_workflow_runs": "Latest workflow runs", "dashboard.quick_actions": "Quick actions", "dashboard.quick_actions.create_workflow": "Create workflow", diff --git a/ui/src/i18n/locales/zh/nls.dashboard.json b/ui/src/i18n/locales/zh/nls.dashboard.json index badd7cb8..30eb5972 100644 --- a/ui/src/i18n/locales/zh/nls.dashboard.json +++ b/ui/src/i18n/locales/zh/nls.dashboard.json @@ -8,7 +8,7 @@ "dashboard.statistics.enabled_workflows": "已启用工作流", "dashboard.statistics.unit": "个", - "dashboard.latest_workflow_run": "最近执行的工作流", + "dashboard.latest_workflow_runs": "最近执行的工作流", "dashboard.quick_actions": "快捷操作", "dashboard.quick_actions.create_workflow": "新建工作流", diff --git a/ui/src/pages/certificates/CertificateList.tsx b/ui/src/pages/certificates/CertificateList.tsx index 265f0185..049069a3 100644 --- a/ui/src/pages/certificates/CertificateList.tsx +++ b/ui/src/pages/certificates/CertificateList.tsx @@ -28,7 +28,7 @@ import { ClientResponseError } from "pocketbase"; import CertificateDetailDrawer from "@/components/certificate/CertificateDetailDrawer"; import { CERTIFICATE_SOURCES, type CertificateModel } from "@/domain/certificate"; -import { type ListCertificateRequest, list as listCertificate, remove as removeCertificate } from "@/repository/certificate"; +import { list as listCertificates, type ListRequest as listCertificatesRequest, remove as removeCertificate } from "@/repository/certificate"; import { getErrMsg } from "@/utils/error"; const CertificateList = () => { @@ -223,9 +223,9 @@ const CertificateList = () => { run: refreshData, } = useRequest( () => { - return listCertificate({ + return listCertificates({ keyword: filters["keyword"] as string, - state: filters["state"] as ListCertificateRequest["state"], + state: filters["state"] as listCertificatesRequest["state"], page: page, perPage: pageSize, }); diff --git a/ui/src/pages/dashboard/Dashboard.tsx b/ui/src/pages/dashboard/Dashboard.tsx index ea7a21cb..83f8cd47 100644 --- a/ui/src/pages/dashboard/Dashboard.tsx +++ b/ui/src/pages/dashboard/Dashboard.tsx @@ -275,7 +275,7 @@ const Dashboard = () => { - + columns={tableColumns} dataSource={tableData} diff --git a/ui/src/pages/workflows/WorkflowList.tsx b/ui/src/pages/workflows/WorkflowList.tsx index 18a8b577..09bca7fc 100644 --- a/ui/src/pages/workflows/WorkflowList.tsx +++ b/ui/src/pages/workflows/WorkflowList.tsx @@ -41,7 +41,7 @@ import { ClientResponseError } from "pocketbase"; import { WORKFLOW_TRIGGERS, type WorkflowModel, isAllNodesValidated } from "@/domain/workflow"; import { WORKFLOW_RUN_STATUSES } from "@/domain/workflowRun"; -import { list as listWorkflow, remove as removeWorkflow, save as saveWorkflow } from "@/repository/workflow"; +import { list as listWorkflows, remove as removeWorkflow, save as saveWorkflow } from "@/repository/workflow"; import { getErrMsg } from "@/utils/error"; const WorkflowList = () => { @@ -253,7 +253,7 @@ const WorkflowList = () => { run: refreshData, } = useRequest( () => { - return listWorkflow({ + return listWorkflows({ keyword: filters["keyword"] as string, enabled: (filters["state"] as string) === "enabled" ? true : (filters["state"] as string) === "disabled" ? false : undefined, page: page, diff --git a/ui/src/repository/_pocketbase.ts b/ui/src/repository/_pocketbase.ts index 983c4987..85068f50 100644 --- a/ui/src/repository/_pocketbase.ts +++ b/ui/src/repository/_pocketbase.ts @@ -14,3 +14,4 @@ export const COLLECTION_NAME_SETTINGS = "settings"; export const COLLECTION_NAME_WORKFLOW = "workflow"; export const COLLECTION_NAME_WORKFLOW_RUN = "workflow_run"; export const COLLECTION_NAME_WORKFLOW_OUTPUT = "workflow_output"; +export const COLLECTION_NAME_WORKFLOW_LOG = "workflow_logs"; diff --git a/ui/src/repository/certificate.ts b/ui/src/repository/certificate.ts index b6b8d55e..f7c95f7d 100644 --- a/ui/src/repository/certificate.ts +++ b/ui/src/repository/certificate.ts @@ -3,14 +3,14 @@ import dayjs from "dayjs"; import { type CertificateModel } from "@/domain/certificate"; import { COLLECTION_NAME_CERTIFICATE, getPocketBase } from "./_pocketbase"; -export type ListCertificateRequest = { +export type ListRequest = { keyword?: string; state?: "expireSoon" | "expired"; page?: number; perPage?: number; }; -export const list = async (request: ListCertificateRequest) => { +export const list = async (request: ListRequest) => { const pb = getPocketBase(); const filters: string[] = ["deleted=null"]; @@ -39,7 +39,7 @@ export const listByWorkflowRunId = async (workflowRunId: string) => { const list = await pb.collection(COLLECTION_NAME_CERTIFICATE).getFullList({ batch: 65535, filter: pb.filter("workflowRunId={:workflowRunId}", { workflowRunId: workflowRunId }), - sort: "-created", + // sort: "created", requestKey: null, }); diff --git a/ui/src/repository/workflow.ts b/ui/src/repository/workflow.ts index 0b35a5e2..5701927c 100644 --- a/ui/src/repository/workflow.ts +++ b/ui/src/repository/workflow.ts @@ -3,14 +3,14 @@ import { type RecordSubscription } from "pocketbase"; import { type WorkflowModel } from "@/domain/workflow"; import { COLLECTION_NAME_WORKFLOW, getPocketBase } from "./_pocketbase"; -export type ListWorkflowRequest = { +export type ListRequest = { keyword?: string; enabled?: boolean; page?: number; perPage?: number; }; -export const list = async (request: ListWorkflowRequest) => { +export const list = async (request: ListRequest) => { const pb = getPocketBase(); const filters: string[] = []; diff --git a/ui/src/repository/workflowLog.ts b/ui/src/repository/workflowLog.ts new file mode 100644 index 00000000..a866d624 --- /dev/null +++ b/ui/src/repository/workflowLog.ts @@ -0,0 +1,19 @@ +import { type WorkflowLogModel } from "@/domain/workflowLog"; + +import { COLLECTION_NAME_WORKFLOW_LOG, getPocketBase } from "./_pocketbase"; + +export const listByWorkflowRunId = async (workflowRunId: string) => { + const pb = getPocketBase(); + + const list = await pb.collection(COLLECTION_NAME_WORKFLOW_LOG).getFullList({ + batch: 65535, + filter: pb.filter("runId={:runId}", { runId: workflowRunId }), + // sort: "created", + requestKey: null, + }); + + return { + totalItems: list.length, + items: list, + }; +}; diff --git a/ui/src/repository/workflowRun.ts b/ui/src/repository/workflowRun.ts index 51038f18..22c69802 100644 --- a/ui/src/repository/workflowRun.ts +++ b/ui/src/repository/workflowRun.ts @@ -4,14 +4,14 @@ import { type WorkflowRunModel } from "@/domain/workflowRun"; import { COLLECTION_NAME_WORKFLOW_RUN, getPocketBase } from "./_pocketbase"; -export type ListWorkflowRunsRequest = { +export type ListRequest = { workflowId?: string; page?: number; perPage?: number; expand?: boolean; }; -export const list = async (request: ListWorkflowRunsRequest) => { +export const list = async (request: ListRequest) => { const pb = getPocketBase(); const filters: string[] = []; diff --git a/ui/src/stores/access/index.ts b/ui/src/stores/access/index.ts index 61601978..55d8835a 100644 --- a/ui/src/stores/access/index.ts +++ b/ui/src/stores/access/index.ts @@ -2,7 +2,7 @@ import { create } from "zustand"; import { type AccessModel } from "@/domain/access"; -import { list as listAccess, remove as removeAccess, save as saveAccess } from "@/repository/access"; +import { list as listAccesses, remove as removeAccess, save as saveAccess } from "@/repository/access"; export interface AccessesState { accesses: AccessModel[]; @@ -24,7 +24,7 @@ export const useAccessesStore = create((set) => { loadedAtOnce: false, fetchAccesses: async () => { - fetcher ??= listAccess().then((res) => res.items); + fetcher ??= listAccesses().then((res) => res.items); try { set({ loading: true }); From 882f8025853449b9a581e04dc2c10936ac86bfe1 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 19 Mar 2025 10:09:30 +0800 Subject: [PATCH 07/23] feat(ui): enhance workflow logs display --- internal/domain/workflow_log.go | 5 +- .../huaweicloud-elb/huaweicloud_elb.go | 8 - internal/repository/workflow_log.go | 4 +- internal/workflow/dispatcher/invoker.go | 1 + .../workflow/node-processor/apply_node.go | 4 +- .../workflow/node-processor/deploy_node.go | 2 +- .../workflow/node-processor/upload_node.go | 2 +- migrations/1742209200_upgrade.go | 17 +- .../components/workflow/WorkflowRunDetail.tsx | 153 ++++++++++++++---- .../components/workflow/node/BranchNode.tsx | 14 +- .../workflow/node/ExecuteResultBranchNode.tsx | 14 +- ui/src/domain/workflowLog.ts | 1 + ui/src/i18n/locales/en/nls.workflow.runs.json | 4 +- ui/src/i18n/locales/zh/nls.workflow.runs.json | 4 +- ui/src/repository/certificate.ts | 2 +- ui/src/repository/workflowLog.ts | 2 +- 16 files changed, 168 insertions(+), 69 deletions(-) diff --git a/internal/domain/workflow_log.go b/internal/domain/workflow_log.go index a33c5480..05eef5a7 100644 --- a/internal/domain/workflow_log.go +++ b/internal/domain/workflow_log.go @@ -8,8 +8,9 @@ type WorkflowLog struct { Meta WorkflowId string `json:"workflowId" db:"workflowId"` RunId string `json:"workflorunIdwId" db:"runId"` - NodeId string `json:"nodeId"` - NodeName string `json:"nodeName"` + NodeId string `json:"nodeId" db:"nodeId"` + NodeName string `json:"nodeName" db:"nodeName"` + Timestamp int64 `json:"timestamp" db:"timestamp"` // 毫秒级时间戳 Level string `json:"level" db:"level"` Message string `json:"message" db:"message"` Data map[string]any `json:"data" db:"data"` diff --git a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 8783c053..618af762 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -90,14 +90,6 @@ func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { } func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { - // 上传证书到 SCM - upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) - if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") - } else { - d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) - } - // 根据部署资源类型决定部署方式 switch d.config.ResourceType { case RESOURCE_TYPE_CERTIFICATE: diff --git a/internal/repository/workflow_log.go b/internal/repository/workflow_log.go index 95bc2e7d..0b801231 100644 --- a/internal/repository/workflow_log.go +++ b/internal/repository/workflow_log.go @@ -22,7 +22,7 @@ func (r *WorkflowLogRepository) ListByWorkflowRunId(ctx context.Context, workflo records, err := app.GetApp().FindRecordsByFilter( domain.CollectionNameWorkflowLog, "runId={:runId}", - "-created", + "timestamp", 0, 0, dbx.Params{"runId": workflowRunId}, ) @@ -66,6 +66,7 @@ func (r *WorkflowLogRepository) Save(ctx context.Context, workflowLog *domain.Wo record.Set("runId", workflowLog.RunId) record.Set("nodeId", workflowLog.NodeId) record.Set("nodeName", workflowLog.NodeName) + record.Set("timestamp", workflowLog.Timestamp) record.Set("level", workflowLog.Level) record.Set("message", workflowLog.Message) record.Set("data", workflowLog.Data) @@ -102,6 +103,7 @@ func (r *WorkflowLogRepository) castRecordToModel(record *core.Record) (*domain. RunId: record.GetString("runId"), NodeId: record.GetString("nodeId"), NodeName: record.GetString("nodeName"), + Timestamp: int64(record.GetInt("timestamp")), Level: record.GetString("level"), Message: record.GetString("message"), Data: logdata, diff --git a/internal/workflow/dispatcher/invoker.go b/internal/workflow/dispatcher/invoker.go index 23d70f01..5f344458 100644 --- a/internal/workflow/dispatcher/invoker.go +++ b/internal/workflow/dispatcher/invoker.go @@ -80,6 +80,7 @@ func (w *workflowInvoker) processNode(ctx context.Context, node *domain.Workflow log.RunId = w.runId log.NodeId = current.Id log.NodeName = current.Name + log.Timestamp = record.Time.UnixMilli() log.Level = record.Level.String() log.Message = record.Message log.Data = record.Data diff --git a/internal/workflow/node-processor/apply_node.go b/internal/workflow/node-processor/apply_node.go index 2fc6c223..dc9a95d1 100644 --- a/internal/workflow/node-processor/apply_node.go +++ b/internal/workflow/node-processor/apply_node.go @@ -42,7 +42,7 @@ func (n *applyNode) Process(ctx context.Context) error { // 检测是否可以跳过本次执行 if skippable, skipReason := n.checkCanSkip(ctx, lastOutput); skippable { - n.logger.Warn(fmt.Sprintf("skip this application, because %s", skipReason)) + n.logger.Info(fmt.Sprintf("skip this application, because %s", skipReason)) return nil } else if skipReason != "" { n.logger.Info(fmt.Sprintf("continue to apply, because %s", skipReason)) @@ -124,7 +124,7 @@ func (n *applyNode) checkCanSkip(ctx context.Context, lastOutput *domain.Workflo renewalInterval := time.Duration(currentNodeConfig.SkipBeforeExpiryDays) * time.Hour * 24 expirationTime := time.Until(lastCertificate.ExpireAt) if expirationTime > renewalInterval { - return true, fmt.Sprintf("the certificate has already been issued (expires in %dD, next renewal in %dD)", int(expirationTime.Hours()/24), currentNodeConfig.SkipBeforeExpiryDays) + return true, fmt.Sprintf("the certificate has already been issued (expires in %dd, next renewal in %dd)", int(expirationTime.Hours()/24), currentNodeConfig.SkipBeforeExpiryDays) } } } diff --git a/internal/workflow/node-processor/deploy_node.go b/internal/workflow/node-processor/deploy_node.go index 95d99bfa..42bc9ca6 100644 --- a/internal/workflow/node-processor/deploy_node.go +++ b/internal/workflow/node-processor/deploy_node.go @@ -55,7 +55,7 @@ func (n *deployNode) Process(ctx context.Context) error { // 检测是否可以跳过本次执行 if lastOutput != nil && certificate.CreatedAt.Before(lastOutput.UpdatedAt) { if skippable, skipReason := n.checkCanSkip(ctx, lastOutput); skippable { - n.logger.Warn(fmt.Sprintf("skip this deployment, because %s", skipReason)) + n.logger.Info(fmt.Sprintf("skip this deployment, because %s", skipReason)) return nil } else if skipReason != "" { n.logger.Info(fmt.Sprintf("continue to deploy, because %s", skipReason)) diff --git a/internal/workflow/node-processor/upload_node.go b/internal/workflow/node-processor/upload_node.go index a3640c2d..6c46e90f 100644 --- a/internal/workflow/node-processor/upload_node.go +++ b/internal/workflow/node-processor/upload_node.go @@ -40,7 +40,7 @@ func (n *uploadNode) Process(ctx context.Context) error { // 检测是否可以跳过本次执行 if skippable, skipReason := n.checkCanSkip(ctx, lastOutput); skippable { - n.logger.Warn(fmt.Sprintf("skip this upload, because %s", skipReason)) + n.logger.Info(fmt.Sprintf("skip this upload, because %s", skipReason)) return nil } else if skipReason != "" { n.logger.Info(fmt.Sprintf("continue to upload, because %s", skipReason)) diff --git a/migrations/1742209200_upgrade.go b/migrations/1742209200_upgrade.go index 8c9ede5f..0a980972 100644 --- a/migrations/1742209200_upgrade.go +++ b/migrations/1742209200_upgrade.go @@ -3,6 +3,7 @@ package migrations import ( "encoding/json" "strings" + "time" "github.com/pocketbase/pocketbase/core" m "github.com/pocketbase/pocketbase/migrations" @@ -86,6 +87,18 @@ func init() { "system": false, "type": "text" }, + { + "hidden": false, + "id": "number2782324286", + "max": null, + "min": null, + "name": "timestamp", + "onlyInt": false, + "presentable": false, + "required": false, + "system": false, + "type": "number" + }, { "autogeneratePattern": "", "hidden": false, @@ -192,13 +205,15 @@ func init() { for _, log := range logs { for _, logRecord := range log.Records { record := core.NewRecord(collection) + createdAt, _ := time.Parse(time.RFC3339, logRecord.Time) record.Set("workflowId", workflowRun.Get("workflowId")) record.Set("runId", workflowRun.Get("id")) record.Set("nodeId", log.NodeId) record.Set("nodeName", log.NodeName) + record.Set("timestamp", createdAt.UnixMilli()) record.Set("level", logRecord.Level) record.Set("message", strings.TrimSpace(logRecord.Content+" "+logRecord.Error)) - record.Set("created", log.Records) + record.Set("created", createdAt) if err := app.Save(record); err != nil { return err } diff --git a/ui/src/components/workflow/WorkflowRunDetail.tsx b/ui/src/components/workflow/WorkflowRunDetail.tsx index 5fbe5520..5d8c7f29 100644 --- a/ui/src/components/workflow/WorkflowRunDetail.tsx +++ b/ui/src/components/workflow/WorkflowRunDetail.tsx @@ -1,8 +1,34 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; -import { RightOutlined as RightOutlinedIcon, SelectOutlined as SelectOutlinedIcon } from "@ant-design/icons"; +import { + CheckCircleOutlined as CheckCircleOutlinedIcon, + CheckOutlined as CheckOutlinedIcon, + ClockCircleOutlined as ClockCircleOutlinedIcon, + CloseCircleOutlined as CloseCircleOutlinedIcon, + RightOutlined as RightOutlinedIcon, + SelectOutlined as SelectOutlinedIcon, + SettingOutlined as SettingOutlinedIcon, + StopOutlined as StopOutlinedIcon, + SyncOutlined as SyncOutlinedIcon, +} from "@ant-design/icons"; import { useRequest } from "ahooks"; -import { Alert, Button, Collapse, Divider, Empty, Skeleton, Space, Spin, Table, type TableProps, Tooltip, Typography, notification } from "antd"; +import { + Button, + Collapse, + Divider, + Dropdown, + Empty, + Flex, + Skeleton, + Space, + Spin, + Table, + type TableProps, + Tooltip, + Typography, + notification, + theme, +} from "antd"; import dayjs from "dayjs"; import { ClientResponseError } from "pocketbase"; @@ -23,25 +49,14 @@ export type WorkflowRunDetailProps = { }; const WorkflowRunDetail = ({ data, ...props }: WorkflowRunDetailProps) => { - const { t } = useTranslation(); - return (
- - {t("workflow_run.props.status.succeeded")}} /> - - - - {t("workflow_run.props.status.failed")}} /> - - -
+ -
+ - + -
@@ -51,9 +66,10 @@ const WorkflowRunDetail = ({ data, ...props }: WorkflowRunDetailProps) => { const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: string }) => { const { t } = useTranslation(); - type Log = Pick; - type LogGroup = { id: string; name: string; records: Log[] }; + const { token: themeToken } = theme.useToken(); + type Log = Pick; + type LogGroup = { id: string; name: string; records: Log[] }; const [listData, setListData] = useState([]); const { loading } = useRequest( () => { @@ -61,13 +77,12 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin }, { refreshDeps: [runId, runStatus], - pollingInterval: runStatus === WORKFLOW_RUN_STATUSES.PENDING || runStatus === WORKFLOW_RUN_STATUSES.RUNNING ? 5000 : 0, + pollingInterval: runStatus === WORKFLOW_RUN_STATUSES.PENDING || runStatus === WORKFLOW_RUN_STATUSES.RUNNING ? 3000 : 0, pollingWhenHidden: false, throttleWait: 500, - onBefore: () => { - setListData([]); - }, onSuccess: (res) => { + if (res.items.length === listData.flatMap((e) => e.records).length) return; + setListData( res.items.reduce((acc, e) => { let group = acc.at(-1); @@ -75,7 +90,7 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin group = { id: e.nodeId, name: e.nodeName, records: [] }; acc.push(group); } - group.records.push({ level: e.level, message: e.message, data: e.data, created: e.created }); + group.records.push({ timestamp: e.timestamp, level: e.level, message: e.message, data: e.data }); return acc; }, [] as LogGroup[]) ); @@ -92,7 +107,52 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin } ); - const renderLogRecord = (record: Log) => { + const [showTimestamp, setShowTimestamp] = useState(true); + const [showWhitespace, setShowWhitespace] = useState(true); + + const renderBadge = () => { + switch (runStatus) { + case WORKFLOW_RUN_STATUSES.PENDING: + return ( + + + {t("workflow_run.props.status.pending")} + + ); + case WORKFLOW_RUN_STATUSES.RUNNING: + return ( + + + {t("workflow_run.props.status.running")} + + ); + case WORKFLOW_RUN_STATUSES.SUCCEEDED: + return ( + + + {t("workflow_run.props.status.succeeded")} + + ); + case WORKFLOW_RUN_STATUSES.FAILED: + return ( + + + {t("workflow_run.props.status.failed")} + + ); + case WORKFLOW_RUN_STATUSES.CANCELED: + return ( + + + {t("workflow_run.props.status.canceled")} + + ); + } + + return <>; + }; + + const renderRecord = (record: Log) => { let message = <>{record.message}; if (record.data != null && Object.keys(record.data).length > 0) { message = ( @@ -100,8 +160,8 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin {record.message} {Object.entries(record.data).map(([key, value]) => (
-
{key}:
-
{JSON.stringify(value)}
+
{key}:
+
{JSON.stringify(value)}
))} @@ -110,13 +170,14 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin return (
-
[{dayjs(record.created).format("YYYY-MM-DD HH:mm:ss")}]
+ {showTimestamp ?
[{dayjs(record.timestamp).format("YYYY-MM-DD HH:mm:ss")}]
: <>}
{message} @@ -129,6 +190,35 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin <> {t("workflow_run.logs")}
+
+
{renderBadge()}
+
+ , + onClick: () => setShowTimestamp(!showTimestamp), + }, + { + key: "show-whitespace", + label: t("workflow_run.logs.menu.show_whitespaces"), + icon: , + onClick: () => setShowWhitespace(!showWhitespace), + }, + ], + }} + trigger={["click"]} + > +
+
+ + + 0} fallback={ @@ -137,7 +227,7 @@ const WorkflowRunLogs = ({ runId, runStatus }: { runId: string; runStatus: strin } > -
+
{group.records.map((record) => renderLogRecord(record))}
, + children:
{group.records.map((record) => renderRecord(record))}
, }; })} /> @@ -221,9 +311,6 @@ const WorkflowRunArtifacts = ({ runId }: { runId: string }) => { }, { refreshDeps: [runId], - onBefore: () => { - setTableData([]); - }, onSuccess: (res) => { setTableData(res.items); }, diff --git a/ui/src/components/workflow/node/BranchNode.tsx b/ui/src/components/workflow/node/BranchNode.tsx index 4a68f315..f8a755d0 100644 --- a/ui/src/components/workflow/node/BranchNode.tsx +++ b/ui/src/components/workflow/node/BranchNode.tsx @@ -10,8 +10,6 @@ import AddNode from "./AddNode"; import WorkflowElement from "../WorkflowElement"; import { type SharedNodeProps } from "./_SharedNode"; -const { useToken } = theme; - export type BrandNodeProps = SharedNodeProps; const BranchNode = ({ node, disabled }: BrandNodeProps) => { @@ -19,7 +17,7 @@ const BranchNode = ({ node, disabled }: BrandNodeProps) => { const { addBranch } = useWorkflowStore(useZustandShallowSelector(["addBranch"])); - const token = useToken(); + const { token: themeToken } = theme.useToken(); const renderBranch = (node: WorkflowNode, branchNodeId?: string, branchIndex?: number) => { const elements: JSX.Element[] = []; @@ -38,7 +36,7 @@ const BranchNode = ({ node, disabled }: BrandNodeProps) => {
+ + +
+ + + ); +}; + +export default SettingsPersistence; diff --git a/ui/src/router.tsx b/ui/src/router.tsx index 0bfa8b41..923f7f6f 100644 --- a/ui/src/router.tsx +++ b/ui/src/router.tsx @@ -10,6 +10,7 @@ import Settings from "./pages/settings/Settings"; import SettingsAccount from "./pages/settings/SettingsAccount"; import SettingsNotification from "./pages/settings/SettingsNotification"; import SettingsPassword from "./pages/settings/SettingsPassword"; +import SettingsPersistence from "./pages/settings/SettingsPersistence"; import SettingsSSLProvider from "./pages/settings/SettingsSSLProvider"; import WorkflowDetail from "./pages/workflows/WorkflowDetail"; import WorkflowList from "./pages/workflows/WorkflowList"; @@ -64,6 +65,10 @@ export const router = createHashRouter([ path: "/settings/ssl-provider", element: , }, + { + path: "/settings/persistence", + element: , + }, ], }, ], From 7e4aa244598cc0370e556caa991de32c3a7cbfea Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:36:44 +0800 Subject: [PATCH 10/23] fix: #539 --- internal/pkg/vendors/cdnfly-sdk/models.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/vendors/cdnfly-sdk/models.go b/internal/pkg/vendors/cdnfly-sdk/models.go index 873b80b0..87a1b4f1 100644 --- a/internal/pkg/vendors/cdnfly-sdk/models.go +++ b/internal/pkg/vendors/cdnfly-sdk/models.go @@ -25,7 +25,7 @@ type GetSiteRequest struct { type GetSiteResponse struct { baseResponse Data *struct { - Id string `json:"id"` + Id int64 `json:"id"` Name string `json:"name"` Domain string `json:"domain"` HttpsListen string `json:"https_listen"` From 09b1bf6e2d1181cc93603f94dc4cb022c4e8f62c Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:37:02 +0800 Subject: [PATCH 11/23] fix: #523 --- ui/src/components/access/AccessFormGcoreConfig.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/access/AccessFormGcoreConfig.tsx b/ui/src/components/access/AccessFormGcoreConfig.tsx index 8619f7fe..858dac02 100644 --- a/ui/src/components/access/AccessFormGcoreConfig.tsx +++ b/ui/src/components/access/AccessFormGcoreConfig.tsx @@ -28,7 +28,7 @@ const AccessFormGcoreConfig = ({ form: formInst, formName, disabled, initialValu apiToken: z .string() .min(1, t("access.form.gcore_api_token.placeholder")) - .max(64, t("common.errmsg.string_max", { max: 64 })) + .max(256, t("common.errmsg.string_max", { max: 256 })) .trim(), }); const formRule = createSchemaFieldRule(formSchema); From 8e4b3d12bd91b1de96182ee0318b3a7e2d3aa8cf Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:41:56 +0800 Subject: [PATCH 12/23] fix: #527 --- .../deployer/providers/aliyun-fc/aliyun_fc.go | 4 +-- .../providers/aliyun-waf/aliyun_waf.go | 28 +++++++++++++++---- .../DeployNodeConfigFormAliyunFCConfig.tsx | 18 ++++++------ .../DeployNodeConfigFormAliyunWAFConfig.tsx | 18 ++++++++++-- .../i18n/locales/en/nls.workflow.nodes.json | 4 ++- .../i18n/locales/zh/nls.workflow.nodes.json | 8 ++++-- 6 files changed, 57 insertions(+), 23 deletions(-) diff --git a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go index edd2bc76..d5450017 100644 --- a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go +++ b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go @@ -69,12 +69,12 @@ func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { switch d.config.ServiceVersion { - case "3.0": + case "3", "3.0": if err := d.deployToFC3(ctx, certPem, privkeyPem); err != nil { return nil, err } - case "2.0": + case "2", "2.0": if err := d.deployToFC2(ctx, certPem, privkeyPem); err != nil { return nil, err } diff --git a/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go b/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go index dd9248b6..998ee7e7 100644 --- a/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go +++ b/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go @@ -24,6 +24,8 @@ type DeployerConfig struct { AccessKeySecret string `json:"accessKeySecret"` // 阿里云地域。 Region string `json:"region"` + // 服务版本。 + ServiceVersion string `json:"serviceVersion"` // WAF 实例 ID。 InstanceId string `json:"instanceId"` // 接入域名（支持泛域名）。 @@ -77,10 +79,24 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe return nil, errors.New("config `instanceId` is required") } + switch d.config.ServiceVersion { + case "3", "3.0": + if err := d.deployToWAF3(ctx, certPem, privkeyPem); err != nil { + return nil, err + } + + default: + return nil, xerrors.Errorf("unsupported service version: %s", d.config.ServiceVersion) + } + + return &deployer.DeployResult{}, nil +} + +func (d *DeployerProvider) deployToWAF3(ctx context.Context, certPem string, privkeyPem string) error { // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return xerrors.Wrap(err, "failed to upload certificate file") } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -97,7 +113,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe describeDefaultHttpsResp, err := d.sdkClient.DescribeDefaultHttps(describeDefaultHttpsReq) d.logger.Debug("sdk request 'waf.DescribeDefaultHttps'", slog.Any("request", describeDefaultHttpsReq), slog.Any("response", describeDefaultHttpsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDefaultHttps'") + return xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDefaultHttps'") } // 修改默认 SSL/TLS 设置 @@ -116,7 +132,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe modifyDefaultHttpsResp, err := d.sdkClient.ModifyDefaultHttps(modifyDefaultHttpsReq) d.logger.Debug("sdk request 'waf.ModifyDefaultHttps'", slog.Any("request", modifyDefaultHttpsReq), slog.Any("response", modifyDefaultHttpsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDefaultHttps'") + return xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDefaultHttps'") } } else { // 指定接入域名 @@ -131,7 +147,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe describeDomainDetailResp, err := d.sdkClient.DescribeDomainDetail(describeDomainDetailReq) d.logger.Debug("sdk request 'waf.DescribeDomainDetail'", slog.Any("request", describeDomainDetailReq), slog.Any("response", describeDomainDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDomainDetail'") + return xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDomainDetail'") } // 修改 CNAME 接入资源 @@ -163,11 +179,11 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe modifyDomainResp, err := d.sdkClient.ModifyDomain(modifyDomainReq) d.logger.Debug("sdk request 'waf.ModifyDomain'", slog.Any("request", modifyDomainReq), slog.Any("response", modifyDomainResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDomain'") + return xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDomain'") } } - return &deployer.DeployResult{}, nil + return nil } func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunWaf.Client, error) { diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunFCConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunFCConfig.tsx index 87212953..e1d16d07 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunFCConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunFCConfig.tsx @@ -55,6 +55,15 @@ const DeployNodeConfigFormAliyunFCConfig = ({ form: formInst, formName, disabled name={formName} onValuesChange={handleFormChange} > + } + > + + + - } - > - - - ; @@ -20,7 +21,9 @@ export type DeployNodeConfigFormAliyunWAFConfigProps = { }; const initFormModel = (): DeployNodeConfigFormAliyunWAFConfigFieldValues => { - return {}; + return { + serviceVersion: "3.0", + }; }; const DeployNodeConfigFormAliyunWAFConfig = ({ @@ -37,6 +40,9 @@ const DeployNodeConfigFormAliyunWAFConfig = ({ .string({ message: t("workflow_node.deploy.form.aliyun_waf_region.placeholder") }) .nonempty(t("workflow_node.deploy.form.aliyun_waf_region.placeholder")) .trim(), + serviceVersion: z.literal("3.0", { + message: t("workflow_node.deploy.form.aliyun_waf_service_version.placeholder"), + }), instanceId: z .string({ message: t("workflow_node.deploy.form.aliyun_waf_instance_id.placeholder") }) .nonempty(t("workflow_node.deploy.form.aliyun_waf_instance_id.placeholder")) @@ -73,6 +79,14 @@ const DeployNodeConfigFormAliyunWAFConfig = ({ + + + + https://www.alibabacloud.com/help/en/waf/web-application-firewall-3-0/developer-reference/api-waf-openapi-2021-10-01-endpoint", + "workflow_node.deploy.form.aliyun_waf_service_version.label": "Alibaba Cloud WAF version", + "workflow_node.deploy.form.aliyun_waf_service_version.placeholder": "Please select Alibaba Cloud WAF version", "workflow_node.deploy.form.aliyun_waf_instance_id.label": "Alibaba Cloud WAF instance ID", "workflow_node.deploy.form.aliyun_waf_instance_id.placeholder": "Please enter Alibaba Cloud WAF instance ID", "workflow_node.deploy.form.aliyun_waf_instance_id.tooltip": "For more information, see https://waf.console.aliyun.com", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index cbb6a2cf..3144bfa8 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -39,7 +39,7 @@ "workflow_node.apply.form.provider_access.button": "新建", "workflow_node.apply.form.aws_route53_region.label": "AWS Route53 服务区域", "workflow_node.apply.form.aws_route53_region.placeholder": "请输入 AWS Route53 服务区域（例如：us-east-1）", - "workflow_node.apply.form.aws_route53_region.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html#regional-endpoints", + "workflow_node.apply.form.aws_route53_region.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html#regional-endpoints", "workflow_node.apply.form.aws_route53_hosted_zone_id.label": "AWS Route53 托管区域 ID", "workflow_node.apply.form.aws_route53_hosted_zone_id.placeholder": "请输入 AWS Route53 托管区域 ID", "workflow_node.apply.form.aws_route53_hosted_zone_id.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/Route53/latest/DeveloperGuide/hosted-zones-working-with.html", @@ -88,7 +88,7 @@ "workflow_node.deploy.form.provider_access.guide_for_local": "小贴士：由于表单限制，你同样需要为本地部署选择一个授权 —— 即使它是空白的。
请注意，如果你使用 Docker 安装 Certimate，“本地部署”将会部署到容器内而非宿主机上。", "workflow_node.deploy.form.certificate.label": "待部署证书", "workflow_node.deploy.form.certificate.placeholder": "请选择待部署证书", - "workflow_node.deploy.form.certificate.tooltip": "待部署证书来自之前的申请阶段。如果选项为空请先确保前序节点配置正确。", + "workflow_node.deploy.form.certificate.tooltip": "待部署证书来自之前的申请或上传节点。如果选项为空请先确保前序节点配置正确。", "workflow_node.deploy.form.params_config.label": "参数设置", "workflow_node.deploy.form.1panel_console_auto_restart.label": "部署后自动重启面板服务", "workflow_node.deploy.form.1panel_site_website_id.label": "1Panel 网站 ID", @@ -199,6 +199,8 @@ "workflow_node.deploy.form.aliyun_waf_region.label": "阿里云 WAF 服务地域", "workflow_node.deploy.form.aliyun_waf_region.placeholder": "请输入阿里云 WAF 服务地域（例如：cn-hangzhou）", "workflow_node.deploy.form.aliyun_waf_region.tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/waf/web-application-firewall-3-0/developer-reference/api-waf-openapi-2021-10-01-endpoint", + "workflow_node.deploy.form.aliyun_waf_service_version.label": "阿里云 WAF 服务版本", + "workflow_node.deploy.form.aliyun_waf_service_version.placeholder": "请选择阿里云 WAF 服务版本", "workflow_node.deploy.form.aliyun_waf_instance_id.label": "阿里云 WAF 实例 ID", "workflow_node.deploy.form.aliyun_waf_instance_id.placeholder": "请输入阿里云 WAF 实例 ID", "workflow_node.deploy.form.aliyun_waf_instance_id.tooltip": "这是什么？请参阅 https://waf.console.aliyun.com

仅支持 CNAME 接入。", @@ -207,7 +209,7 @@ "workflow_node.deploy.form.aliyun_waf_domain.tooltip": "这是什么？请参阅 waf.console.aliyun.com

不填写时，将替换实例的默认证书。", "workflow_node.deploy.form.aws_cloudfront_region.label": "AWS CloudFront 服务区域", "workflow_node.deploy.form.aws_cloudfront_region.placeholder": "请输入 AWS CloudFront 服务区域（例如：us-east-1）", - "workflow_node.deploy.form.aws_cloudfront_region.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html#regional-endpoints", + "workflow_node.deploy.form.aws_cloudfront_region.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html#regional-endpoints", "workflow_node.deploy.form.aws_cloudfront_distribution_id.label": "AWS CloudFront 分配 ID", "workflow_node.deploy.form.aws_cloudfront_distribution_id.placeholder": "请输入 AWS CloudFront 分配 ID", "workflow_node.deploy.form.aws_cloudfront_distribution_id.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/AmazonCloudFront/latest/DeveloperGuide/distribution-working-with.html", From 16f20dc01df9b6481bcf3d569343db99ec253079 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:43:09 +0800 Subject: [PATCH 13/23] feat: add upyun ssl uploader --- .../providers/qiniu-sslcert/qiniu_sslcert.go | 11 +- .../uploader/providers/upyun-ssl/upyun_ssl.go | 83 +++++++++++ .../providers/upyun-ssl/upyun_ssl_test.go | 72 +++++++++ internal/pkg/vendors/upyun-sdk/console/api.go | 104 +++++++++++++ .../pkg/vendors/upyun-sdk/console/client.go | 94 ++++++++++++ .../pkg/vendors/upyun-sdk/console/models.go | 141 ++++++++++++++++++ 6 files changed, 504 insertions(+), 1 deletion(-) create mode 100644 internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go create mode 100644 internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl_test.go create mode 100644 internal/pkg/vendors/upyun-sdk/console/api.go create mode 100644 internal/pkg/vendors/upyun-sdk/console/client.go create mode 100644 internal/pkg/vendors/upyun-sdk/console/models.go diff --git a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go index ce18a335..6bc71c3f 100644 --- a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go @@ -2,6 +2,7 @@ import ( "context" + "errors" "fmt" "log/slog" "time" @@ -69,7 +70,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe // 上传新证书 // REF: https://developer.qiniu.com/fusion/8593/interface-related-certificate uploadSslCertResp, err := u.sdkClient.UploadSslCert(context.TODO(), certName, certX509.Subject.CommonName, certPem, privkeyPem) - u.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("response", uploadSslCertResp)) + u.logger.Debug("sdk request 'cdn.UploadSslCert'", slog.Any("response", uploadSslCertResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadSslCert'") } @@ -82,6 +83,14 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } func createSdkClient(accessKey, secretKey string) (*qiniusdk.Client, error) { + if secretKey == "" { + return nil, errors.New("invalid qiniu access key") + } + + if secretKey == "" { + return nil, errors.New("invalid qiniu secret key") + } + credential := auth.New(accessKey, secretKey) client := qiniusdk.NewClient(credential) return client, nil diff --git a/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go b/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go new file mode 100644 index 00000000..3e4d3c40 --- /dev/null +++ b/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go @@ -0,0 +1,83 @@ +package upyunssl + +import ( + "context" + "errors" + "log/slog" + + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/uploader" + upyunsdk "github.com/usual2970/certimate/internal/pkg/vendors/upyun-sdk/console" +) + +type UploaderConfig struct { + // 又拍云账号用户名。 + Username string `json:"username"` + // 又拍云账号密码。 + Password string `json:"password"` +} + +type UploaderProvider struct { + config *UploaderConfig + logger *slog.Logger + sdkClient *upyunsdk.Client +} + +var _ uploader.Uploader = (*UploaderProvider)(nil) + +func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { + if config == nil { + panic("config is nil") + } + + client, err := createSdkClient(config.Username, config.Password) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create sdk client") + } + + return &UploaderProvider{ + config: config, + logger: slog.Default(), + sdkClient: client, + }, nil +} + +func (u *UploaderProvider) WithLogger(logger *slog.Logger) uploader.Uploader { + if logger == nil { + u.logger = slog.Default() + } else { + u.logger = logger + } + return u +} + +func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { + // 上传证书 + uploadHttpsCertificateReq := &upyunsdk.UploadHttpsCertificateRequest{ + Certificate: certPem, + PrivateKey: privkeyPem, + } + uploadHttpsCertificateResp, err := u.sdkClient.UploadHttpsCertificate(uploadHttpsCertificateReq) + u.logger.Debug("sdk request 'ssl.UploadHttpsCertificate'", slog.Any("response", uploadHttpsCertificateResp)) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.UploadHttpsCertificate'") + } + + return &uploader.UploadResult{ + CertId: uploadHttpsCertificateResp.Data.Result.CertificateId, + }, nil +} + +func createSdkClient(username, password string) (*upyunsdk.Client, error) { + if username == "" { + return nil, errors.New("invalid upyun username") + } + + if password == "" { + return nil, errors.New("invalid upyun password") + } + + client := upyunsdk.NewClient(username, password) + return client, nil +} diff --git a/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl_test.go b/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl_test.go new file mode 100644 index 00000000..1e6d81ec --- /dev/null +++ b/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl_test.go @@ -0,0 +1,72 @@ +package upyunssl_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/upyun-ssl" +) + +var ( + fInputCertPath string + fInputKeyPath string + fUsername string + fPassword string +) + +func init() { + argsPrefix := "CERTIMATE_UPLOADER_UPYUNSSL_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fUsername, argsPrefix+"USERNAME", "", "") + flag.StringVar(&fPassword, argsPrefix+"PASSWORD", "", "") +} + +/* +Shell command to run this test: + + go test -v ./upyun_ssl_test.go -args \ + --CERTIMATE_UPLOADER_UPYUNSSL_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --CERTIMATE_UPLOADER_UPYUNSSL_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --CERTIMATE_UPLOADER_UPYUNSSL_USERNAME="your-username" \ + --CERTIMATE_UPLOADER_UPYUNSSL_PASSWORD="your-password" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("USERNAME: %v", fUsername), + fmt.Sprintf("PASSWORD: %v", fPassword), + }, "\n")) + + uploader, err := provider.NewUploader(&provider.UploaderConfig{ + Username: fUsername, + Password: fPassword, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := uploader.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/internal/pkg/vendors/upyun-sdk/console/api.go b/internal/pkg/vendors/upyun-sdk/console/api.go new file mode 100644 index 00000000..afcb0b5b --- /dev/null +++ b/internal/pkg/vendors/upyun-sdk/console/api.go @@ -0,0 +1,104 @@ +package console + +import ( + "encoding/json" + "errors" + "fmt" + "net/http" +) + +func (c *Client) getCookie() error { + req := &signinRequest{Username: c.username, Password: c.password} + res, err := c.sendRequest(http.MethodPost, "/accounts/signin/", req) + if err != nil { + return err + } + + resp := &signinResponse{} + if err := json.Unmarshal(res.Body(), &resp); err != nil { + return fmt.Errorf("upyun api error: failed to parse response: %w", err) + } else if !resp.Data.Result { + return errors.New("upyun console signin failed") + } + + c.loginCookie = res.Header().Get("Set-Cookie") + + return nil +} + +func (c *Client) UploadHttpsCertificate(req *UploadHttpsCertificateRequest) (*UploadHttpsCertificateResponse, error) { + if c.loginCookie == "" { + if err := c.getCookie(); err != nil { + return nil, err + } + } + + resp := UploadHttpsCertificateResponse{} + err := c.sendRequestWithResult(http.MethodPost, "/api/https/certificate/", req, &resp) + if err != nil { + return nil, err + } + return &resp, nil +} + +func (c *Client) GetHttpsCertificateManager(certificateId string) (*GetHttpsCertificateManagerResponse, error) { + if c.loginCookie == "" { + if err := c.getCookie(); err != nil { + return nil, err + } + } + + req := GetHttpsCertificateManagerRequest{CertificateId: certificateId} + resp := GetHttpsCertificateManagerResponse{} + err := c.sendRequestWithResult(http.MethodGet, "/api/https/certificate/manager/", &req, &resp) + if err != nil { + return nil, err + } + return &resp, nil +} + +func (c *Client) UpdateHttpsCertificateManager(req *UpdateHttpsCertificateManagerRequest) (*UpdateHttpsCertificateManagerResponse, error) { + if c.loginCookie == "" { + if err := c.getCookie(); err != nil { + return nil, err + } + } + + resp := UpdateHttpsCertificateManagerResponse{} + err := c.sendRequestWithResult(http.MethodPost, "/api/https/certificate/manager", req, &resp) + if err != nil { + return nil, err + } + return &resp, nil +} + +func (c *Client) GetHttpsServiceManager(domain string) (*GetHttpsServiceManagerResponse, error) { + if c.loginCookie == "" { + if err := c.getCookie(); err != nil { + return nil, err + } + } + + req := GetHttpsServiceManagerRequest{Domain: domain} + resp := GetHttpsServiceManagerResponse{} + err := c.sendRequestWithResult(http.MethodGet, "/api/https/services/manager", &req, &resp) + if err != nil { + return nil, err + } + return &resp, nil +} + +func (c *Client) MigrateHttpsDomain(req *MigrateHttpsDomainRequest) (*MigrateHttpsDomainResponse, error) { + if c.loginCookie == "" { + if err := c.getCookie(); err != nil { + return nil, err + } + } + + resp := MigrateHttpsDomainResponse{} + err := c.sendRequestWithResult(http.MethodPost, "/api/https/migrate/domain", req, &resp) + if err != nil { + return nil, err + } + return &resp, nil +} diff --git a/internal/pkg/vendors/upyun-sdk/console/client.go b/internal/pkg/vendors/upyun-sdk/console/client.go new file mode 100644 index 00000000..74758b82 --- /dev/null +++ b/internal/pkg/vendors/upyun-sdk/console/client.go @@ -0,0 +1,94 @@ +package console + +import ( + "encoding/json" + "fmt" + "net/http" + "strings" + "time" + + "github.com/go-resty/resty/v2" +) + +type Client struct { + username string + password string + loginCookie string + + client *resty.Client +} + +func NewClient(username, password string) *Client { + client := resty.New() + + return &Client{ + username: username, + password: password, + client: client, + } +} + +func (c *Client) WithTimeout(timeout time.Duration) *Client { + c.client.SetTimeout(timeout) + return c +} + +func (c *Client) sendRequest(method string, path string, params interface{}) (*resty.Response, error) { + req := c.client.R().SetBasicAuth(c.username, c.password) + req.Method = method + req.URL = "https://console.upyun.com" + path + if strings.EqualFold(method, http.MethodGet) { + qs := make(map[string]string) + if params != nil { + temp := make(map[string]any) + jsonb, _ := json.Marshal(params) + json.Unmarshal(jsonb, &temp) + for k, v := range temp { + if v != nil { + qs[k] = fmt.Sprintf("%v", v) + } + } + } + + req = req. + SetQueryParams(qs). + SetHeader("Cookie", c.loginCookie) + } else { + req = req. + SetHeader("Content-Type", "application/json"). + SetHeader("Cookie", c.loginCookie). + SetBody(params) + } + + req = req.SetDebug(true) + resp, err := req.Send() + if err != nil { + return nil, fmt.Errorf("upyun api error: failed to send request: %w", err) + } else if resp.IsError() { + return nil, fmt.Errorf("upyun api error: unexpected status code: %d, %s", resp.StatusCode(), resp.Body()) + } + + return resp, nil +} + +func (c *Client) sendRequestWithResult(method string, path string, params interface{}, result interface{}) error { + resp, err := c.sendRequest(method, path, params) + if err != nil { + return err + } + + if err := json.Unmarshal(resp.Body(), &result); err != nil { + return fmt.Errorf("upyun api error: failed to parse response: %w", err) + } + + tresp := &baseResponse{} + if err := json.Unmarshal(resp.Body(), &tresp); err != nil { + return fmt.Errorf("upyun api error: failed to parse response: %w", err) + } else if tdata := tresp.GetData(); tdata == nil { + return fmt.Errorf("upyun api error: empty data") + } else if errcode := tdata.GetErrorCode(); errcode > 0 { + return fmt.Errorf("upyun api error: %d - %s", errcode, tdata.GetErrorMessage()) + } + + return nil +} diff --git a/internal/pkg/vendors/upyun-sdk/console/models.go b/internal/pkg/vendors/upyun-sdk/console/models.go new file mode 100644 index 00000000..982993fe --- /dev/null +++ b/internal/pkg/vendors/upyun-sdk/console/models.go @@ -0,0 +1,141 @@ +package console + +import ( + "encoding/json" +) + +type baseResponse struct { + Data *baseResponseData `json:"data,omitempty"` +} + +func (r *baseResponse) GetData() *baseResponseData { + return r.Data +} + +type baseResponseData struct { + ErrorCode json.Number `json:"error_code"` + ErrorMessage string `json:"message"` +} + +func (r *baseResponseData) GetErrorCode() int { + if r.ErrorCode.String() == "" { + return 0 + } + + errcode, err := r.ErrorCode.Int64() + if err != nil { + return -1 + } + + return int(errcode) +} + +func (r *baseResponseData) GetErrorMessage() string { + return r.ErrorMessage +} + +type signinRequest struct { + Username string `json:"username"` + Password string `json:"password"` +} + +type signinResponse struct { + baseResponse + Data struct { + baseResponseData + Result bool `json:"result"` + } `json:"data"` +} + +type UploadHttpsCertificateRequest struct { + Certificate string `json:"certificate"` + PrivateKey string `json:"private_key"` +} + +type UploadHttpsCertificateResponse struct { + baseResponse + Data *struct { + baseResponseData + Status int `json:"status"` + Result struct { + CertificateId string `json:"certificate_id"` + CommonName string `json:"commonName"` + Serial string `json:"serial"` + } `json:"result"` + } `json:"data"` +} + +type GetHttpsCertificateManagerRequest struct { + CertificateId string `json:"certificate_id"` +} + +type GetHttpsCertificateManagerResponse struct { + baseResponse + Data *struct { + baseResponseData + AuthenticateNum int32 `json:"authenticate_num"` + AuthenticateDomains []string `json:"authenticate_domain"` + Domains []HttpsCertificateManagerDomain `json:"domains"` + } `json:"data"` +} + +type HttpsCertificateManagerDomain struct { + Name string `json:"name"` + Type string `json:"type"` + BucketId int64 `json:"bucket_id"` + BucketName string `json:"bucket_name"` +} + +type UpdateHttpsCertificateManagerRequest struct { + CertificateId string `json:"certificate_id"` + Domain string `json:"domain"` + Https bool `json:"https"` + ForceHttps bool `json:"force_https"` +} + +type UpdateHttpsCertificateManagerResponse struct { + baseResponse + Data *struct { + baseResponseData + Status bool `json:"status"` + } `json:"data"` +} + +type GetHttpsServiceManagerRequest struct { + Domain string `json:"domain"` +} + +type GetHttpsServiceManagerResponse struct { + baseResponse + Data *struct { + baseResponseData + Status int `json:"status"` + Domains []HttpsServiceManagerDomain `json:"result"` + } `json:"data"` +} + +type HttpsServiceManagerDomain struct { + CertificateId string `json:"certificate_id"` + CommonName string `json:"commonName"` + Https bool `json:"https"` + ForceHttps bool `json:"force_https"` + PaymentType string `json:"payment_type"` + DomainType string `json:"domain_type"` + Validity struct { + Start int64 `json:"start"` + End int64 `json:"end"` + } `json:"validity"` +} + +type MigrateHttpsDomainRequest struct { + CertificateId string `json:"crt_id"` + Domain string `json:"domain_name"` +} + +type MigrateHttpsDomainResponse struct { + baseResponse + Data *struct { + baseResponseData + Status bool `json:"status"` + } `json:"data"` +} From 4acbbf6e135b5de9e91f95feebaa3f90a10efb6d Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:49:16 +0800 Subject: [PATCH 14/23] feat: add upyun cdn deployer --- internal/app/scheduler.go | 1 + internal/deployer/providers.go | 23 ++++ internal/domain/access.go | 5 + internal/domain/provider.go | 3 + .../deployer/providers/qiniu-cdn/qiniu_cdn.go | 14 +- .../deployer/providers/upyun-cdn/upyun_cdn.go | 129 ++++++++++++++++++ .../providers/upyun-cdn/upyun_cdn_test.go | 75 ++++++++++ migrations/1742392800_upgrade.go | 81 +++++++++++ ui/public/imgs/providers/upyun.svg | 1 + ui/src/components/access/AccessForm.tsx | 3 + .../access/AccessFormUpyunConfig.tsx | 76 +++++++++++ .../DeployNodeConfigFormUpyunCDNConfig.tsx | 59 ++++++++ ui/src/domain/access.ts | 6 + ui/src/domain/provider.ts | 4 + ui/src/i18n/locales/en/nls.access.json | 6 + ui/src/i18n/locales/en/nls.provider.json | 2 + .../i18n/locales/en/nls.workflow.nodes.json | 3 + ui/src/i18n/locales/zh/nls.access.json | 6 + ui/src/i18n/locales/zh/nls.provider.json | 2 + .../i18n/locales/zh/nls.workflow.nodes.json | 3 + 20 files changed, 495 insertions(+), 7 deletions(-) create mode 100644 internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go create mode 100644 internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go create mode 100644 migrations/1742392800_upgrade.go create mode 100644 ui/public/imgs/providers/upyun.svg create mode 100644 ui/src/components/access/AccessFormUpyunConfig.tsx create mode 100644 ui/src/components/workflow/node/DeployNodeConfigFormUpyunCDNConfig.tsx diff --git a/internal/app/scheduler.go b/internal/app/scheduler.go index 1b16ac32..c5e93c9f 100644 --- a/internal/app/scheduler.go +++ b/internal/app/scheduler.go @@ -3,6 +3,7 @@ package app import ( "sync" "time" + _ "time/tzdata" "github.com/pocketbase/pocketbase/tools/cron" ) diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index 4e03ad2e..7d62ac41 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -56,6 +56,7 @@ import ( pTencentCloudWAF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-waf" pUCloudUCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-ucdn" pUCloudUS3 "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-us3" + pUpyunCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/upyun-cdn" pVolcEngineCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-cdn" pVolcEngineCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-clb" pVolcEngineDCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-dcdn" @@ -225,6 +226,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { AccessKeyId: access.AccessKeyId, AccessKeySecret: access.AccessKeySecret, Region: maputil.GetString(options.ProviderDeployConfig, "region"), + ServiceVersion: maputil.GetOrDefaultString(options.ProviderDeployConfig, "serviceVersion", "3.0"), InstanceId: maputil.GetString(options.ProviderDeployConfig, "instanceId"), Domain: maputil.GetString(options.ProviderDeployConfig, "domain"), }) @@ -775,6 +777,27 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } + case domain.DeployProviderTypeUpyunCDN: + { + access := domain.AccessConfigForUpyun{} + if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { + return nil, fmt.Errorf("failed to populate provider access config: %w", err) + } + + switch options.Provider { + case domain.DeployProviderTypeUpyunCDN: + deployer, err := pUpyunCDN.NewDeployer(&pUpyunCDN.DeployerConfig{ + Username: access.Username, + Password: access.Password, + Domain: maputil.GetString(options.ProviderDeployConfig, "domain"), + }) + return deployer, err + + default: + break + } + } + case domain.DeployProviderTypeVolcEngineCDN, domain.DeployProviderTypeVolcEngineCLB, domain.DeployProviderTypeVolcEngineDCDN, domain.DeployProviderTypeVolcEngineImageX, domain.DeployProviderTypeVolcEngineLive, domain.DeployProviderTypeVolcEngineTOS: { access := domain.AccessConfigForVolcEngine{} diff --git a/internal/domain/access.go b/internal/domain/access.go index fc6a7eb1..963d4083 100644 --- a/internal/domain/access.go +++ b/internal/domain/access.go @@ -201,6 +201,11 @@ type AccessConfigForUCloud struct { ProjectId string `json:"projectId,omitempty"` } +type AccessConfigForUpyun struct { + Username string `json:"username"` + Password string `json:"password"` +} + type AccessConfigForVolcEngine struct { AccessKeyId string `json:"accessKeyId"` SecretAccessKey string `json:"secretAccessKey"` diff --git a/internal/domain/provider.go b/internal/domain/provider.go index 78c79d4a..cbc034fa 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -28,6 +28,7 @@ const ( AccessProviderTypeCUCCCloud = AccessProviderType("cucccloud") // 天翼云（预留） AccessProviderTypeDNSLA = AccessProviderType("dnsla") AccessProviderTypeDogeCloud = AccessProviderType("dogecloud") + AccessProviderTypeDynv6 = AccessProviderType("dynv6") // dynv6（预留） AccessProviderTypeEdgio = AccessProviderType("edgio") AccessProviderTypeFastly = AccessProviderType("fastly") // Fastly（预留） AccessProviderTypeGname = AccessProviderType("gname") @@ -50,6 +51,7 @@ const ( AccessProviderTypeSSH = AccessProviderType("ssh") AccessProviderTypeTencentCloud = AccessProviderType("tencentcloud") AccessProviderTypeUCloud = AccessProviderType("ucloud") + AccessProviderTypeUpyun = AccessProviderType("upyun") AccessProviderTypeVolcEngine = AccessProviderType("volcengine") AccessProviderTypeWebhook = AccessProviderType("webhook") AccessProviderTypeWestcn = AccessProviderType("westcn") @@ -158,6 +160,7 @@ const ( DeployProviderTypeTencentCloudWAF = DeployProviderType("tencentcloud-waf") DeployProviderTypeUCloudUCDN = DeployProviderType("ucloud-ucdn") DeployProviderTypeUCloudUS3 = DeployProviderType("ucloud-us3") + DeployProviderTypeUpyunCDN = DeployProviderType("upyun-cdn") DeployProviderTypeVolcEngineCDN = DeployProviderType("volcengine-cdn") DeployProviderTypeVolcEngineCLB = DeployProviderType("volcengine-clb") DeployProviderTypeVolcEngineDCDN = DeployProviderType("volcengine-dcdn") diff --git a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go index 02dac427..e8166afd 100644 --- a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -87,18 +87,18 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPe // 判断域名是否已启用 HTTPS。如果已启用，修改域名证书；否则，启用 HTTPS // REF: https://developer.qiniu.com/fusion/4246/the-domain-name - if getDomainInfoResp.Https != nil && getDomainInfoResp.Https.CertID != "" { - modifyDomainHttpsConfResp, err := d.sdkClient.ModifyDomainHttpsConf(context.TODO(), domain, upres.CertId, getDomainInfoResp.Https.ForceHttps, getDomainInfoResp.Https.Http2Enable) - d.logger.Debug("sdk request 'cdn.ModifyDomainHttpsConf'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", modifyDomainHttpsConfResp)) - if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ModifyDomainHttpsConf'") - } - } else { + if getDomainInfoResp.Https == nil || getDomainInfoResp.Https.CertID == "" { enableDomainHttpsResp, err := d.sdkClient.EnableDomainHttps(context.TODO(), domain, upres.CertId, true, true) d.logger.Debug("sdk request 'cdn.EnableDomainHttps'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", enableDomainHttpsResp)) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.EnableDomainHttps'") } + } else if getDomainInfoResp.Https.CertID != upres.CertId { + modifyDomainHttpsConfResp, err := d.sdkClient.ModifyDomainHttpsConf(context.TODO(), domain, upres.CertId, getDomainInfoResp.Https.ForceHttps, getDomainInfoResp.Https.Http2Enable) + d.logger.Debug("sdk request 'cdn.ModifyDomainHttpsConf'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", modifyDomainHttpsConfResp)) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ModifyDomainHttpsConf'") + } } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go b/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go new file mode 100644 index 00000000..84d6cafb --- /dev/null +++ b/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go @@ -0,0 +1,129 @@ +package upyuncdn + +import ( + "context" + "errors" + "log/slog" + + xerrors "github.com/pkg/errors" + "golang.org/x/exp/slices" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/upyun-ssl" + upyunsdk "github.com/usual2970/certimate/internal/pkg/vendors/upyun-sdk/console" +) + +type DeployerConfig struct { + // 又拍云账号用户名。 + Username string `json:"username"` + // 又拍云账号密码。 + Password string `json:"password"` + // 加速域名（支持泛域名）。 + Domain string `json:"domain"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger *slog.Logger + sdkClient *upyunsdk.Client + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + client, err := createSdkClient(config.Username, config.Password) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create sdk client") + } + + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + Username: config.Username, + Password: config.Password, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &DeployerProvider{ + config: config, + logger: slog.Default(), + sdkClient: client, + sslUploader: uploader, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 SSL + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + // 获取域名证书配置 + getHttpsServiceManagerResp, err := d.sdkClient.GetHttpsServiceManager(d.config.Domain) + d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("request.domain", d.config.Domain), slog.Any("response", getHttpsServiceManagerResp)) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.GetHttpsServiceManager'") + } + + // 判断域名是否已启用 HTTPS。如果已启用，迁移域名证书；否则，设置新证书 + lastCertIndex := slices.IndexFunc(getHttpsServiceManagerResp.Data.Domains, func(item upyunsdk.HttpsServiceManagerDomain) bool { + return item.Https + }) + if lastCertIndex == -1 { + updateHttpsCertificateManagerReq := &upyunsdk.UpdateHttpsCertificateManagerRequest{ + CertificateId: upres.CertId, + Domain: d.config.Domain, + Https: true, + ForceHttps: true, + } + updateHttpsCertificateManagerResp, err := d.sdkClient.UpdateHttpsCertificateManager(updateHttpsCertificateManagerReq) + d.logger.Debug("sdk request 'console.EnableDomainHttps'", slog.Any("request", updateHttpsCertificateManagerReq), slog.Any("response", updateHttpsCertificateManagerResp)) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.UpdateHttpsCertificateManager'") + } + } else if getHttpsServiceManagerResp.Data.Domains[lastCertIndex].CertificateId != upres.CertId { + migrateHttpsDomainReq := &upyunsdk.MigrateHttpsDomainRequest{ + CertificateId: upres.CertId, + Domain: d.config.Domain, + } + migrateHttpsDomainResp, err := d.sdkClient.MigrateHttpsDomain(migrateHttpsDomainReq) + d.logger.Debug("sdk request 'console.MigrateHttpsDomain'", slog.Any("request", migrateHttpsDomainReq), slog.Any("response", migrateHttpsDomainResp)) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.MigrateHttpsDomain'") + } + } + + return &deployer.DeployResult{}, nil +} + +func createSdkClient(username, password string) (*upyunsdk.Client, error) { + if username == "" { + return nil, errors.New("invalid upyun username") + } + + if password == "" { + return nil, errors.New("invalid upyun password") + } + + client := upyunsdk.NewClient(username, password) + return client, nil +} diff --git a/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go b/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go new file mode 100644 index 00000000..8a7b4485 --- /dev/null +++ b/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go @@ -0,0 +1,75 @@ +package upyuncdn_test + +import ( + "context" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/upyun-cdn" +) + +var ( + fInputCertPath string + fInputKeyPath string + fUsername string + fPassword string + fDomain string +) + +func init() { + argsPrefix := "CERTIMATE_DEPLOYER_UPYUNCDN_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fUsername, argsPrefix+"USERNAME", "", "") + flag.StringVar(&fPassword, argsPrefix+"PASSWORD", "", "") + flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") +} + +/* +Shell command to run this test: + + go test -v ./upyun_cdn_test.go -args \ + --CERTIMATE_DEPLOYER_UPYUNCDN_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --CERTIMATE_DEPLOYER_UPYUNCDN_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --CERTIMATE_DEPLOYER_UPYUNCDN_USERNAME="your-username" \ + --CERTIMATE_DEPLOYER_UPYUNCDN_PASSWORD="your-password" \ + --CERTIMATE_DEPLOYER_UPYUNCDN_DOMAIN="example.com" \ +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("USERNAME: %v", fUsername), + fmt.Sprintf("PASSWORD: %v", fPassword), + fmt.Sprintf("DOMAIN: %v", fDomain), + }, "\n")) + + deployer, err := provider.NewDeployer(&provider.DeployerConfig{ + Username: fUsername, + Password: fPassword, + Domain: fDomain, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := deployer.Deploy(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + t.Logf("ok: %v", res) + }) +} diff --git a/migrations/1742392800_upgrade.go b/migrations/1742392800_upgrade.go new file mode 100644 index 00000000..a06bdc75 --- /dev/null +++ b/migrations/1742392800_upgrade.go @@ -0,0 +1,81 @@ +package migrations + +import ( + "github.com/pocketbase/pocketbase/core" + m "github.com/pocketbase/pocketbase/migrations" +) + +func init() { + m.Register(func(app core.App) error { + collection, err := app.FindCollectionByNameOrId("4yzbv8urny5ja1e") + if err != nil { + return err + } + + // update field + if err := collection.Fields.AddMarshaledJSONAt(2, []byte(`{ + "hidden": false, + "id": "hwy7m03o", + "maxSelect": 1, + "name": "provider", + "presentable": false, + "required": false, + "system": false, + "type": "select", + "values": [ + "1panel", + "acmehttpreq", + "akamai", + "aliyun", + "aws", + "azure", + "baiducloud", + "baishan", + "baotapanel", + "byteplus", + "cachefly", + "cdnfly", + "cloudflare", + "cloudns", + "cmcccloud", + "ctcccloud", + "cucccloud", + "dnsla", + "dogecloud", + "dynv6", + "edgio", + "fastly", + "gname", + "gcore", + "godaddy", + "goedge", + "huaweicloud", + "jdcloud", + "k8s", + "local", + "namecheap", + "namedotcom", + "namesilo", + "ns1", + "powerdns", + "qiniu", + "qingcloud", + "rainyun", + "safeline", + "ssh", + "tencentcloud", + "ucloud", + "upyun", + "volcengine", + "webhook", + "westcn" + ] + }`)); err != nil { + return err + } + + return app.Save(collection) + }, func(app core.App) error { + return nil + }) +} diff --git a/ui/public/imgs/providers/upyun.svg b/ui/public/imgs/providers/upyun.svg new file mode 100644 index 00000000..cc13793d --- /dev/null +++ b/ui/public/imgs/providers/upyun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/src/components/access/AccessForm.tsx b/ui/src/components/access/AccessForm.tsx index 7f2143ac..caf5c605 100644 --- a/ui/src/components/access/AccessForm.tsx +++ b/ui/src/components/access/AccessForm.tsx @@ -44,6 +44,7 @@ import AccessFormSafeLineConfig from "./AccessFormSafeLineConfig"; import AccessFormSSHConfig from "./AccessFormSSHConfig"; import AccessFormTencentCloudConfig from "./AccessFormTencentCloudConfig"; import AccessFormUCloudConfig from "./AccessFormUCloudConfig"; +import AccessFormUpyunConfig from "./AccessFormUpyunConfig"; import AccessFormVolcEngineConfig from "./AccessFormVolcEngineConfig"; import AccessFormWebhookConfig from "./AccessFormWebhookConfig"; import AccessFormWestcnConfig from "./AccessFormWestcnConfig"; @@ -170,6 +171,8 @@ const AccessForm = forwardRef(({ className, return ; case ACCESS_PROVIDERS.UCLOUD: return ; + case ACCESS_PROVIDERS.UPYUN: + return ; case ACCESS_PROVIDERS.VOLCENGINE: return ; case ACCESS_PROVIDERS.WEBHOOK: diff --git a/ui/src/components/access/AccessFormUpyunConfig.tsx b/ui/src/components/access/AccessFormUpyunConfig.tsx new file mode 100644 index 00000000..8cc06d97 --- /dev/null +++ b/ui/src/components/access/AccessFormUpyunConfig.tsx @@ -0,0 +1,76 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { type AccessConfigForUpyun } from "@/domain/access"; + +type AccessFormUpyunConfigFieldValues = Nullish; + +export type AccessFormUpyunConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: AccessFormUpyunConfigFieldValues; + onValuesChange?: (values: AccessFormUpyunConfigFieldValues) => void; +}; + +const initFormModel = (): AccessFormUpyunConfigFieldValues => { + return { + username: "", + password: "", + }; +}; + +const AccessFormUpyunConfig = ({ form: formInst, formName, disabled, initialValues, onValuesChange }: AccessFormUpyunConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + username: z + .string() + .trim() + .min(1, t("access.form.upyun_username.placeholder")) + .max(64, t("common.errmsg.string_max", { max: 64 })), + password: z + .string() + .min(1, t("access.form.upyun_password.placeholder")) + .max(64, t("common.errmsg.string_max", { max: 64 })) + .trim(), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + + + } + > + + +
+ ); +}; + +export default AccessFormUpyunConfig; diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormUpyunCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormUpyunCDNConfig.tsx new file mode 100644 index 00000000..e09f5266 --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormUpyunCDNConfig.tsx @@ -0,0 +1,59 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { validDomainName } from "@/utils/validators"; + +type DeployNodeConfigFormUpyunCDNConfigFieldValues = Nullish<{ + domain: string; +}>; + +export type DeployNodeConfigFormUpyunCDNConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormUpyunCDNConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormUpyunCDNConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormUpyunCDNConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormUpyunCDNConfig = ({ form: formInst, formName, disabled, initialValues, onValuesChange }: DeployNodeConfigFormUpyunCDNConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + domain: z + .string({ message: t("workflow_node.deploy.form.upyun_cdn_domain.placeholder") }) + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormUpyunCDNConfig; diff --git a/ui/src/domain/access.ts b/ui/src/domain/access.ts index 1b5adf45..59a41cc6 100644 --- a/ui/src/domain/access.ts +++ b/ui/src/domain/access.ts @@ -40,6 +40,7 @@ export interface AccessModel extends BaseModel { | AccessConfigForSSH | AccessConfigForTencentCloud | AccessConfigForUCloud + | AccessConfigForUpyun | AccessConfigForVolcEngine | AccessConfigForWebhook | AccessConfigForWestcn @@ -224,6 +225,11 @@ export type AccessConfigForUCloud = { projectId?: string; }; +export type AccessConfigForUpyun = { + username: string; + password: string; +}; + export type AccessConfigForVolcEngine = { accessKeyId: string; secretAccessKey: string; diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index f3d6deb3..998ec718 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -39,6 +39,7 @@ export const ACCESS_PROVIDERS = Object.freeze({ SSH: "ssh", TENCENTCLOUD: "tencentcloud", UCLOUD: "ucloud", + UPYUN: "upyun", VOLCENGINE: "volcengine", WEBHOOK: "webhook", WESTCN: "westcn", @@ -80,6 +81,7 @@ export const accessProvidersMap: Maphttps://intl.cloud.baidu.com/doc/Reference/s/jjwvz2e3p-en", + "access.form.upyun_username.label": "UPYUN subaccount username", + "access.form.upyun_username.placeholder": "Please enter UPYUN subaccount username", + "access.form.upyun_username.tooltip": "For more information, see https://console.upyun.com/account/subaccount/", + "access.form.upyun_password.label": "UPYUN subaccount password", + "access.form.upyun_password.placeholder": "Please enter UPYUN subaccount password", + "access.form.upyun_password.tooltip": "For more information, see https://console.upyun.com/account/subaccount/", "access.form.baishan_api_token.label": "Baishan Cloud API token", "access.form.baishan_api_token.placeholder": "Please enter Baishan Cloud API token", "access.form.baotapanel_api_url.label": "aaPanel URL", diff --git a/ui/src/i18n/locales/en/nls.provider.json b/ui/src/i18n/locales/en/nls.provider.json index 4c6091e1..9034aeea 100644 --- a/ui/src/i18n/locales/en/nls.provider.json +++ b/ui/src/i18n/locales/en/nls.provider.json @@ -93,6 +93,8 @@ "provider.ucloud": "UCloud", "provider.ucloud.ucdn": "UCloud - UCDN (UCloud Content Delivery Network)", "provider.ucloud.us3": "UCloud - US3 (UCloud Object-based Storage)", + "provider.upyun": "UPYUN", + "provider.upyun.cdn": "UPYUN - CDN (Content Delivery Network)", "provider.volcengine": "Volcengine", "provider.volcengine.cdn": "Volcengine - CDN (Content Delivery Network)", "provider.volcengine.clb": "Volcengine - CLB (Cloud Load Balancer)", diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index 6d4b0f97..666ef424 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -508,6 +508,9 @@ "workflow_node.deploy.form.ucloud_us3_domain.label": "UCloud US3 domain", "workflow_node.deploy.form.ucloud_us3_domain.placeholder": "Please enter UCloud US3 domain name", "workflow_node.deploy.form.ucloud_us3_domain.tooltip": "For more information, see https://console.ucloud-global.com/ufile", + "workflow_node.deploy.form.upyun_cdn_domain.label": "UPYUN CDN domain", + "workflow_node.deploy.form.upyun_cdn_domain.placeholder": "Please enter UPYUN CDN domain name", + "workflow_node.deploy.form.upyun_cdn_domain.tooltip": "For more information, see https://console.upyun.com/services/cdn/", "workflow_node.deploy.form.volcengine_cdn_domain.label": "VolcEngine CDN domain", "workflow_node.deploy.form.volcengine_cdn_domain.placeholder": "Please enter VolcEngine CDN domain name", "workflow_node.deploy.form.volcengine_cdn_domain.tooltip": "For more information, see https://console.volcengine.com/cdn/homepage", diff --git a/ui/src/i18n/locales/zh/nls.access.json b/ui/src/i18n/locales/zh/nls.access.json index d72cd259..bb2f829a 100644 --- a/ui/src/i18n/locales/zh/nls.access.json +++ b/ui/src/i18n/locales/zh/nls.access.json @@ -243,6 +243,12 @@ "access.form.ucloud_project_id.label": "优刻得项目 ID（可选）", "access.form.ucloud_project_id.placeholder": "请输入优刻得项目 ID", "access.form.ucloud_project_id.tooltip": "这是什么？请参阅 https://console.ucloud.cn/uaccount/iam/project_manage", + "access.form.upyun_username.label": "又拍云子账号用户名", + "access.form.upyun_username.placeholder": "请输入又拍云子账号用户名", + "access.form.upyun_username.tooltip": "这是什么？请参阅 https://console.upyun.com/account/subaccount/

请关闭该账号的二次登录验证。", + "access.form.upyun_password.label": "又拍云子账号密码", + "access.form.upyun_password.placeholder": "请输入又拍云子账号密码", + "access.form.upyun_password.tooltip": "这是什么？请参阅 https://console.upyun.com/account/subaccount/

请关闭该账号的二次登录验证。", "access.form.volcengine_access_key_id.label": "火山引擎 AccessKeyId", "access.form.volcengine_access_key_id.placeholder": "请输入火山引擎 AccessKeyId", "access.form.volcengine_access_key_id.tooltip": "这是什么？请参阅 https://www.volcengine.com/docs/6291/216571", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index e8580e41..2e830cf3 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -93,6 +93,8 @@ "provider.ucloud": "优刻得", "provider.ucloud.ucdn": "优刻得 - 内容分发 UCDN", "provider.ucloud.us3": "优刻得 - 对象存储 US3", + "provider.upyun": "又拍云", + "provider.upyun.cdn": "又拍云 - 云分发 CDN", "provider.volcengine": "火山引擎", "provider.volcengine.cdn": "火山引擎 - 内容分发网络 CDN", "provider.volcengine.clb": "火山引擎 - 负载均衡 CLB", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 3144bfa8..63d881f8 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -508,6 +508,9 @@ "workflow_node.deploy.form.ucloud_us3_domain.label": "优刻得 US3 自定义域名", "workflow_node.deploy.form.ucloud_us3_domain.placeholder": "请输入优刻得 US3 自定义域名", "workflow_node.deploy.form.ucloud_us3_domain.tooltip": "这是什么？请参阅 https://console.ucloud.cn/ufile", + "workflow_node.deploy.form.upyun_cdn_domain.label": "又拍云 CDN 加速域名", + "workflow_node.deploy.form.upyun_cdn_domain.placeholder": "请输入又拍云 CDN 加速域名（支持泛域名）", + "workflow_node.deploy.form.upyun_cdn_domain.tooltip": "这是什么？请参阅 https://console.upyun.com/services/cdn/", "workflow_node.deploy.form.volcengine_cdn_domain.label": "火山引擎 CDN 加速域名", "workflow_node.deploy.form.volcengine_cdn_domain.placeholder": "请输入火山引擎 CDN 加速域名（支持泛域名）", "workflow_node.deploy.form.volcengine_cdn_domain.tooltip": "这是什么？请参阅 https://console.volcengine.com/cdn/homepage", From e4fd1e78f5371580edf9beb83f1e50c81f486a53 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:53:02 +0800 Subject: [PATCH 15/23] feat: add upyun file deployer --- internal/deployer/providers.go | 4 +- internal/domain/provider.go | 1 + .../DeployNodeConfigFormUpyunFileConfig.tsx | 65 +++++++++++++++++++ ui/src/domain/provider.ts | 2 + ui/src/i18n/locales/en/nls.provider.json | 1 + .../i18n/locales/en/nls.workflow.nodes.json | 3 + ui/src/i18n/locales/zh/nls.provider.json | 1 + .../i18n/locales/zh/nls.workflow.nodes.json | 3 + 8 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 ui/src/components/workflow/node/DeployNodeConfigFormUpyunFileConfig.tsx diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index 7d62ac41..2508fe5c 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -777,7 +777,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } - case domain.DeployProviderTypeUpyunCDN: + case domain.DeployProviderTypeUpyunCDN, domain.DeployProviderTypeUpyunFile: { access := domain.AccessConfigForUpyun{} if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -785,7 +785,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } switch options.Provider { - case domain.DeployProviderTypeUpyunCDN: + case domain.DeployProviderTypeUpyunCDN, domain.DeployProviderTypeUpyunFile: deployer, err := pUpyunCDN.NewDeployer(&pUpyunCDN.DeployerConfig{ Username: access.Username, Password: access.Password, diff --git a/internal/domain/provider.go b/internal/domain/provider.go index cbc034fa..472d8aeb 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -161,6 +161,7 @@ const ( DeployProviderTypeUCloudUCDN = DeployProviderType("ucloud-ucdn") DeployProviderTypeUCloudUS3 = DeployProviderType("ucloud-us3") DeployProviderTypeUpyunCDN = DeployProviderType("upyun-cdn") + DeployProviderTypeUpyunFile = DeployProviderType("upyun-file") DeployProviderTypeVolcEngineCDN = DeployProviderType("volcengine-cdn") DeployProviderTypeVolcEngineCLB = DeployProviderType("volcengine-clb") DeployProviderTypeVolcEngineDCDN = DeployProviderType("volcengine-dcdn") diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormUpyunFileConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormUpyunFileConfig.tsx new file mode 100644 index 00000000..c5b3902d --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormUpyunFileConfig.tsx @@ -0,0 +1,65 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { validDomainName } from "@/utils/validators"; + +type DeployNodeConfigFormUpyunFileConfigFieldValues = Nullish<{ + domain: string; +}>; + +export type DeployNodeConfigFormUpyunFileConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormUpyunFileConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormUpyunFileConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormUpyunFileConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormUpyunFileConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormUpyunFileConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + domain: z + .string({ message: t("workflow_node.deploy.form.upyun_file_domain.placeholder") }) + .refine((v) => validDomainName(v), t("common.errmsg.domain_invalid")), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormUpyunFileConfig; diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index 998ec718..f2a8a2b2 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -266,6 +266,7 @@ export const DEPLOY_PROVIDERS = Object.freeze({ UCLOUD_UCDN: `${ACCESS_PROVIDERS.UCLOUD}-ucdn`, UCLOUD_US3: `${ACCESS_PROVIDERS.UCLOUD}-us3`, UPYUN_CDN: `${ACCESS_PROVIDERS.UPYUN}-cdn`, + UPYUN_FILE: `${ACCESS_PROVIDERS.UPYUN}-file`, VOLCENGINE_CDN: `${ACCESS_PROVIDERS.VOLCENGINE}-cdn`, VOLCENGINE_CLB: `${ACCESS_PROVIDERS.VOLCENGINE}-clb`, VOLCENGINE_DCDN: `${ACCESS_PROVIDERS.VOLCENGINE}-dcdn`, @@ -347,6 +348,7 @@ export const deployProvidersMap: Maphttps://console.upyun.com/services/cdn/", + "workflow_node.deploy.form.upyun_file_domain.label": "UPYUN bucket domain", + "workflow_node.deploy.form.upyun_file_domain.placeholder": "Please enter UPYUN bucket domain name", + "workflow_node.deploy.form.upyun_file_domain.tooltip": "For more information, see https://console.upyun.com/services/file/", "workflow_node.deploy.form.volcengine_cdn_domain.label": "VolcEngine CDN domain", "workflow_node.deploy.form.volcengine_cdn_domain.placeholder": "Please enter VolcEngine CDN domain name", "workflow_node.deploy.form.volcengine_cdn_domain.tooltip": "For more information, see https://console.volcengine.com/cdn/homepage", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index 2e830cf3..03c6aaee 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -95,6 +95,7 @@ "provider.ucloud.us3": "优刻得 - 对象存储 US3", "provider.upyun": "又拍云", "provider.upyun.cdn": "又拍云 - 云分发 CDN", + "provider.upyun.file": "又拍云 - 云存储", "provider.volcengine": "火山引擎", "provider.volcengine.cdn": "火山引擎 - 内容分发网络 CDN", "provider.volcengine.clb": "火山引擎 - 负载均衡 CLB", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 63d881f8..5880613d 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -511,6 +511,9 @@ "workflow_node.deploy.form.upyun_cdn_domain.label": "又拍云 CDN 加速域名", "workflow_node.deploy.form.upyun_cdn_domain.placeholder": "请输入又拍云 CDN 加速域名（支持泛域名）", "workflow_node.deploy.form.upyun_cdn_domain.tooltip": "这是什么？请参阅 https://console.upyun.com/services/cdn/", + "workflow_node.deploy.form.upyun_file_domain.label": "又拍云云存储加速域名", + "workflow_node.deploy.form.upyun_file_domain.placeholder": "请输入又拍云云存储加速域名", + "workflow_node.deploy.form.upyun_file_domain.tooltip": "这是什么？请参阅 https://console.upyun.com/services/file/", "workflow_node.deploy.form.volcengine_cdn_domain.label": "火山引擎 CDN 加速域名", "workflow_node.deploy.form.volcengine_cdn_domain.placeholder": "请输入火山引擎 CDN 加速域名（支持泛域名）", "workflow_node.deploy.form.volcengine_cdn_domain.tooltip": "这是什么？请参阅 https://console.volcengine.com/cdn/homepage", From ef22d9d07b69b47d2ad835b253b76fcc10640cf6 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 21:56:29 +0800 Subject: [PATCH 16/23] feat: add qiniu kodo deployer --- internal/deployer/providers.go | 4 ++-- internal/domain/provider.go | 1 + ui/src/components/workflow/node/DeployNodeConfigForm.tsx | 9 +++++++++ ui/src/domain/provider.ts | 2 ++ ui/src/i18n/locales/en/nls.provider.json | 1 + ui/src/i18n/locales/en/nls.workflow.nodes.json | 3 +++ ui/src/i18n/locales/zh/nls.provider.json | 1 + ui/src/i18n/locales/zh/nls.workflow.nodes.json | 3 +++ 8 files changed, 22 insertions(+), 2 deletions(-) diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index 2508fe5c..308b5b43 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -563,7 +563,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { return deployer, err } - case domain.DeployProviderTypeQiniuCDN, domain.DeployProviderTypeQiniuPili: + case domain.DeployProviderTypeQiniuCDN, domain.DeployProviderTypeQiniuKodo, domain.DeployProviderTypeQiniuPili: { access := domain.AccessConfigForQiniu{} if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -571,7 +571,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } switch options.Provider { - case domain.DeployProviderTypeQiniuCDN: + case domain.DeployProviderTypeQiniuCDN, domain.DeployProviderTypeQiniuKodo: deployer, err := pQiniuCDN.NewDeployer(&pQiniuCDN.DeployerConfig{ AccessKey: access.AccessKey, SecretKey: access.SecretKey, diff --git a/internal/domain/provider.go b/internal/domain/provider.go index 472d8aeb..5016a238 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -145,6 +145,7 @@ const ( DeployProviderTypeKubernetesSecret = DeployProviderType("k8s-secret") DeployProviderTypeLocal = DeployProviderType("local") DeployProviderTypeQiniuCDN = DeployProviderType("qiniu-cdn") + DeployProviderTypeQiniuKodo = DeployProviderType("qiniu-kodo") DeployProviderTypeQiniuPili = DeployProviderType("qiniu-pili") DeployProviderTypeSafeLine = DeployProviderType("safeline") DeployProviderTypeSSH = DeployProviderType("ssh") diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx index 4f05c1c8..3e791bf6 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx @@ -49,6 +49,7 @@ import DeployNodeConfigFormJDCloudVODConfig from "./DeployNodeConfigFormJDCloudV import DeployNodeConfigFormKubernetesSecretConfig from "./DeployNodeConfigFormKubernetesSecretConfig"; import DeployNodeConfigFormLocalConfig from "./DeployNodeConfigFormLocalConfig"; import DeployNodeConfigFormQiniuCDNConfig from "./DeployNodeConfigFormQiniuCDNConfig"; +import DeployNodeConfigFormQiniuKodoConfig from "./DeployNodeConfigFormQiniuKodoConfig"; import DeployNodeConfigFormQiniuPiliConfig from "./DeployNodeConfigFormQiniuPiliConfig"; import DeployNodeConfigFormSafeLineConfig from "./DeployNodeConfigFormSafeLineConfig"; import DeployNodeConfigFormSSHConfig from "./DeployNodeConfigFormSSHConfig.tsx"; @@ -64,6 +65,8 @@ import DeployNodeConfigFormTencentCloudVODConfig from "./DeployNodeConfigFormTen import DeployNodeConfigFormTencentCloudWAFConfig from "./DeployNodeConfigFormTencentCloudWAFConfig"; import DeployNodeConfigFormUCloudUCDNConfig from "./DeployNodeConfigFormUCloudUCDNConfig.tsx"; import DeployNodeConfigFormUCloudUS3Config from "./DeployNodeConfigFormUCloudUS3Config.tsx"; +import DeployNodeConfigFormUpyunCDNConfig from "./DeployNodeConfigFormUpyunCDNConfig.tsx"; +import DeployNodeConfigFormUpyunFileConfig from "./DeployNodeConfigFormUpyunFileConfig.tsx"; import DeployNodeConfigFormVolcEngineCDNConfig from "./DeployNodeConfigFormVolcEngineCDNConfig.tsx"; import DeployNodeConfigFormVolcEngineCLBConfig from "./DeployNodeConfigFormVolcEngineCLBConfig.tsx"; import DeployNodeConfigFormVolcEngineDCDNConfig from "./DeployNodeConfigFormVolcEngineDCDNConfig.tsx"; @@ -210,6 +213,8 @@ const DeployNodeConfigForm = forwardRef; case DEPLOY_PROVIDERS.QINIU_CDN: return ; + case DEPLOY_PROVIDERS.QINIU_KODO: + return ; case DEPLOY_PROVIDERS.QINIU_PILI: return ; case DEPLOY_PROVIDERS.SAFELINE: @@ -240,6 +245,10 @@ const DeployNodeConfigForm = forwardRef; case DEPLOY_PROVIDERS.UCLOUD_US3: return ; + case DEPLOY_PROVIDERS.UPYUN_CDN: + return ; + case DEPLOY_PROVIDERS.UPYUN_FILE: + return ; case DEPLOY_PROVIDERS.VOLCENGINE_CDN: return ; case DEPLOY_PROVIDERS.VOLCENGINE_CLB: diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index f2a8a2b2..bb85d802 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -250,6 +250,7 @@ export const DEPLOY_PROVIDERS = Object.freeze({ KUBERNETES_SECRET: `${ACCESS_PROVIDERS.KUBERNETES}-secret`, LOCAL: `${ACCESS_PROVIDERS.LOCAL}`, QINIU_CDN: `${ACCESS_PROVIDERS.QINIU}-cdn`, + QINIU_KODO: `${ACCESS_PROVIDERS.QINIU}-kodo`, QINIU_PILI: `${ACCESS_PROVIDERS.QINIU}-pili`, SAFELINE: `${ACCESS_PROVIDERS.SAFELINE}`, SSH: `${ACCESS_PROVIDERS.SSH}`, @@ -346,6 +347,7 @@ export const deployProvidersMap: Maphttps://portal.qiniu.com/cdn", + "workflow_node.deploy.form.qiniu_kodo_domain.label": "Qiniu Kodo bucket domain", + "workflow_node.deploy.form.qiniu_kodo_domain.placeholder": "Please enter Qiniu Kodo bucket domain name", + "workflow_node.deploy.form.qiniu_kodo_domain.tooltip": "For more information, see https://portal.qiniu.com/kodo", "workflow_node.deploy.form.qiniu_pili_hub.label": "Qiniu Pili hub", "workflow_node.deploy.form.qiniu_pili_hub.placeholder": "Please enter Qiniu Pili hub name", "workflow_node.deploy.form.qiniu_pili_hub.tooltip": "For more information, see https://portal.qiniu.com/hub", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index 03c6aaee..2d415277 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -74,6 +74,7 @@ "provider.powerdns": "PowerDNS", "provider.qiniu": "七牛云", "provider.qiniu.cdn": "七牛云 - 内容分发网络 CDN", + "provider.qiniu.kodo": "七牛云 - 对象存储 Kodo", "provider.qiniu.pili": "七牛云 - 视频直播 Pili", "provider.rainyun": "雨云", "provider.safeline": "雷池", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 5880613d..3805b234 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -370,6 +370,9 @@ "workflow_node.deploy.form.qiniu_cdn_domain.label": "七牛云 CDN 加速域名", "workflow_node.deploy.form.qiniu_cdn_domain.placeholder": "请输入七牛云 CDN 加速域名（支持泛域名）", "workflow_node.deploy.form.qiniu_cdn_domain.tooltip": "这是什么？请参阅 https://portal.qiniu.com/cdn", + "workflow_node.deploy.form.qiniu_kodo_domain.label": "七牛云对象存储加速域名", + "workflow_node.deploy.form.qiniu_kodo_domain.placeholder": "请输入七牛云对象存储加速域名", + "workflow_node.deploy.form.qiniu_kodo_domain.tooltip": "这是什么？请参阅 https://portal.qiniu.com/kodo", "workflow_node.deploy.form.qiniu_pili_hub.label": "七牛云视频直播空间名", "workflow_node.deploy.form.qiniu_pili_hub.placeholder": "请输入七牛云视频直播空间名", "workflow_node.deploy.form.qiniu_pili_hub.tooltip": "这是什么？请参阅 https://portal.qiniu.com/hub", From 347d1662504980c526b6d1930bbc68f5a37737e0 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 22:01:01 +0800 Subject: [PATCH 17/23] feat: add aliyun cas, tencentcloud ssl, aws acm, azure keyvault deployer --- internal/deployer/providers.go | 56 ++++++++++++- internal/domain/provider.go | 4 + .../aliyun-cas-deploy/aliyun_cas_deploy.go | 15 ++-- .../providers/aliyun-cas/aliyun_cas.go | 72 +++++++++++++++++ .../deployer/providers/aws-acm/aws_acm.go | 72 +++++++++++++++++ .../azure-keyvault/azure_keyvault.go | 78 +++++++++++++++++++ .../tencentcloud-ssl/tencentcloud_ssl.go | 69 ++++++++++++++++ .../workflow/node/DeployNodeConfigForm.tsx | 9 +++ .../node/DeployNodeConfigFormAWSACMConfig.tsx | 58 ++++++++++++++ .../DeployNodeConfigFormAliyunCASConfig.tsx | 64 +++++++++++++++ ...eployNodeConfigFormAzureKeyVaultConfig.tsx | 64 +++++++++++++++ .../DeployNodeConfigFormQiniuKodoConfig.tsx | 65 ++++++++++++++++ ui/src/domain/provider.ts | 40 ++++++---- ui/src/i18n/locales/en/nls.provider.json | 4 + .../i18n/locales/en/nls.workflow.nodes.json | 9 +++ ui/src/i18n/locales/zh/nls.provider.json | 4 + .../i18n/locales/zh/nls.workflow.nodes.json | 9 +++ 17 files changed, 663 insertions(+), 29 deletions(-) create mode 100644 internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go create mode 100644 internal/pkg/core/deployer/providers/aws-acm/aws_acm.go create mode 100644 internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go create mode 100644 internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go create mode 100644 ui/src/components/workflow/node/DeployNodeConfigFormAWSACMConfig.tsx create mode 100644 ui/src/components/workflow/node/DeployNodeConfigFormAliyunCASConfig.tsx create mode 100644 ui/src/components/workflow/node/DeployNodeConfigFormAzureKeyVaultConfig.tsx create mode 100644 ui/src/components/workflow/node/DeployNodeConfigFormQiniuKodoConfig.tsx diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index 308b5b43..a83fb681 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -9,6 +9,7 @@ import ( p1PanelConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/1panel-console" p1PanelSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/1panel-site" pAliyunALB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-alb" + pAliyunCAS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-cas" pAliyunCASDeploy "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-cas-deploy" pAliyunCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-cdn" pAliyunCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-clb" @@ -20,7 +21,9 @@ import ( pAliyunOSS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-oss" pAliyunVOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-vod" pAliyunWAF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-waf" + pAWSACM "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-acm" pAWSCloudFront "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-cloudfront" + pAzureKeyVault "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/azure-keyvault" pBaiduCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-cdn" pBaishanCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baishan-cdn" pBaotaPanelConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotapanel-console" @@ -51,6 +54,7 @@ import ( pTencentCloudECDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ecdn" pTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-eo" pTencentCloudSCF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-scf" + pTencentCloudSSL "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ssl" pTencentCloudSSLDeploy "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy" pTencentCloudVOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-vod" pTencentCloudWAF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-waf" @@ -105,7 +109,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } - case domain.DeployProviderTypeAliyunALB, domain.DeployProviderTypeAliyunCASDeploy, domain.DeployProviderTypeAliyunCDN, domain.DeployProviderTypeAliyunCLB, domain.DeployProviderTypeAliyunDCDN, domain.DeployProviderTypeAliyunESA, domain.DeployProviderTypeAliyunFC, domain.DeployProviderTypeAliyunLive, domain.DeployProviderTypeAliyunNLB, domain.DeployProviderTypeAliyunOSS, domain.DeployProviderTypeAliyunVOD, domain.DeployProviderTypeAliyunWAF: + case domain.DeployProviderTypeAliyunALB, domain.DeployProviderTypeAliyunCAS, domain.DeployProviderTypeAliyunCASDeploy, domain.DeployProviderTypeAliyunCDN, domain.DeployProviderTypeAliyunCLB, domain.DeployProviderTypeAliyunDCDN, domain.DeployProviderTypeAliyunESA, domain.DeployProviderTypeAliyunFC, domain.DeployProviderTypeAliyunLive, domain.DeployProviderTypeAliyunNLB, domain.DeployProviderTypeAliyunOSS, domain.DeployProviderTypeAliyunVOD, domain.DeployProviderTypeAliyunWAF: { access := domain.AccessConfigForAliyun{} if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -125,6 +129,14 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { }) return deployer, err + case domain.DeployProviderTypeAliyunCAS: + deployer, err := pAliyunCAS.NewDeployer(&pAliyunCAS.DeployerConfig{ + AccessKeyId: access.AccessKeyId, + AccessKeySecret: access.AccessKeySecret, + Region: maputil.GetString(options.ProviderDeployConfig, "region"), + }) + return deployer, err + case domain.DeployProviderTypeAliyunCASDeploy: deployer, err := pAliyunCASDeploy.NewDeployer(&pAliyunCASDeploy.DeployerConfig{ AccessKeyId: access.AccessKeyId, @@ -237,7 +249,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } - case domain.DeployProviderTypeAWSCloudFront: + case domain.DeployProviderTypeAWSACM, domain.DeployProviderTypeAWSCloudFront: { access := domain.AccessConfigForAWS{} if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -245,6 +257,14 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } switch options.Provider { + case domain.DeployProviderTypeAWSACM: + deployer, err := pAWSACM.NewDeployer(&pAWSACM.DeployerConfig{ + AccessKeyId: access.AccessKeyId, + SecretAccessKey: access.SecretAccessKey, + Region: maputil.GetString(options.ProviderDeployConfig, "region"), + }) + return deployer, err + case domain.DeployProviderTypeAWSCloudFront: deployer, err := pAWSCloudFront.NewDeployer(&pAWSCloudFront.DeployerConfig{ AccessKeyId: access.AccessKeyId, @@ -259,6 +279,29 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } + case domain.DeployProviderTypeAzureKeyVault: + { + access := domain.AccessConfigForAzure{} + if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { + return nil, fmt.Errorf("failed to populate provider access config: %w", err) + } + + switch options.Provider { + case domain.DeployProviderTypeAzureKeyVault: + deployer, err := pAzureKeyVault.NewDeployer(&pAzureKeyVault.DeployerConfig{ + TenantId: access.TenantId, + ClientId: access.ClientId, + ClientSecret: access.ClientSecret, + CloudName: access.CloudName, + KeyVaultName: maputil.GetString(options.ProviderDeployConfig, "keyvaultName"), + }) + return deployer, err + + default: + break + } + } + case domain.DeployProviderTypeBaiduCloudCDN: { access := domain.AccessConfigForBaiduCloud{} @@ -638,7 +681,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { return deployer, err } - case domain.DeployProviderTypeTencentCloudCDN, domain.DeployProviderTypeTencentCloudCLB, domain.DeployProviderTypeTencentCloudCOS, domain.DeployProviderTypeTencentCloudCSS, domain.DeployProviderTypeTencentCloudECDN, domain.DeployProviderTypeTencentCloudEO, domain.DeployProviderTypeTencentCloudSCF, domain.DeployProviderTypeTencentCloudSSLDeploy, domain.DeployProviderTypeTencentCloudVOD, domain.DeployProviderTypeTencentCloudWAF: + case domain.DeployProviderTypeTencentCloudCDN, domain.DeployProviderTypeTencentCloudCLB, domain.DeployProviderTypeTencentCloudCOS, domain.DeployProviderTypeTencentCloudCSS, domain.DeployProviderTypeTencentCloudECDN, domain.DeployProviderTypeTencentCloudEO, domain.DeployProviderTypeTencentCloudSCF, domain.DeployProviderTypeTencentCloudSSL, domain.DeployProviderTypeTencentCloudSSLDeploy, domain.DeployProviderTypeTencentCloudVOD, domain.DeployProviderTypeTencentCloudWAF: { access := domain.AccessConfigForTencentCloud{} if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -710,6 +753,13 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { }) return deployer, err + case domain.DeployProviderTypeTencentCloudSSL: + deployer, err := pTencentCloudSSL.NewDeployer(&pTencentCloudSSL.DeployerConfig{ + SecretId: access.SecretId, + SecretKey: access.SecretKey, + }) + return deployer, err + case domain.DeployProviderTypeTencentCloudSSLDeploy: deployer, err := pTencentCloudSSLDeploy.NewDeployer(&pTencentCloudSSLDeploy.DeployerConfig{ SecretId: access.SecretId, diff --git a/internal/domain/provider.go b/internal/domain/provider.go index 5016a238..6e0808ce 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -113,6 +113,7 @@ const ( DeployProviderType1PanelConsole = DeployProviderType("1panel-console") DeployProviderType1PanelSite = DeployProviderType("1panel-site") DeployProviderTypeAliyunALB = DeployProviderType("aliyun-alb") + DeployProviderTypeAliyunCAS = DeployProviderType("aliyun-cas") DeployProviderTypeAliyunCASDeploy = DeployProviderType("aliyun-casdeploy") DeployProviderTypeAliyunCDN = DeployProviderType("aliyun-cdn") DeployProviderTypeAliyunCLB = DeployProviderType("aliyun-clb") @@ -124,7 +125,9 @@ const ( DeployProviderTypeAliyunOSS = DeployProviderType("aliyun-oss") DeployProviderTypeAliyunVOD = DeployProviderType("aliyun-vod") DeployProviderTypeAliyunWAF = DeployProviderType("aliyun-waf") + DeployProviderTypeAWSACM = DeployProviderType("aws-acm") DeployProviderTypeAWSCloudFront = DeployProviderType("aws-cloudfront") + DeployProviderTypeAzureKeyVault = DeployProviderType("azure-keyvault") DeployProviderTypeBaiduCloudCDN = DeployProviderType("baiducloud-cdn") DeployProviderTypeBaishanCDN = DeployProviderType("baishan-cdn") DeployProviderTypeBaotaPanelConsole = DeployProviderType("baotapanel-console") @@ -156,6 +159,7 @@ const ( DeployProviderTypeTencentCloudECDN = DeployProviderType("tencentcloud-ecdn") DeployProviderTypeTencentCloudEO = DeployProviderType("tencentcloud-eo") DeployProviderTypeTencentCloudSCF = DeployProviderType("tencentcloud-scf") + DeployProviderTypeTencentCloudSSL = DeployProviderType("tencentcloud-ssl") DeployProviderTypeTencentCloudSSLDeploy = DeployProviderType("tencentcloud-ssldeploy") DeployProviderTypeTencentCloudVOD = DeployProviderType("tencentcloud-vod") DeployProviderTypeTencentCloudWAF = DeployProviderType("tencentcloud-waf") diff --git a/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go b/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go index 4a95e5ad..7c53358d 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go +++ b/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go @@ -51,7 +51,11 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { return nil, xerrors.Wrap(err, "failed to create sdk client") } - uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.Region) + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + AccessKeyId: config.AccessKeyId, + AccessKeySecret: config.AccessKeySecret, + Region: config.Region, + }) if err != nil { return nil, xerrors.Wrap(err, "failed to create ssl uploader") } @@ -178,12 +182,3 @@ func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunCas.Cl return client, nil } - -func createSslUploader(accessKeyId, accessKeySecret, region string) (uploader.Uploader, error) { - uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ - AccessKeyId: accessKeyId, - AccessKeySecret: accessKeySecret, - Region: region, - }) - return uploader, err -} diff --git a/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go b/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go new file mode 100644 index 00000000..e00d3788 --- /dev/null +++ b/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go @@ -0,0 +1,72 @@ +package aliyuncas + +import ( + "context" + "log/slog" + + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" +) + +type DeployerConfig struct { + // 阿里云 AccessKeyId。 + AccessKeyId string `json:"accessKeyId"` + // 阿里云 AccessKeySecret。 + AccessKeySecret string `json:"accessKeySecret"` + // 阿里云地域。 + Region string `json:"region"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger *slog.Logger + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + AccessKeyId: config.AccessKeyId, + AccessKeySecret: config.AccessKeySecret, + Region: config.Region, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &DeployerProvider{ + config: config, + logger: slog.Default(), + sslUploader: uploader, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 CAS + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + return &deployer.DeployResult{}, nil +} diff --git a/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go b/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go new file mode 100644 index 00000000..88482de3 --- /dev/null +++ b/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go @@ -0,0 +1,72 @@ +package awsacm + +import ( + "context" + "log/slog" + + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aws-acm" +) + +type DeployerConfig struct { + // AWS AccessKeyId。 + AccessKeyId string `json:"accessKeyId"` + // AWS SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` + // AWS 区域。 + Region string `json:"region"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger *slog.Logger + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + AccessKeyId: config.AccessKeyId, + SecretAccessKey: config.SecretAccessKey, + Region: config.Region, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &DeployerProvider{ + config: config, + logger: slog.Default(), + sslUploader: uploader, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 ACM + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + return &deployer.DeployResult{}, nil +} diff --git a/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go b/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go new file mode 100644 index 00000000..4439aa68 --- /dev/null +++ b/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go @@ -0,0 +1,78 @@ +package azurekeyvault + +import ( + "context" + "log/slog" + + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/azure-keyvault" +) + +type DeployerConfig struct { + // Azure TenantId。 + TenantId string `json:"tenantId"` + // Azure ClientId。 + ClientId string `json:"clientId"` + // Azure ClientSecret。 + ClientSecret string `json:"clientSecret"` + // Azure 主权云环境。 + CloudName string `json:"cloudName,omitempty"` + // Key Vault 名称。 + KeyVaultName string `json:"keyvaultName"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger *slog.Logger + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + TenantId: config.TenantId, + ClientId: config.ClientId, + ClientSecret: config.ClientSecret, + CloudName: config.CloudName, + KeyVaultName: config.KeyVaultName, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &DeployerProvider{ + config: config, + logger: slog.Default(), + sslUploader: uploader, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 KeyVault + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + return &deployer.DeployResult{}, nil +} diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go b/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go new file mode 100644 index 00000000..8f8676de --- /dev/null +++ b/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -0,0 +1,69 @@ +package tencentcloudssl + +import ( + "context" + "log/slog" + + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" +) + +type DeployerConfig struct { + // 腾讯云 SecretId。 + SecretId string `json:"secretId"` + // 腾讯云 SecretKey。 + SecretKey string `json:"secretKey"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger *slog.Logger + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + SecretId: config.SecretId, + SecretKey: config.SecretKey, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &DeployerProvider{ + config: config, + logger: slog.Default(), + sslUploader: uploader, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + d.sslUploader.WithLogger(logger) + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 SSL + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + return &deployer.DeployResult{}, nil +} diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx index 3e791bf6..6b7a6547 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx @@ -18,6 +18,7 @@ import { useWorkflowStore } from "@/stores/workflow"; import DeployNodeConfigForm1PanelConsoleConfig from "./DeployNodeConfigForm1PanelConsoleConfig"; import DeployNodeConfigForm1PanelSiteConfig from "./DeployNodeConfigForm1PanelSiteConfig"; import DeployNodeConfigFormAliyunALBConfig from "./DeployNodeConfigFormAliyunALBConfig"; +import DeployNodeConfigFormAliyunCASConfig from "./DeployNodeConfigFormAliyunCASConfig"; import DeployNodeConfigFormAliyunCASDeployConfig from "./DeployNodeConfigFormAliyunCASDeployConfig"; import DeployNodeConfigFormAliyunCDNConfig from "./DeployNodeConfigFormAliyunCDNConfig"; import DeployNodeConfigFormAliyunCLBConfig from "./DeployNodeConfigFormAliyunCLBConfig"; @@ -29,7 +30,9 @@ import DeployNodeConfigFormAliyunNLBConfig from "./DeployNodeConfigFormAliyunNLB import DeployNodeConfigFormAliyunOSSConfig from "./DeployNodeConfigFormAliyunOSSConfig"; import DeployNodeConfigFormAliyunVODConfig from "./DeployNodeConfigFormAliyunVODConfig"; import DeployNodeConfigFormAliyunWAFConfig from "./DeployNodeConfigFormAliyunWAFConfig"; +import DeployNodeConfigFormAWSACMConfig from "./DeployNodeConfigFormAWSACMConfig"; import DeployNodeConfigFormAWSCloudFrontConfig from "./DeployNodeConfigFormAWSCloudFrontConfig"; +import DeployNodeConfigFormAzureKeyVaultConfig from "./DeployNodeConfigFormAzureKeyVaultConfig"; import DeployNodeConfigFormBaiduCloudCDNConfig from "./DeployNodeConfigFormBaiduCloudCDNConfig"; import DeployNodeConfigFormBaishanCDNConfig from "./DeployNodeConfigFormBaishanCDNConfig"; import DeployNodeConfigFormBaotaPanelConsoleConfig from "./DeployNodeConfigFormBaotaPanelConsoleConfig"; @@ -151,6 +154,8 @@ const DeployNodeConfigForm = forwardRef; case DEPLOY_PROVIDERS.ALIYUN_ALB: return ; + case DEPLOY_PROVIDERS.ALIYUN_CAS: + return ; case DEPLOY_PROVIDERS.ALIYUN_CAS_DEPLOY: return ; case DEPLOY_PROVIDERS.ALIYUN_CLB: @@ -173,8 +178,12 @@ const DeployNodeConfigForm = forwardRef; case DEPLOY_PROVIDERS.ALIYUN_WAF: return ; + case DEPLOY_PROVIDERS.AWS_ACM: + return ; case DEPLOY_PROVIDERS.AWS_CLOUDFRONT: return ; + case DEPLOY_PROVIDERS.AZURE_KEYVAULT: + return ; case DEPLOY_PROVIDERS.BAIDUCLOUD_CDN: return ; case DEPLOY_PROVIDERS.BAISHAN_CDN: diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAWSACMConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAWSACMConfig.tsx new file mode 100644 index 00000000..60b49f54 --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAWSACMConfig.tsx @@ -0,0 +1,58 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +type DeployNodeConfigFormAWSACMConfigFieldValues = Nullish<{ + region: string; +}>; + +export type DeployNodeConfigFormAWSACMConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormAWSACMConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormAWSACMConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormAWSACMConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormAWSACMConfig = ({ form: formInst, formName, disabled, initialValues, onValuesChange }: DeployNodeConfigFormAWSACMConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + region: z + .string({ message: t("workflow_node.deploy.form.aws_acm_region.placeholder") }) + .nonempty(t("workflow_node.deploy.form.aws_acm_region.placeholder")) + .trim(), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormAWSACMConfig; diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCASConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCASConfig.tsx new file mode 100644 index 00000000..f4aed907 --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCASConfig.tsx @@ -0,0 +1,64 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +type DeployNodeConfigFormAliyunCASConfigFieldValues = Nullish<{ + region: string; +}>; + +export type DeployNodeConfigFormAliyunCASConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormAliyunCASConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormAliyunCASConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormAliyunCASConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormAliyunCASConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormAliyunCASConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + region: z + .string({ message: t("workflow_node.deploy.form.aliyun_cas_region.placeholder") }) + .nonempty(t("workflow_node.deploy.form.aliyun_cas_region.placeholder")) + .trim(), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormAliyunCASConfig; diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAzureKeyVaultConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAzureKeyVaultConfig.tsx new file mode 100644 index 00000000..91d48cdf --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAzureKeyVaultConfig.tsx @@ -0,0 +1,64 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +type DeployNodeConfigFormAzureKeyVaultConfigFieldValues = Nullish<{ + keyvaultName: string; +}>; + +export type DeployNodeConfigFormAzureKeyVaultConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormAzureKeyVaultConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormAzureKeyVaultConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormAzureKeyVaultConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormAzureKeyVaultConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormAzureKeyVaultConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + keyvaultName: z + .string({ message: t("workflow_node.deploy.form.azure_keyvault_name.placeholder") }) + .nonempty(t("workflow_node.deploy.form.azure_keyvault_name.placeholder")) + .trim(), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormAzureKeyVaultConfig; diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormQiniuKodoConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormQiniuKodoConfig.tsx new file mode 100644 index 00000000..e7a7dfb7 --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormQiniuKodoConfig.tsx @@ -0,0 +1,65 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { validDomainName } from "@/utils/validators"; + +type DeployNodeConfigFormQiniuKodoConfigFieldValues = Nullish<{ + domain: string; +}>; + +export type DeployNodeConfigFormQiniuKodoConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormQiniuKodoConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormQiniuKodoConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormQiniuKodoConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormQiniuKodoConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormQiniuKodoConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + domain: z + .string({ message: t("workflow_node.deploy.form.qiniu_kodo_domain.placeholder") }) + .refine((v) => validDomainName(v), t("common.errmsg.domain_invalid")), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormQiniuKodoConfig; diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index bb85d802..b27c23da 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -63,9 +63,9 @@ export type AccessProvider = { export const accessProvidersMap: Map = new Map( /* - 注意：此处的顺序决定显示在前端的顺序。 - NOTICE: The following order determines the order displayed at the frontend. - */ + 注意：此处的顺序决定显示在前端的顺序。 + NOTICE: The following order determines the order displayed at the frontend. + */ [ [ACCESS_PROVIDERS.LOCAL, "provider.local", "/imgs/providers/local.svg", [ACCESS_USAGES.DEPLOY]], [ACCESS_PROVIDERS.SSH, "provider.ssh", "/imgs/providers/ssh.svg", [ACCESS_USAGES.DEPLOY]], @@ -78,6 +78,7 @@ export const accessProvidersMap: Map = new Map( /* - 注意：此处的顺序决定显示在前端的顺序。 - NOTICE: The following order determines the order displayed at the frontend. - */ + 注意：此处的顺序决定显示在前端的顺序。 + NOTICE: The following order determines the order displayed at the frontend. + */ [ [APPLY_DNS_PROVIDERS.ALIYUN_DNS, "provider.aliyun.dns"], [APPLY_DNS_PROVIDERS.TENCENTCLOUD_DNS, "provider.tencentcloud.dns"], @@ -211,13 +211,14 @@ export const applyDNSProvidersMap: Map = new Map( /* - 注意：此处的顺序决定显示在前端的顺序。 - NOTICE: The following order determines the order displayed at the frontend. - */ + 注意：此处的顺序决定显示在前端的顺序。 + NOTICE: The following order determines the order displayed at the frontend. + */ [ [DEPLOY_PROVIDERS.LOCAL, "provider.local", DEPLOY_CATEGORIES.OTHER], [DEPLOY_PROVIDERS.SSH, "provider.ssh", DEPLOY_CATEGORIES.OTHER], @@ -322,6 +326,7 @@ export const deployProvidersMap: Maphttps://slb.console.aliyun.com/alb", + "workflow_node.deploy.form.aliyun_cas_region.label": "Alibaba Cloud CAS region", + "workflow_node.deploy.form.aliyun_cas_region.placeholder": "Please enter Alibaba Cloud CAS region (e.g. cn-hangzhou)", + "workflow_node.deploy.form.aliyun_cas_region.tooltip": "For more information, see https://www.alibabacloud.com/help/en/ssl-certificate/developer-reference/endpoints", "workflow_node.deploy.form.aliyun_cas_deploy.guide": "TIPS: You need to go to the Alibaba Cloud console to check the actual deployment results by yourself, because Alibaba Cloud deployment tasks are running asynchronously.", "workflow_node.deploy.form.aliyun_cas_deploy_region.label": "Alibaba Cloud CAS region", "workflow_node.deploy.form.aliyun_cas_deploy_region.placeholder": "Please enter Alibaba Cloud CAS region (e.g. cn-hangzhou)", @@ -207,12 +210,18 @@ "workflow_node.deploy.form.aliyun_waf_domain.label": "Alibaba Cloud WAF domain (Optional)", "workflow_node.deploy.form.aliyun_waf_domain.placeholder": "Please enter Alibaba Cloud WAF domain name", "workflow_node.deploy.form.aliyun_waf_domain.tooltip": "For more information, see https://waf.console.aliyun.com", + "workflow_node.deploy.form.aws_acm_region.label": "AWS ACM Region", + "workflow_node.deploy.form.aws_acm_region.placeholder": "Please enter AWS ACM region (e.g. us-east-1)", + "workflow_node.deploy.form.aws_acm_region.tooltip": "For more information, see https://docs.aws.amazon.com/en_us/general/latest/gr/rande.html#regional-endpoints", "workflow_node.deploy.form.aws_cloudfront_region.label": "AWS CloudFront Region", "workflow_node.deploy.form.aws_cloudfront_region.placeholder": "Please enter AWS CloudFront region (e.g. us-east-1)", "workflow_node.deploy.form.aws_cloudfront_region.tooltip": "For more information, see https://docs.aws.amazon.com/en_us/general/latest/gr/rande.html#regional-endpoints", "workflow_node.deploy.form.aws_cloudfront_distribution_id.label": "AWS CloudFront distribution ID", "workflow_node.deploy.form.aws_cloudfront_distribution_id.placeholder": "Please enter AWS CloudFront distribution ID", "workflow_node.deploy.form.aws_cloudfront_distribution_id.tooltip": "For more information, see https://docs.aws.amazon.com/en_us/AmazonCloudFront/latest/DeveloperGuide/distribution-working-with.html", + "workflow_node.deploy.form.azure_keyvault_name.label": "Azure KeyVault name", + "workflow_node.deploy.form.azure_keyvault_name.placeholder": "Please enter Azure KeyVault name", + "workflow_node.deploy.form.azure_keyvault_name.tooltip": "For more information, see https://learn.microsoft.com/en-us/azure/key-vault/general/about-keys-secrets-certificates", "workflow_node.deploy.form.baiducloud_cdn_domain.label": "Baidu Cloud CDN domain", "workflow_node.deploy.form.baiducloud_cdn_domain.placeholder": "Please enter Baidu Cloud CDN domain name", "workflow_node.deploy.form.baiducloud_cdn_domain.tooltip": "For more information, see https://console.bce.baidu.com/cdn", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index 2d415277..d400cfbc 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -5,6 +5,7 @@ "provider.acmehttpreq": "Http Request (ACME Proxy)", "provider.aliyun": "阿里云", "provider.aliyun.alb": "阿里云 - 应用型负载均衡 ALB", + "provider.aliyun.cas": "阿里云 - 数字证书管理服务 CAS", "provider.aliyun.cas_deploy": "阿里云 - 通过数字证书管理服务 CAS 创建部署任务", "provider.aliyun.cdn": "阿里云 - 内容分发网络 CDN", "provider.aliyun.clb": "阿里云 - 传统型负载均衡 CLB", @@ -20,10 +21,12 @@ "provider.akamai": "Akamai", "provider.akamai.cdn": "Akamai - 内容分发网络 CDN", "provider.aws": "AWS", + "provider.aws.acm": "AWS - ACM (Amazon Certificate Manager)", "provider.aws.cloudfront": "AWS - CloudFront", "provider.aws.route53": "AWS - Route53", "provider.azure": "Azure", "provider.azure.dns": "Azure - DNS", + "provider.azure.keyvault": "Azure - KeyVault", "provider.baiducloud": "百度智能云", "provider.baiducloud.cdn": "百度智能云 - 内容分发网络 CDN", "provider.baiducloud.dns": "百度智能云 - 智能云解析 DNS", @@ -88,6 +91,7 @@ "provider.tencentcloud.ecdn": "腾讯云 - 全站加速网络 ECDN", "provider.tencentcloud.eo": "腾讯云 - 边缘安全加速平台 EdgeOne", "provider.tencentcloud.scf": "腾讯云 - 云函数 SCF", + "provider.tencentcloud.ssl": "腾讯云 - SSL 证书服务", "provider.tencentcloud.ssl_deploy": "腾讯云 - 通过 SSL 证书服务创建部署任务", "provider.tencentcloud.vod": "腾讯云 - 云点播 VOD", "provider.tencentcloud.waf": "腾讯云 - Web 应用防火墙 WAF", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 3805b234..aecc8599 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -110,6 +110,9 @@ "workflow_node.deploy.form.aliyun_alb_snidomain.label": "阿里云 ALB 扩展域名（可选）", "workflow_node.deploy.form.aliyun_alb_snidomain.placeholder": "请输入阿里云 ALB 扩展域名（支持泛域名）", "workflow_node.deploy.form.aliyun_alb_snidomain.tooltip": "这是什么？请参阅 https://slb.console.aliyun.com/alb

不填写时，将替换监听器的默认证书。", + "workflow_node.deploy.form.aliyun_cas_region.label": "阿里云 CAS 服务地域", + "workflow_node.deploy.form.aliyun_cas_region.placeholder": "请输入阿里云 CAS 服务地域（例如：cn-hangzhou）", + "workflow_node.deploy.form.aliyun_cas_region.tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/ssl-certificate/developer-reference/endpoints", "workflow_node.deploy.form.aliyun_cas_deploy.guide": "小贴士：由于阿里云证书部署任务是异步的，此节点若执行成功仅代表已创建部署任务，实际部署结果需要你自行前往阿里云控制台查询。", "workflow_node.deploy.form.aliyun_cas_deploy_region.label": "阿里云 CAS 服务地域", "workflow_node.deploy.form.aliyun_cas_deploy_region.placeholder": "请输入阿里云 CAS 服务地域（例如：cn-hangzhou）", @@ -207,12 +210,18 @@ "workflow_node.deploy.form.aliyun_waf_domain.label": "阿里云 WAF 接入域名（可选）", "workflow_node.deploy.form.aliyun_waf_domain.placeholder": "请输入阿里云 WAF 接入域名（支持泛域名）", "workflow_node.deploy.form.aliyun_waf_domain.tooltip": "这是什么？请参阅 waf.console.aliyun.com

不填写时，将替换实例的默认证书。", + "workflow_node.deploy.form.aws_acm_region.label": "AWS ACM 服务区域", + "workflow_node.deploy.form.aws_acm_region.placeholder": "请输入 AWS ACM 服务区域（例如：us-east-1）", + "workflow_node.deploy.form.aws_acm_region.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html#regional-endpoints", "workflow_node.deploy.form.aws_cloudfront_region.label": "AWS CloudFront 服务区域", "workflow_node.deploy.form.aws_cloudfront_region.placeholder": "请输入 AWS CloudFront 服务区域（例如：us-east-1）", "workflow_node.deploy.form.aws_cloudfront_region.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html#regional-endpoints", "workflow_node.deploy.form.aws_cloudfront_distribution_id.label": "AWS CloudFront 分配 ID", "workflow_node.deploy.form.aws_cloudfront_distribution_id.placeholder": "请输入 AWS CloudFront 分配 ID", "workflow_node.deploy.form.aws_cloudfront_distribution_id.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/AmazonCloudFront/latest/DeveloperGuide/distribution-working-with.html", + "workflow_node.deploy.form.azure_keyvault_name.label": "Azure KeyVault 名称", + "workflow_node.deploy.form.azure_keyvault_name.placeholder": "请输入 Azure KeyVault 名称", + "workflow_node.deploy.form.azure_keyvault_name.tooltip": "这是什么？请参阅 https://learn.microsoft.com/zh-cn/azure/key-vault/general/about-keys-secrets-certificates", "workflow_node.deploy.form.baiducloud_cdn_domain.label": "百度智能云 CDN 加速域名", "workflow_node.deploy.form.baiducloud_cdn_domain.placeholder": "请输入百度智能云 CDN 加速域名（支持泛域名）", "workflow_node.deploy.form.baiducloud_cdn_domain.tooltip": "这是什么？请参阅 https://console.bce.baidu.com/cdn", From da6526d5faea1b97efb6709b50e1629f2aa5854f Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 23:11:43 +0800 Subject: [PATCH 18/23] feat: add dynv6 dns-01 applicant --- go.mod | 2 + go.sum | 5 + internal/applicant/providers.go | 16 ++ internal/domain/access.go | 4 + internal/domain/provider.go | 3 +- .../acme-dns-01/lego-providers/dynv6/dnsla.go | 37 ++++ .../lego-providers/dynv6/internal/lego.go | 167 ++++++++++++++++++ ui/public/imgs/providers/dynv6.svg | 1 + ui/src/components/access/AccessForm.tsx | 3 + .../access/AccessFormDynv6Config.tsx | 61 +++++++ ui/src/domain/access.ts | 5 + ui/src/domain/provider.ts | 4 + ui/src/i18n/locales/en/nls.access.json | 3 + ui/src/i18n/locales/en/nls.provider.json | 1 + ui/src/i18n/locales/zh/nls.access.json | 3 + ui/src/i18n/locales/zh/nls.provider.json | 1 + 16 files changed, 315 insertions(+), 1 deletion(-) create mode 100644 internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/dnsla.go create mode 100644 internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/internal/lego.go create mode 100644 ui/public/imgs/providers/dynv6.svg create mode 100644 ui/src/components/access/AccessFormDynv6Config.tsx diff --git a/go.mod b/go.mod index 123c69ae..389cdaef 100644 --- a/go.mod +++ b/go.mod @@ -99,6 +99,8 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/libdns/dynv6 v1.0.0 // indirect + github.com/libdns/libdns v0.2.3 // indirect github.com/mailru/easyjson v0.9.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04 // indirect diff --git a/go.sum b/go.sum index 04555b1e..bce17d98 100644 --- a/go.sum +++ b/go.sum @@ -646,6 +646,11 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/libdns/dynv6 v1.0.0 h1:JpOK9TYRTHETAe+SIw3lk8SgUi3eD250GK+4fAHu4ys= +github.com/libdns/dynv6 v1.0.0/go.mod h1:65PL/bAlyH0J+0WGlOJYnMpoIuXcg/FmW4dTBYWtYUU= +github.com/libdns/libdns v0.1.0/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= +github.com/libdns/libdns v0.2.3 h1:ba30K4ObwMGB/QTmqUxf3H4/GmUrCAIkMWejeGl12v8= +github.com/libdns/libdns v0.2.3/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= diff --git a/internal/applicant/providers.go b/internal/applicant/providers.go index 0dbf8844..dcfc1dde 100644 --- a/internal/applicant/providers.go +++ b/internal/applicant/providers.go @@ -15,6 +15,7 @@ import ( pClouDNS "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/cloudns" pCMCCCloud "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/cmcccloud" pDNSLA "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/dnsla" + pDynv6 "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6" pGcore "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/gcore" pGname "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/gname" pGoDaddy "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/godaddy" @@ -186,6 +187,21 @@ func createApplicant(options *applicantOptions) (challenge.Provider, error) { return applicant, err } + case domain.ApplyDNSProviderTypeDynv6: + { + access := domain.AccessConfigForDynv6{} + if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { + return nil, fmt.Errorf("failed to populate provider access config: %w", err) + } + + applicant, err := pDynv6.NewChallengeProvider(&pDynv6.ChallengeProviderConfig{ + HttpToken: access.HttpToken, + DnsPropagationTimeout: options.DnsPropagationTimeout, + DnsTTL: options.DnsTTL, + }) + return applicant, err + } + case domain.ApplyDNSProviderTypeGcore: { access := domain.AccessConfigForGcore{} diff --git a/internal/domain/access.go b/internal/domain/access.go index 963d4083..f19a0871 100644 --- a/internal/domain/access.go +++ b/internal/domain/access.go @@ -108,6 +108,10 @@ type AccessConfigForDogeCloud struct { SecretKey string `json:"secretKey"` } +type AccessConfigForDynv6 struct { + HttpToken string `json:"httpToken"` +} + type AccessConfigForEdgio struct { ClientId string `json:"clientId"` ClientSecret string `json:"clientSecret"` diff --git a/internal/domain/provider.go b/internal/domain/provider.go index 6e0808ce..addb3c87 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -28,7 +28,7 @@ const ( AccessProviderTypeCUCCCloud = AccessProviderType("cucccloud") // 天翼云（预留） AccessProviderTypeDNSLA = AccessProviderType("dnsla") AccessProviderTypeDogeCloud = AccessProviderType("dogecloud") - AccessProviderTypeDynv6 = AccessProviderType("dynv6") // dynv6（预留） + AccessProviderTypeDynv6 = AccessProviderType("dynv6") AccessProviderTypeEdgio = AccessProviderType("edgio") AccessProviderTypeFastly = AccessProviderType("fastly") // Fastly（预留） AccessProviderTypeGname = AccessProviderType("gname") @@ -80,6 +80,7 @@ const ( ApplyDNSProviderTypeClouDNS = ApplyDNSProviderType("cloudns") ApplyDNSProviderTypeCMCCCloud = ApplyDNSProviderType("cmcccloud") ApplyDNSProviderTypeDNSLA = ApplyDNSProviderType("dnsla") + ApplyDNSProviderTypeDynv6 = ApplyDNSProviderType("dynv6") ApplyDNSProviderTypeGcore = ApplyDNSProviderType("gcore") ApplyDNSProviderTypeGname = ApplyDNSProviderType("gname") ApplyDNSProviderTypeGoDaddy = ApplyDNSProviderType("godaddy") diff --git a/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/dnsla.go b/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/dnsla.go new file mode 100644 index 00000000..e5a1ea3c --- /dev/null +++ b/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/dnsla.go @@ -0,0 +1,37 @@ +package dynv6 + +import ( + "time" + + "github.com/go-acme/lego/v4/challenge" + + internal "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/internal" +) + +type ChallengeProviderConfig struct { + HttpToken string `json:"httpToken"` + DnsPropagationTimeout int32 `json:"dnsPropagationTimeout,omitempty"` + DnsTTL int32 `json:"dnsTTL,omitempty"` +} + +func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { + if config == nil { + panic("config is nil") + } + + providerConfig := internal.NewDefaultConfig() + providerConfig.HTTPToken = config.HttpToken + if config.DnsPropagationTimeout != 0 { + providerConfig.PropagationTimeout = time.Duration(config.DnsPropagationTimeout) * time.Second + } + if config.DnsTTL != 0 { + providerConfig.TTL = int(config.DnsTTL) + } + + provider, err := internal.NewDNSProviderConfig(providerConfig) + if err != nil { + return nil, err + } + + return provider, nil +} diff --git a/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/internal/lego.go b/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/internal/lego.go new file mode 100644 index 00000000..f83949a2 --- /dev/null +++ b/internal/pkg/core/applicant/acme-dns-01/lego-providers/dynv6/internal/lego.go @@ -0,0 +1,167 @@ +package lego_dynv6 + +import ( + "context" + "errors" + "fmt" + "time" + + "github.com/go-acme/lego/v4/challenge" + "github.com/go-acme/lego/v4/challenge/dns01" + "github.com/go-acme/lego/v4/platform/config/env" + "github.com/libdns/dynv6" + "github.com/libdns/libdns" +) + +const ( + envNamespace = "DYNV6_" + + EnvHTTPToken = envNamespace + "HTTP_TOKEN" + + EnvTTL = envNamespace + "TTL" + EnvPropagationTimeout = envNamespace + "PROPAGATION_TIMEOUT" + EnvPollingInterval = envNamespace + "POLLING_INTERVAL" +) + +var _ challenge.ProviderTimeout = (*DNSProvider)(nil) + +type Config struct { + HTTPToken string + + PropagationTimeout time.Duration + PollingInterval time.Duration + TTL int +} + +type DNSProvider struct { + client *dynv6.Provider + config *Config +} + +func NewDefaultConfig() *Config { + return &Config{ + TTL: env.GetOrDefaultInt(EnvTTL, dns01.DefaultTTL), + PropagationTimeout: env.GetOrDefaultSecond(EnvPropagationTimeout, 2*time.Minute), + PollingInterval: env.GetOrDefaultSecond(EnvPollingInterval, dns01.DefaultPollingInterval), + } +} + +func NewDNSProvider() (*DNSProvider, error) { + values, err := env.Get(EnvHTTPToken) + if err != nil { + return nil, fmt.Errorf("dynv6: %w", err) + } + + config := NewDefaultConfig() + config.HTTPToken = values[EnvHTTPToken] + + return NewDNSProviderConfig(config) +} + +func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { + if config == nil { + return nil, errors.New("dynv6: the configuration of the DNS provider is nil") + } + + client := &dynv6.Provider{Token: config.HTTPToken} + + return &DNSProvider{ + client: client, + config: config, + }, nil +} + +func (d *DNSProvider) Present(domain, token, keyAuth string) error { + info := dns01.GetChallengeInfo(domain, keyAuth) + + authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN) + if err != nil { + return fmt.Errorf("dynv6: %w", err) + } + + subDomain, err := dns01.ExtractSubDomain(info.EffectiveFQDN, authZone) + if err != nil { + return fmt.Errorf("dynv6: %w", err) + } + + if err := d.addOrUpdateDNSRecord(dns01.UnFqdn(authZone), subDomain, info.Value); err != nil { + return fmt.Errorf("dynv6: %w", err) + } + + return nil +} + +func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { + info := dns01.GetChallengeInfo(domain, keyAuth) + + authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN) + if err != nil { + return fmt.Errorf("dynv6: %w", err) + } + + subDomain, err := dns01.ExtractSubDomain(info.EffectiveFQDN, authZone) + if err != nil { + return fmt.Errorf("dynv6: %w", err) + } + + if err := d.removeDNSRecord(dns01.UnFqdn(authZone), subDomain); err != nil { + return fmt.Errorf("dynv6: %w", err) + } + + return nil +} + +func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { + return d.config.PropagationTimeout, d.config.PollingInterval +} + +func (d *DNSProvider) getDNSRecord(zoneName, subDomain string) (*libdns.Record, error) { + records, err := d.client.GetRecords(context.Background(), zoneName) + if err != nil { + return nil, err + } + + for _, record := range records { + if record.Type == "TXT" && record.Name == subDomain { + return &record, nil + } + } + + return nil, nil +} + +func (d *DNSProvider) addOrUpdateDNSRecord(zoneName, subDomain, value string) error { + record, err := d.getDNSRecord(zoneName, subDomain) + if err != nil { + return err + } + + if record == nil { + record = &libdns.Record{ + Type: "TXT", + Name: subDomain, + Value: value, + TTL: time.Duration(d.config.TTL) * time.Second, + } + _, err := d.client.AppendRecords(context.Background(), zoneName, []libdns.Record{*record}) + return err + } else { + record.Value = value + _, err := d.client.SetRecords(context.Background(), zoneName, []libdns.Record{*record}) + return err + } +} + +func (d *DNSProvider) removeDNSRecord(zoneName, subDomain string) error { + record, err := d.getDNSRecord(zoneName, subDomain) + if err != nil { + return err + } + + if record == nil { + return nil + } else { + _, err = d.client.DeleteRecords(context.Background(), zoneName, []libdns.Record{*record}) + return err + } +} diff --git a/ui/public/imgs/providers/dynv6.svg b/ui/public/imgs/providers/dynv6.svg new file mode 100644 index 00000000..652e4e45 --- /dev/null +++ b/ui/public/imgs/providers/dynv6.svg @@ -0,0 +1 @@ + diff --git a/ui/src/components/access/AccessForm.tsx b/ui/src/components/access/AccessForm.tsx index caf5c605..63a66875 100644 --- a/ui/src/components/access/AccessForm.tsx +++ b/ui/src/components/access/AccessForm.tsx @@ -25,6 +25,7 @@ import AccessFormClouDNSConfig from "./AccessFormClouDNSConfig"; import AccessFormCMCCCloudConfig from "./AccessFormCMCCCloudConfig"; import AccessFormDNSLAConfig from "./AccessFormDNSLAConfig"; import AccessFormDogeCloudConfig from "./AccessFormDogeCloudConfig"; +import AccessFormDynv6Config from "./AccessFormDynv6Config"; import AccessFormEdgioConfig from "./AccessFormEdgioConfig"; import AccessFormGcoreConfig from "./AccessFormGcoreConfig"; import AccessFormGnameConfig from "./AccessFormGnameConfig"; @@ -133,6 +134,8 @@ const AccessForm = forwardRef(({ className, return ; case ACCESS_PROVIDERS.DOGECLOUD: return ; + case ACCESS_PROVIDERS.DYNV6: + return ; case ACCESS_PROVIDERS.GCORE: return ; case ACCESS_PROVIDERS.GNAME: diff --git a/ui/src/components/access/AccessFormDynv6Config.tsx b/ui/src/components/access/AccessFormDynv6Config.tsx new file mode 100644 index 00000000..92385302 --- /dev/null +++ b/ui/src/components/access/AccessFormDynv6Config.tsx @@ -0,0 +1,61 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { type AccessConfigForDynv6 } from "@/domain/access"; + +type AccessFormDynv6ConfigFieldValues = Nullish; + +export type AccessFormDynv6ConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: AccessFormDynv6ConfigFieldValues; + onValuesChange?: (values: AccessFormDynv6ConfigFieldValues) => void; +}; + +const initFormModel = (): AccessFormDynv6ConfigFieldValues => { + return { + httpToken: "", + }; +}; + +const AccessFormDynv6Config = ({ form: formInst, formName, disabled, initialValues, onValuesChange }: AccessFormDynv6ConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + httpToken: z + .string() + .min(1, t("access.form.dynv6_http_token.placeholder")) + .max(256, t("common.errmsg.string_max", { max: 256 })) + .trim(), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default AccessFormDynv6Config; diff --git a/ui/src/domain/access.ts b/ui/src/domain/access.ts index 59a41cc6..8c011857 100644 --- a/ui/src/domain/access.ts +++ b/ui/src/domain/access.ts @@ -22,6 +22,7 @@ export interface AccessModel extends BaseModel { | AccessConfigForCMCCCloud | AccessConfigForDNSLA | AccessConfigForDogeCloud + | AccessConfigForDynv6 | AccessConfigForEdgio | AccessConfigForGcore | AccessConfigForGname @@ -132,6 +133,10 @@ export type AccessConfigForDogeCloud = { secretKey: string; }; +export type AccessConfigForDynv6 = { + httpToken: string; +}; + export type AccessConfigForEdgio = { clientId: string; clientSecret: string; diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index b27c23da..999ae22d 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -20,6 +20,7 @@ export const ACCESS_PROVIDERS = Object.freeze({ CMCCCLOUD: "cmcccloud", DNSLA: "dnsla", DOGECLOUD: "dogecloud", + DYNV6: "dynv6", GCORE: "gcore", GNAME: "gname", GODADDY: "godaddy", @@ -97,6 +98,7 @@ export const accessProvidersMap: Maphttps://console.dogecloud.com/", + "access.form.dynv6_http_token.label": "dynv6 HTTP token", + "access.form.dynv6_http_token.placeholder": "Please enter dynv6 HTTP token", + "access.form.dynv6_http_token.tooltip": "For more information, see https://dynv6.com/keys", "access.form.edgio_client_id.label": "Edgio ClientId", "access.form.edgio_client_id.placeholder": "Please enter Edgio ClientId", "access.form.edgio_client_id.tooltip": "For more information, see https://docs.edg.io/applications/v7/rest_api/authentication#administering-api-clients", diff --git a/ui/src/i18n/locales/en/nls.provider.json b/ui/src/i18n/locales/en/nls.provider.json index 88219c27..d68d813f 100644 --- a/ui/src/i18n/locales/en/nls.provider.json +++ b/ui/src/i18n/locales/en/nls.provider.json @@ -47,6 +47,7 @@ "provider.dnsla": "DNS.LA", "provider.dogecloud": "Doge Cloud", "provider.dogecloud.cdn": "Doge Cloud - CDN (Content Delivery Network)", + "provider.dynv6": "dynv6", "provider.edgio": "Edgio", "provider.edgio.applications": "Edgio - Applications", "provider.fastly": "Fastly", diff --git a/ui/src/i18n/locales/zh/nls.access.json b/ui/src/i18n/locales/zh/nls.access.json index bb2f829a..12c10595 100644 --- a/ui/src/i18n/locales/zh/nls.access.json +++ b/ui/src/i18n/locales/zh/nls.access.json @@ -132,6 +132,9 @@ "access.form.dogecloud_secret_key.label": "多吉云 SecretKey", "access.form.dogecloud_secret_key.placeholder": "请输入多吉云 SecretKey", "access.form.dogecloud_secret_key.tooltip": "这是什么？请参阅 https://console.dogecloud.com/", + "access.form.dynv6_http_token.label": "dynv6 HTTP Token", + "access.form.dynv6_http_token.placeholder": "请输入 dynv6 HTTP Token", + "access.form.dynv6_http_token.tooltip": "这是什么？请参阅 https://dynv6.com/keys", "access.form.edgio_client_id.label": "Edgio 客户端 ID", "access.form.edgio_client_id.placeholder": "请输入 Edgio 客户端 ID", "access.form.edgio_client_id.tooltip": "这是什么？请参阅 https://docs.edg.io/applications/v7/rest_api/authentication#administering-api-clients", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index d400cfbc..7b7098f9 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -47,6 +47,7 @@ "provider.dnsla": "DNS.LA", "provider.dogecloud": "多吉云", "provider.dogecloud.cdn": "多吉云 - 内容分发网络 CDN", + "provider.dynv6": "dynv6", "provider.edgio": "Edgio", "provider.edgio.applications": "Edgio - Applications", "provider.fastly": "Fastly", From 02f806ab99b8e31ebde7af8ecfdd0452e17307e1 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 20 Mar 2025 23:35:37 +0800 Subject: [PATCH 19/23] feat: preset script for backup files on deployment to local and ssh --- .../node/DeployNodeConfigFormLocalConfig.tsx | 72 +++++++++++++++---- .../node/DeployNodeConfigFormSSHConfig.tsx | 52 ++++++++++++-- .../i18n/locales/en/nls.workflow.nodes.json | 2 + .../i18n/locales/zh/nls.workflow.nodes.json | 2 + 4 files changed, 111 insertions(+), 17 deletions(-) diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormLocalConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormLocalConfig.tsx index bd1cced6..1ca2fe8c 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormLocalConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormLocalConfig.tsx @@ -134,7 +134,24 @@ const DeployNodeConfigFormLocalConfig = ({ form: formInst, formName, disabled, i } }; - const handlePresetScriptClick = (key: string) => { + const handlePresetPreScriptClick = (key: string) => { + switch (key) { + case "backup_files": + { + formInst.setFieldValue("shellEnv", SHELLENV_SH); + formInst.setFieldValue( + "preCommand", + `# 请将以下路径替换为实际值 +cp "${formInst.getFieldValue("certPath")}" "${formInst.getFieldValue("certPath")}.bak" 2>/dev/null || : +cp "${formInst.getFieldValue("keyPath")}" "${formInst.getFieldValue("keyPath")}.bak" 2>/dev/null || : + `.trim() + ); + } + break; + } + }; + + const handlePresetPostScriptClick = (key: string) => { switch (key) { case "reload_nginx": { @@ -149,8 +166,8 @@ const DeployNodeConfigFormLocalConfig = ({ form: formInst, formName, disabled, i formInst.setFieldValue( "postCommand", `# 请将以下变量替换为实际值 -$pfxPath = "" # PFX 文件路径 -$pfxPassword = "" # PFX 密码 +$pfxPath = "${formInst.getFieldValue("certPath")}" # PFX 文件路径 +$pfxPassword = "${formInst.getFieldValue("pfxPassword")}" # PFX 密码 $siteName = "" # IIS 网站名称 $domain = "" # 域名 $ipaddr = "" # 绑定 IP，“*”表示所有 IP 绑定 @@ -186,8 +203,8 @@ Remove-Item -Path "$pfxPath" -Force formInst.setFieldValue( "postCommand", `# 请将以下变量替换为实际值 -$pfxPath = "" # PFX 文件路径 -$pfxPassword = "" # PFX 密码 +$pfxPath = "${formInst.getFieldValue("certPath")}" # PFX 文件路径 +$pfxPassword = "${formInst.getFieldValue("pfxPassword")}" # PFX 密码 $ipaddr = "" # 绑定 IP，“0.0.0.0”表示所有 IP 绑定，可填入域名。 $port = "" # 绑定端口 @@ -208,14 +225,15 @@ Remove-Item -Path "$pfxPath" -Force ); } break; + case "binding_rdp": { formInst.setFieldValue("shellEnv", SHELLENV_POWERSHELL); formInst.setFieldValue( "postCommand", `# 请将以下变量替换为实际值 -$pfxPath = "" # PFX 文件路径 -$pfxPassword = "" # PFX 密码 +$pfxPath = "${formInst.getFieldValue("certPath")}" # PFX 文件路径 +$pfxPassword = "${formInst.getFieldValue("pfxPassword")}" # PFX 密码 # 导入证书到本地计算机的个人存储区 $cert = Import-PfxCertificate -FilePath "$pfxPath" -CertStoreLocation Cert:\\LocalMachine\\My -Password (ConvertTo-SecureString -String "$pfxPassword" -AsPlainText -Force) -Exportable @@ -332,8 +350,36 @@ Set-ItemProperty -Path $rdpCertPath -Name "SSLCertificateSHA1Hash" -Value "$thum - - + + + + + @@ -349,22 +395,22 @@ Set-ItemProperty -Path $rdpCertPath -Name "SSLCertificateSHA1Hash" -Value "$thum { key: "reload_nginx", label: t("workflow_node.deploy.form.local_preset_scripts.option.reload_nginx.label"), - onClick: () => handlePresetScriptClick("reload_nginx"), + onClick: () => handlePresetPostScriptClick("reload_nginx"), }, { key: "binding_iis", label: t("workflow_node.deploy.form.local_preset_scripts.option.binding_iis.label"), - onClick: () => handlePresetScriptClick("binding_iis"), + onClick: () => handlePresetPostScriptClick("binding_iis"), }, { key: "binding_netsh", label: t("workflow_node.deploy.form.local_preset_scripts.option.binding_netsh.label"), - onClick: () => handlePresetScriptClick("binding_netsh"), + onClick: () => handlePresetPostScriptClick("binding_netsh"), }, { key: "binding_rdp", label: t("workflow_node.deploy.form.local_preset_scripts.option.binding_rdp.label"), - onClick: () => handlePresetScriptClick("binding_rdp"), + onClick: () => handlePresetPostScriptClick("binding_rdp"), }, ], }} diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormSSHConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormSSHConfig.tsx index 1e176d7b..65a7df7b 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormSSHConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormSSHConfig.tsx @@ -127,7 +127,23 @@ const DeployNodeConfigFormSSHConfig = ({ form: formInst, formName, disabled, ini } }; - const handlePresetScriptClick = (key: string) => { + const handlePresetPreScriptClick = (key: string) => { + switch (key) { + case "backup_files": + { + formInst.setFieldValue( + "preCommand", + `# 请将以下路径替换为实际值 +cp "${formInst.getFieldValue("certPath")}" "${formInst.getFieldValue("certPath")}.bak" 2>/dev/null || : +cp "${formInst.getFieldValue("keyPath")}" "${formInst.getFieldValue("keyPath")}.bak" 2>/dev/null || : + `.trim() + ); + } + break; + } + }; + + const handlePresetPostScriptClick = (key: string) => { switch (key) { case "reload_nginx": { @@ -228,8 +244,36 @@ const DeployNodeConfigFormSSHConfig = ({ form: formInst, formName, disabled, ini