diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index 0d915252..30e454f4 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -9,6 +9,7 @@ import ( "github.com/usual2970/certimate/internal/applicant" "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" ) @@ -136,7 +137,7 @@ func newWithTypeAndOption(deployType string, option *DeployerOption) (Deployer, // TODO: 暂时使用代理模式以兼容之前版本代码，后续重新实现此处逻辑 type proxyDeployer struct { option *DeployerOption - logger deployer.Logger + logger logger.Logger deployer deployer.Deployer } diff --git a/internal/deployer/factory.go b/internal/deployer/factory.go index 4c46ea08..2b8bb8fe 100644 --- a/internal/deployer/factory.go +++ b/internal/deployer/factory.go @@ -30,11 +30,12 @@ import ( providerVolcEngineCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-cdn" providerVolcEngineLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-live" providerWebhook "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/webhook" + "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/utils/maps" ) -func createDeployer(target string, accessConfig string, deployConfig map[string]any) (deployer.Deployer, deployer.Logger, error) { - logger := deployer.NewDefaultLogger() +func createDeployer(target string, accessConfig string, deployConfig map[string]any) (deployer.Deployer, logger.Logger, error) { + logger := logger.NewDefaultLogger() /* 注意：如果追加新的常量值，请保持以 ASCII 排序。 diff --git a/internal/pkg/core/deployer/deployer.go b/internal/pkg/core/deployer/deployer.go index b7b839fe..78d7c7de 100644 --- a/internal/pkg/core/deployer/deployer.go +++ b/internal/pkg/core/deployer/deployer.go @@ -20,5 +20,5 @@ type Deployer interface { // 表示证书部署结果的数据结构。 type DeployResult struct { - DeploymentData map[string]any `json:"deploymentData,omitempty"` + ExtendedData map[string]any `json:"extendedData,omitempty"` } 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 cdef4ee8..a92b4d33 100644 --- a/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -12,6 +12,7 @@ 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" providerCas "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -35,7 +36,7 @@ type AliyunALBDeployerConfig struct { type AliyunALBDeployer struct { config *AliyunALBDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *aliyunAlb.Client sslUploader uploader.Uploader } @@ -43,10 +44,10 @@ type AliyunALBDeployer struct { var _ deployer.Deployer = (*AliyunALBDeployer)(nil) func New(config *AliyunALBDeployerConfig) (*AliyunALBDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *AliyunALBDeployerConfig, logger deployer.Logger) (*AliyunALBDeployer, error) { +func NewWithLogger(config *AliyunALBDeployerConfig, logger logger.Logger) (*AliyunALBDeployer, error) { if config == nil { return nil, errors.New("config is nil") } 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 85005e8c..dcb2be57 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go +++ b/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go @@ -12,6 +12,7 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" ) type AliyunCDNDeployerConfig struct { @@ -25,17 +26,17 @@ type AliyunCDNDeployerConfig struct { type AliyunCDNDeployer struct { config *AliyunCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *aliyunCdn.Client } var _ deployer.Deployer = (*AliyunCDNDeployer)(nil) func New(config *AliyunCDNDeployerConfig) (*AliyunCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *AliyunCDNDeployerConfig, logger deployer.Logger) (*AliyunCDNDeployer, error) { +func NewWithLogger(config *AliyunCDNDeployerConfig, logger logger.Logger) (*AliyunCDNDeployer, error) { if config == nil { return nil, errors.New("config is 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 380c8581..86f6dfd9 100644 --- a/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -11,6 +11,7 @@ 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" providerSlb "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-slb" ) @@ -34,7 +35,7 @@ type AliyunCLBDeployerConfig struct { type AliyunCLBDeployer struct { config *AliyunCLBDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *aliyunSlb.Client sslUploader uploader.Uploader } @@ -42,10 +43,10 @@ type AliyunCLBDeployer struct { var _ deployer.Deployer = (*AliyunCLBDeployer)(nil) func New(config *AliyunCLBDeployerConfig) (*AliyunCLBDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *AliyunCLBDeployerConfig, logger deployer.Logger) (*AliyunCLBDeployer, error) { +func NewWithLogger(config *AliyunCLBDeployerConfig, logger logger.Logger) (*AliyunCLBDeployer, error) { if config == nil { return nil, errors.New("config is nil") } 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 41f21362..65c9a375 100644 --- a/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go +++ b/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go @@ -13,6 +13,7 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" ) type AliyunDCDNDeployerConfig struct { @@ -26,17 +27,17 @@ type AliyunDCDNDeployerConfig struct { type AliyunDCDNDeployer struct { config *AliyunDCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *aliyunDcdn.Client } var _ deployer.Deployer = (*AliyunDCDNDeployer)(nil) func New(config *AliyunDCDNDeployerConfig) (*AliyunDCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *AliyunDCDNDeployerConfig, logger deployer.Logger) (*AliyunDCDNDeployer, error) { +func NewWithLogger(config *AliyunDCDNDeployerConfig, logger logger.Logger) (*AliyunDCDNDeployer, error) { if config == nil { return nil, errors.New("config is 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 93ef6bf1..c5558b2c 100644 --- a/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go +++ b/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go @@ -12,6 +12,7 @@ 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" providerCas "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" ) @@ -35,7 +36,7 @@ type AliyunNLBDeployerConfig struct { type AliyunNLBDeployer struct { config *AliyunNLBDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *aliyunNlb.Client sslUploader uploader.Uploader } @@ -43,10 +44,10 @@ type AliyunNLBDeployer struct { var _ deployer.Deployer = (*AliyunNLBDeployer)(nil) func New(config *AliyunNLBDeployerConfig) (*AliyunNLBDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *AliyunNLBDeployerConfig, logger deployer.Logger) (*AliyunNLBDeployer, error) { +func NewWithLogger(config *AliyunNLBDeployerConfig, logger logger.Logger) (*AliyunNLBDeployer, error) { if config == nil { return nil, errors.New("config is 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 656c9e10..9caf0a3b 100644 --- a/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go +++ b/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go @@ -9,6 +9,7 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" ) type AliyunOSSDeployerConfig struct { @@ -26,17 +27,17 @@ type AliyunOSSDeployerConfig struct { type AliyunOSSDeployer struct { config *AliyunOSSDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *oss.Client } var _ deployer.Deployer = (*AliyunOSSDeployer)(nil) func New(config *AliyunOSSDeployerConfig) (*AliyunOSSDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *AliyunOSSDeployerConfig, logger deployer.Logger) (*AliyunOSSDeployer, error) { +func NewWithLogger(config *AliyunOSSDeployerConfig, logger logger.Logger) (*AliyunOSSDeployer, error) { if config == nil { return nil, errors.New("config is 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 28d6bed5..6db62251 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go +++ b/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go @@ -11,6 +11,7 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" ) type BaiduCloudCDNDeployerConfig struct { @@ -24,17 +25,17 @@ type BaiduCloudCDNDeployerConfig struct { type BaiduCloudCDNDeployer struct { config *BaiduCloudCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *bceCdn.Client } var _ deployer.Deployer = (*BaiduCloudCDNDeployer)(nil) func New(config *BaiduCloudCDNDeployerConfig) (*BaiduCloudCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *BaiduCloudCDNDeployerConfig, logger deployer.Logger) (*BaiduCloudCDNDeployer, error) { +func NewWithLogger(config *BaiduCloudCDNDeployerConfig, logger logger.Logger) (*BaiduCloudCDNDeployer, error) { if config == nil { return nil, errors.New("config is nil") } 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 27650e05..9497bb6a 100644 --- a/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go +++ b/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go @@ -10,6 +10,7 @@ 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" providerCdn "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/byteplus-cdn" ) @@ -25,7 +26,7 @@ type BytePlusCDNDeployerConfig struct { type BytePlusCDNDeployer struct { config *BytePlusCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *bpCdn.CDN sslUploader uploader.Uploader } @@ -33,10 +34,10 @@ type BytePlusCDNDeployer struct { var _ deployer.Deployer = (*BytePlusCDNDeployer)(nil) func New(config *BytePlusCDNDeployerConfig) (*BytePlusCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *BytePlusCDNDeployerConfig, logger deployer.Logger) (*BytePlusCDNDeployer, error) { +func NewWithLogger(config *BytePlusCDNDeployerConfig, logger logger.Logger) (*BytePlusCDNDeployer, error) { if config == nil { return nil, errors.New("config is 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 20ef5904..4d9f4ac4 100644 --- a/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go +++ b/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go @@ -8,6 +8,7 @@ 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" providerDoge "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/dogecloud" dogesdk "github.com/usual2970/certimate/internal/pkg/vendors/dogecloud-sdk" @@ -24,7 +25,7 @@ type DogeCloudCDNDeployerConfig struct { type DogeCloudCDNDeployer struct { config *DogeCloudCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *dogesdk.Client sslUploader uploader.Uploader } @@ -32,10 +33,10 @@ type DogeCloudCDNDeployer struct { var _ deployer.Deployer = (*DogeCloudCDNDeployer)(nil) func New(config *DogeCloudCDNDeployerConfig) (*DogeCloudCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *DogeCloudCDNDeployerConfig, logger deployer.Logger) (*DogeCloudCDNDeployer, error) { +func NewWithLogger(config *DogeCloudCDNDeployerConfig, logger logger.Logger) (*DogeCloudCDNDeployer, error) { if config == nil { return nil, errors.New("config is 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 b305156b..1dba8085 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go @@ -11,6 +11,7 @@ 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" providerScm "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-scm" "github.com/usual2970/certimate/internal/pkg/utils/cast" @@ -30,7 +31,7 @@ type HuaweiCloudCDNDeployerConfig struct { type HuaweiCloudCDNDeployer struct { config *HuaweiCloudCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *huaweicloudsdk.Client sslUploader uploader.Uploader } @@ -38,10 +39,10 @@ type HuaweiCloudCDNDeployer struct { var _ deployer.Deployer = (*HuaweiCloudCDNDeployer)(nil) func New(config *HuaweiCloudCDNDeployerConfig) (*HuaweiCloudCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *HuaweiCloudCDNDeployerConfig, logger deployer.Logger) (*HuaweiCloudCDNDeployer, error) { +func NewWithLogger(config *HuaweiCloudCDNDeployerConfig, logger logger.Logger) (*HuaweiCloudCDNDeployer, error) { if config == nil { return nil, errors.New("config is 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 d3c142f0..010bdd2b 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -17,6 +17,7 @@ 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" providerElb "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-elb" "github.com/usual2970/certimate/internal/pkg/utils/cast" @@ -44,7 +45,7 @@ type HuaweiCloudELBDeployerConfig struct { type HuaweiCloudELBDeployer struct { config *HuaweiCloudELBDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *hcElb.ElbClient sslUploader uploader.Uploader } @@ -52,10 +53,10 @@ type HuaweiCloudELBDeployer struct { var _ deployer.Deployer = (*HuaweiCloudELBDeployer)(nil) func New(config *HuaweiCloudELBDeployerConfig) (*HuaweiCloudELBDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *HuaweiCloudELBDeployerConfig, logger deployer.Logger) (*HuaweiCloudELBDeployer, error) { +func NewWithLogger(config *HuaweiCloudELBDeployerConfig, logger logger.Logger) (*HuaweiCloudELBDeployer, error) { if config == nil { return nil, errors.New("config is 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 f14fe1f6..8dae9aef 100644 --- a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go +++ b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go @@ -13,6 +13,7 @@ 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/x509" ) @@ -31,16 +32,16 @@ type K8sSecretDeployerConfig struct { type K8sSecretDeployer struct { config *K8sSecretDeployerConfig - logger deployer.Logger + logger logger.Logger } var _ deployer.Deployer = (*K8sSecretDeployer)(nil) func New(config *K8sSecretDeployerConfig) (*K8sSecretDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *K8sSecretDeployerConfig, logger deployer.Logger) (*K8sSecretDeployer, error) { +func NewWithLogger(config *K8sSecretDeployerConfig, logger logger.Logger) (*K8sSecretDeployer, error) { if config == nil { return nil, errors.New("config is nil") } diff --git a/internal/pkg/core/deployer/providers/local/local.go b/internal/pkg/core/deployer/providers/local/local.go index d4eb7a66..344936d9 100644 --- a/internal/pkg/core/deployer/providers/local/local.go +++ b/internal/pkg/core/deployer/providers/local/local.go @@ -11,6 +11,7 @@ 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/fs" "github.com/usual2970/certimate/internal/pkg/utils/x509" ) @@ -45,16 +46,16 @@ type LocalDeployerConfig struct { type LocalDeployer struct { config *LocalDeployerConfig - logger deployer.Logger + logger logger.Logger } var _ deployer.Deployer = (*LocalDeployer)(nil) func New(config *LocalDeployerConfig) (*LocalDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *LocalDeployerConfig, logger deployer.Logger) (*LocalDeployer, error) { +func NewWithLogger(config *LocalDeployerConfig, logger logger.Logger) (*LocalDeployer, error) { if config == nil { return nil, errors.New("config is 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 7871bf17..03ae1762 100644 --- a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -9,6 +9,7 @@ import ( "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" providerQiniu "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/qiniu-sslcert" qiniusdk "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk" @@ -25,7 +26,7 @@ type QiniuCDNDeployerConfig struct { type QiniuCDNDeployer struct { config *QiniuCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *qiniusdk.Client sslUploader uploader.Uploader } @@ -33,10 +34,10 @@ type QiniuCDNDeployer struct { var _ deployer.Deployer = (*QiniuCDNDeployer)(nil) func New(config *QiniuCDNDeployerConfig) (*QiniuCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *QiniuCDNDeployerConfig, logger deployer.Logger) (*QiniuCDNDeployer, error) { +func NewWithLogger(config *QiniuCDNDeployerConfig, logger logger.Logger) (*QiniuCDNDeployer, error) { if config == nil { return nil, errors.New("config is nil") } diff --git a/internal/pkg/core/deployer/providers/ssh/ssh.go b/internal/pkg/core/deployer/providers/ssh/ssh.go index 27e3fc1a..00cf1fca 100644 --- a/internal/pkg/core/deployer/providers/ssh/ssh.go +++ b/internal/pkg/core/deployer/providers/ssh/ssh.go @@ -13,6 +13,7 @@ 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/x509" ) @@ -57,16 +58,16 @@ type SshDeployerConfig struct { type SshDeployer struct { config *SshDeployerConfig - logger deployer.Logger + logger logger.Logger } var _ deployer.Deployer = (*SshDeployer)(nil) func New(config *SshDeployerConfig) (*SshDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *SshDeployerConfig, logger deployer.Logger) (*SshDeployer, error) { +func NewWithLogger(config *SshDeployerConfig, logger logger.Logger) (*SshDeployer, error) { if config == nil { return nil, errors.New("config is 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 68475257..fac9dbae 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -13,6 +13,7 @@ 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" providerSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -28,7 +29,7 @@ type TencentCloudCDNDeployerConfig struct { type TencentCloudCDNDeployer struct { config *TencentCloudCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClients *tencentCloudCDNDeployerSdkClients sslUploader uploader.Uploader } @@ -41,10 +42,10 @@ type tencentCloudCDNDeployerSdkClients struct { } func New(config *TencentCloudCDNDeployerConfig) (*TencentCloudCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *TencentCloudCDNDeployerConfig, logger deployer.Logger) (*TencentCloudCDNDeployer, error) { +func NewWithLogger(config *TencentCloudCDNDeployerConfig, logger logger.Logger) (*TencentCloudCDNDeployer, error) { if config == nil { return nil, errors.New("config is nil") } 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 990e266d..ed00e1c9 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go @@ -12,6 +12,7 @@ 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" providerSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -38,7 +39,7 @@ type TencentCloudCLBDeployerConfig struct { type TencentCloudCLBDeployer struct { config *TencentCloudCLBDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -51,10 +52,10 @@ type wSdkClients struct { } func New(config *TencentCloudCLBDeployerConfig) (*TencentCloudCLBDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *TencentCloudCLBDeployerConfig, logger deployer.Logger) (*TencentCloudCLBDeployer, error) { +func NewWithLogger(config *TencentCloudCLBDeployerConfig, logger logger.Logger) (*TencentCloudCLBDeployer, error) { if config == nil { return nil, errors.New("config is 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 88f2ad60..23c2d11a 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go @@ -11,6 +11,7 @@ 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" providerSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -30,7 +31,7 @@ type TencentCloudCOSDeployerConfig struct { type TencentCloudCOSDeployer struct { config *TencentCloudCOSDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *tcSsl.Client sslUploader uploader.Uploader } @@ -38,10 +39,10 @@ type TencentCloudCOSDeployer struct { var _ deployer.Deployer = (*TencentCloudCOSDeployer)(nil) func New(config *TencentCloudCOSDeployerConfig) (*TencentCloudCOSDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *TencentCloudCOSDeployerConfig, logger deployer.Logger) (*TencentCloudCOSDeployer, error) { +func NewWithLogger(config *TencentCloudCOSDeployerConfig, logger logger.Logger) (*TencentCloudCOSDeployer, error) { if config == nil { return nil, errors.New("config is 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 b5be93ba..e8cbdbb3 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -12,6 +12,7 @@ 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" providerSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -27,7 +28,7 @@ type TencentCloudECDNDeployerConfig struct { type TencentCloudECDNDeployer struct { config *TencentCloudECDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -40,10 +41,10 @@ type wSdkClients struct { } func New(config *TencentCloudECDNDeployerConfig) (*TencentCloudECDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *TencentCloudECDNDeployerConfig, logger deployer.Logger) (*TencentCloudECDNDeployer, error) { +func NewWithLogger(config *TencentCloudECDNDeployerConfig, logger logger.Logger) (*TencentCloudECDNDeployer, error) { if config == nil { return nil, errors.New("config is nil") } 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 a1de42fa..fb45ea9e 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -11,6 +11,7 @@ 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" providerSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" ) @@ -28,7 +29,7 @@ type TencentCloudEODeployerConfig struct { type TencentCloudEODeployer struct { config *TencentCloudEODeployerConfig - logger deployer.Logger + logger logger.Logger sdkClients *wSdkClients sslUploader uploader.Uploader } @@ -41,10 +42,10 @@ type wSdkClients struct { } func New(config *TencentCloudEODeployerConfig) (*TencentCloudEODeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *TencentCloudEODeployerConfig, logger deployer.Logger) (*TencentCloudEODeployer, error) { +func NewWithLogger(config *TencentCloudEODeployerConfig, logger logger.Logger) (*TencentCloudEODeployer, error) { if config == nil { return nil, errors.New("config is 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 11906474..903ad1ea 100644 --- a/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go +++ b/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go @@ -10,6 +10,7 @@ import ( 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" providerCdn "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-cdn" ) @@ -25,7 +26,7 @@ type VolcEngineCDNDeployerConfig struct { type VolcEngineCDNDeployer struct { config *VolcEngineCDNDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *veCdn.CDN sslUploader uploader.Uploader } @@ -33,10 +34,10 @@ type VolcEngineCDNDeployer struct { var _ deployer.Deployer = (*VolcEngineCDNDeployer)(nil) func New(config *VolcEngineCDNDeployerConfig) (*VolcEngineCDNDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *VolcEngineCDNDeployerConfig, logger deployer.Logger) (*VolcEngineCDNDeployer, error) { +func NewWithLogger(config *VolcEngineCDNDeployerConfig, logger logger.Logger) (*VolcEngineCDNDeployer, error) { if config == nil { return nil, errors.New("config is 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 f492cf89..aba43a82 100644 --- a/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go +++ b/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go @@ -10,6 +10,7 @@ import ( veLive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/uploader" providerLive "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-live" "github.com/usual2970/certimate/internal/pkg/utils/cast" @@ -26,7 +27,7 @@ type VolcEngineLiveDeployerConfig struct { type VolcEngineLiveDeployer struct { config *VolcEngineLiveDeployerConfig - logger deployer.Logger + logger logger.Logger sdkClient *veLive.Live sslUploader uploader.Uploader } @@ -34,10 +35,10 @@ type VolcEngineLiveDeployer struct { var _ deployer.Deployer = (*VolcEngineLiveDeployer)(nil) func New(config *VolcEngineLiveDeployerConfig) (*VolcEngineLiveDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *VolcEngineLiveDeployerConfig, logger deployer.Logger) (*VolcEngineLiveDeployer, error) { +func NewWithLogger(config *VolcEngineLiveDeployerConfig, logger logger.Logger) (*VolcEngineLiveDeployer, error) { if config == nil { return nil, errors.New("config is nil") } diff --git a/internal/pkg/core/deployer/providers/webhook/webhook.go b/internal/pkg/core/deployer/providers/webhook/webhook.go index 7a4bdb48..56fe9ace 100644 --- a/internal/pkg/core/deployer/providers/webhook/webhook.go +++ b/internal/pkg/core/deployer/providers/webhook/webhook.go @@ -13,6 +13,7 @@ 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/x509" ) @@ -25,17 +26,17 @@ type WebhookDeployerConfig struct { type WebhookDeployer struct { config *WebhookDeployerConfig - logger deployer.Logger + logger logger.Logger httpClient *httpclient.Client } var _ deployer.Deployer = (*WebhookDeployer)(nil) func New(config *WebhookDeployerConfig) (*WebhookDeployer, error) { - return NewWithLogger(config, deployer.NewNilLogger()) + return NewWithLogger(config, logger.NewNilLogger()) } -func NewWithLogger(config *WebhookDeployerConfig, logger deployer.Logger) (*WebhookDeployer, error) { +func NewWithLogger(config *WebhookDeployerConfig, logger logger.Logger) (*WebhookDeployer, error) { if config == nil { return nil, errors.New("config is nil") } @@ -86,7 +87,7 @@ func (d *WebhookDeployer) Deploy(ctx context.Context, certPem string, privkeyPem d.logger.Logt("Webhook Response", string(respBody)) return &deployer.DeployResult{ - DeploymentData: map[string]any{ + ExtendedData: map[string]any{ "responseText": string(respBody), }, }, nil diff --git a/internal/pkg/core/deployer/logger.go b/internal/pkg/core/logger/builtin.go similarity index 74% rename from internal/pkg/core/deployer/logger.go rename to internal/pkg/core/logger/builtin.go index 8a8b2f32..d3209d70 100644 --- a/internal/pkg/core/deployer/logger.go +++ b/internal/pkg/core/logger/builtin.go @@ -1,4 +1,4 @@ -package deployer +package logger import ( "encoding/json" @@ -7,31 +7,6 @@ import ( "strings" ) -// 表示定义证书部署器的日志记录器的抽象类型接口。 -type Logger interface { - // 追加一条日志记录。 - // 该方法会将 `data` 以 JSON 序列化后拼接到 `tag` 结尾。 - // - // 入参： - // - tag：标签。 - // - data：数据。 - Logt(tag string, data ...any) - - // 追加一条日志记录。 - // 该方法会将 `args` 以 `format` 格式化。 - // - // 入参： - // - format：格式化字符串。 - // - args：格式化参数。 - Logf(format string, args ...any) - - // 获取所有日志记录。 - GetRecords() []string - - // 清空所有日志记录。 - FlushRecords() -} - // 表示默认的日志记录器类型。 type DefaultLogger struct { records []string diff --git a/internal/pkg/core/logger/logger.go b/internal/pkg/core/logger/logger.go new file mode 100644 index 00000000..cc6284cd --- /dev/null +++ b/internal/pkg/core/logger/logger.go @@ -0,0 +1,27 @@ +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/deployer/logger_test.go b/internal/pkg/core/logger/logger_test.go similarity index 89% rename from internal/pkg/core/deployer/logger_test.go rename to internal/pkg/core/logger/logger_test.go index 35021a99..29308a83 100644 --- a/internal/pkg/core/deployer/logger_test.go +++ b/internal/pkg/core/logger/logger_test.go @@ -1,9 +1,9 @@ -package deployer_test +package logger_test import ( "testing" - "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" ) /* @@ -13,7 +13,7 @@ Shell command to run this test: */ func TestLogger(t *testing.T) { t.Run("Logger_Appendt", func(t *testing.T) { - logger := deployer.NewDefaultLogger() + logger := logger.NewDefaultLogger() logger.Logt("test") logger.Logt("test_nil", nil) @@ -34,7 +34,7 @@ func TestLogger(t *testing.T) { }) t.Run("Logger_Appendf", func(t *testing.T) { - logger := deployer.NewDefaultLogger() + logger := logger.NewDefaultLogger() logger.Logf("test") logger.Logf("test_nil: %v", nil) diff --git a/internal/pkg/core/notifier/notifier.go b/internal/pkg/core/notifier/notifier.go index d8819395..22fc8574 100644 --- a/internal/pkg/core/notifier/notifier.go +++ b/internal/pkg/core/notifier/notifier.go @@ -19,5 +19,5 @@ type Notifier interface { // 表示通知发送结果的数据结构。 type NotifyResult struct { - NotificationData map[string]any `json:"notificationData,omitempty"` + ExtendedData map[string]any `json:"extendedData,omitempty"` } diff --git a/internal/pkg/core/uploader/uploader.go b/internal/pkg/core/uploader/uploader.go index 1fc34d82..76748a99 100644 --- a/internal/pkg/core/uploader/uploader.go +++ b/internal/pkg/core/uploader/uploader.go @@ -21,7 +21,7 @@ type Uploader interface { // 表示证书上传结果的数据结构，包含上传后的证书 ID、名称和其他数据。 type UploadResult struct { - CertId string `json:"certId"` - CertName string `json:"certName"` - CertData map[string]any `json:"certData,omitempty"` + CertId string `json:"certId"` + CertName string `json:"certName"` + ExtendedData map[string]any `json:"extendedData,omitempty"` }