From 83264a69462f94b530d5c6e7a884f6cdd193ebaa Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 31 Oct 2024 11:37:16 +0800 Subject: [PATCH] refactor: clean code --- internal/deployer/aliyun_alb.go | 2 +- internal/deployer/aliyun_cdn.go | 2 +- internal/deployer/aliyun_clb.go | 2 +- internal/deployer/aliyun_dcdn.go | 2 +- internal/deployer/aliyun_nlb.go | 2 +- internal/deployer/aliyun_oss.go | 2 +- internal/deployer/deployer.go | 15 +-------------- internal/deployer/huaweicloud_cdn.go | 6 +++--- internal/deployer/huaweicloud_elb.go | 18 +++++++++--------- internal/deployer/k8s_secret.go | 2 +- internal/deployer/local.go | 2 +- internal/deployer/qiniu_cdn.go | 2 +- internal/deployer/ssh.go | 2 +- internal/deployer/tencent_cdn.go | 2 +- internal/deployer/tencent_clb.go | 2 +- internal/deployer/tencent_cos.go | 2 +- internal/deployer/tencent_ecdn.go | 2 +- internal/deployer/tencent_teo.go | 2 +- internal/deployer/webhook.go | 2 +- internal/domains/deploy.go | 4 ++-- .../core/uploader/uploader_tencentcloud_ssl.go | 7 ------- 21 files changed, 31 insertions(+), 51 deletions(-) diff --git a/internal/deployer/aliyun_alb.go b/internal/deployer/aliyun_alb.go index 91f6f0c7..cd6bddb9 100644 --- a/internal/deployer/aliyun_alb.go +++ b/internal/deployer/aliyun_alb.go @@ -59,7 +59,7 @@ func (d *AliyunALBDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *AliyunALBDeployer) GetInfo() []string { +func (d *AliyunALBDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/aliyun_cdn.go b/internal/deployer/aliyun_cdn.go index 29e9bf15..71a96d6d 100644 --- a/internal/deployer/aliyun_cdn.go +++ b/internal/deployer/aliyun_cdn.go @@ -46,7 +46,7 @@ func (d *AliyunCDNDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *AliyunCDNDeployer) GetInfo() []string { +func (d *AliyunCDNDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/aliyun_clb.go b/internal/deployer/aliyun_clb.go index 8af40687..3344b501 100644 --- a/internal/deployer/aliyun_clb.go +++ b/internal/deployer/aliyun_clb.go @@ -59,7 +59,7 @@ func (d *AliyunCLBDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *AliyunCLBDeployer) GetInfo() []string { +func (d *AliyunCLBDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/aliyun_dcdn.go b/internal/deployer/aliyun_dcdn.go index 37641016..75b03cbc 100644 --- a/internal/deployer/aliyun_dcdn.go +++ b/internal/deployer/aliyun_dcdn.go @@ -47,7 +47,7 @@ func (d *AliyunDCDNDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *AliyunDCDNDeployer) GetInfo() []string { +func (d *AliyunDCDNDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/aliyun_nlb.go b/internal/deployer/aliyun_nlb.go index 36034036..1e771744 100644 --- a/internal/deployer/aliyun_nlb.go +++ b/internal/deployer/aliyun_nlb.go @@ -59,7 +59,7 @@ func (d *AliyunNLBDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *AliyunNLBDeployer) GetInfo() []string { +func (d *AliyunNLBDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/aliyun_oss.go b/internal/deployer/aliyun_oss.go index f0ee5f56..d0045d89 100644 --- a/internal/deployer/aliyun_oss.go +++ b/internal/deployer/aliyun_oss.go @@ -45,7 +45,7 @@ func (d *AliyunOSSDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *AliyunOSSDeployer) GetInfo() []string { +func (d *AliyunOSSDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index 57ae4568..7be7b8ed 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -52,7 +52,7 @@ type DeployerOption struct { type Deployer interface { Deploy(ctx context.Context) error - GetInfo() []string + GetInfos() []string GetID() string } @@ -156,19 +156,6 @@ func toStr(tag string, data any) string { return tag + "：" + string(byts) } -func getDeployString(conf domain.DeployConfig, key string) string { - if _, ok := conf.Config[key]; !ok { - return "" - } - - val, ok := conf.Config[key].(string) - if !ok { - return "" - } - - return val -} - func getDeployVariables(conf domain.DeployConfig) map[string]string { rs := make(map[string]string) data, ok := conf.Config["variables"] diff --git a/internal/deployer/huaweicloud_cdn.go b/internal/deployer/huaweicloud_cdn.go index dfbe131e..ff7b4328 100644 --- a/internal/deployer/huaweicloud_cdn.go +++ b/internal/deployer/huaweicloud_cdn.go @@ -62,7 +62,7 @@ func (d *HuaweiCloudCDNDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *HuaweiCloudCDNDeployer) GetInfo() []string { +func (d *HuaweiCloudCDNDeployer) GetInfos() []string { return d.infos } @@ -74,7 +74,7 @@ func (d *HuaweiCloudCDNDeployer) Deploy(ctx context.Context) error { } showDomainFullConfigResp, err := d.sdkClient.ShowDomainFullConfig(showDomainFullConfigReq) if err != nil { - return err + return xerrors.Wrap(err, "failed to execute sdk request 'cdn.ShowDomainFullConfig'") } d.infos = append(d.infos, toStr("已查询到加速域名配置", showDomainFullConfigResp)) @@ -111,7 +111,7 @@ func (d *HuaweiCloudCDNDeployer) Deploy(ctx context.Context) error { } updateDomainMultiCertificatesResp, err := d.sdkClient.UploadDomainMultiCertificatesEx(updateDomainMultiCertificatesReq) if err != nil { - return err + return xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadDomainMultiCertificatesEx'") } d.infos = append(d.infos, toStr("已更新加速域名配置", updateDomainMultiCertificatesResp)) diff --git a/internal/deployer/huaweicloud_elb.go b/internal/deployer/huaweicloud_elb.go index 9bf9f40e..05b94956 100644 --- a/internal/deployer/huaweicloud_elb.go +++ b/internal/deployer/huaweicloud_elb.go @@ -67,7 +67,7 @@ func (d *HuaweiCloudELBDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *HuaweiCloudELBDeployer) GetInfo() []string { +func (d *HuaweiCloudELBDeployer) GetInfos() []string { return d.infos } @@ -173,7 +173,7 @@ func (u *HuaweiCloudELBDeployer) getSdkProjectId(accessKeyId, secretAccessKey, r if err != nil { return "", err } else if response.Projects == nil || len(*response.Projects) == 0 { - return "", fmt.Errorf("no project found") + return "", errors.New("no project found") } return (*response.Projects)[0].Id, nil @@ -198,7 +198,7 @@ func (d *HuaweiCloudELBDeployer) deployToCertificate(ctx context.Context) error } updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.UpdateCertificate': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.UpdateCertificate'") } d.infos = append(d.infos, toStr("已更新 ELB 证书", updateCertificateResp)) @@ -221,7 +221,7 @@ func (d *HuaweiCloudELBDeployer) deployToLoadbalancer(ctx context.Context) error } showLoadBalancerResp, err := d.sdkClient.ShowLoadBalancer(showLoadBalancerReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.ShowLoadBalancer': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowLoadBalancer'") } d.infos = append(d.infos, toStr("已查询到 ELB 负载均衡器", showLoadBalancerResp)) @@ -239,7 +239,7 @@ func (d *HuaweiCloudELBDeployer) deployToLoadbalancer(ctx context.Context) error } listListenersResp, err := d.sdkClient.ListListeners(listListenersReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.ListListeners': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.ListListeners'") } if listListenersResp.Listeners != nil { @@ -309,7 +309,7 @@ func (d *HuaweiCloudELBDeployer) updateListenerCertificate(ctx context.Context, } showListenerResp, err := d.sdkClient.ShowListener(showListenerReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.ShowListener': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowListener'") } d.infos = append(d.infos, toStr("已查询到 ELB 监听器", showListenerResp)) @@ -335,7 +335,7 @@ func (d *HuaweiCloudELBDeployer) updateListenerCertificate(ctx context.Context, } listOldCertificateResp, err := d.sdkClient.ListCertificates(listOldCertificateReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.ListCertificates': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.ListCertificates'") } showNewCertificateReq := &hcElbModel.ShowCertificateRequest{ @@ -343,7 +343,7 @@ func (d *HuaweiCloudELBDeployer) updateListenerCertificate(ctx context.Context, } showNewCertificateResp, err := d.sdkClient.ShowCertificate(showNewCertificateReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.ShowCertificate': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowCertificate'") } for _, certificate := range *listOldCertificateResp.Certificates { @@ -376,7 +376,7 @@ func (d *HuaweiCloudELBDeployer) updateListenerCertificate(ctx context.Context, } updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) if err != nil { - return fmt.Errorf("failed to execute sdk request 'elb.UpdateListener': %w", err) + return xerrors.Wrap(err, "failed to execute sdk request 'elb.UpdateListener'") } d.infos = append(d.infos, toStr("已更新 ELB 监听器", updateListenerResp)) diff --git a/internal/deployer/k8s_secret.go b/internal/deployer/k8s_secret.go index 0b5945b9..8a1c30ff 100644 --- a/internal/deployer/k8s_secret.go +++ b/internal/deployer/k8s_secret.go @@ -47,7 +47,7 @@ func (d *K8sSecretDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *K8sSecretDeployer) GetInfo() []string { +func (d *K8sSecretDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/local.go b/internal/deployer/local.go index ccda2306..eedec98b 100644 --- a/internal/deployer/local.go +++ b/internal/deployer/local.go @@ -41,7 +41,7 @@ func (d *LocalDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *LocalDeployer) GetInfo() []string { +func (d *LocalDeployer) GetInfos() []string { return []string{} } diff --git a/internal/deployer/qiniu_cdn.go b/internal/deployer/qiniu_cdn.go index 73e82ae0..d782a3e0 100644 --- a/internal/deployer/qiniu_cdn.go +++ b/internal/deployer/qiniu_cdn.go @@ -55,7 +55,7 @@ func (d *QiniuCDNDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *QiniuCDNDeployer) GetInfo() []string { +func (d *QiniuCDNDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/ssh.go b/internal/deployer/ssh.go index a94c9782..a50fcab6 100644 --- a/internal/deployer/ssh.go +++ b/internal/deployer/ssh.go @@ -32,7 +32,7 @@ func (d *SSHDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *SSHDeployer) GetInfo() []string { +func (d *SSHDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/tencent_cdn.go b/internal/deployer/tencent_cdn.go index d89cb819..ba03dc73 100644 --- a/internal/deployer/tencent_cdn.go +++ b/internal/deployer/tencent_cdn.go @@ -64,7 +64,7 @@ func (d *TencentCDNDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *TencentCDNDeployer) GetInfo() []string { +func (d *TencentCDNDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/tencent_clb.go b/internal/deployer/tencent_clb.go index 45ccb993..e773a346 100644 --- a/internal/deployer/tencent_clb.go +++ b/internal/deployer/tencent_clb.go @@ -62,7 +62,7 @@ func (d *TencentCLBDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *TencentCLBDeployer) GetInfo() []string { +func (d *TencentCLBDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/tencent_cos.go b/internal/deployer/tencent_cos.go index 749f5249..dfd1d850 100644 --- a/internal/deployer/tencent_cos.go +++ b/internal/deployer/tencent_cos.go @@ -57,7 +57,7 @@ func (d *TencentCOSDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *TencentCOSDeployer) GetInfo() []string { +func (d *TencentCOSDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/tencent_ecdn.go b/internal/deployer/tencent_ecdn.go index 0458c74d..6d526a3d 100644 --- a/internal/deployer/tencent_ecdn.go +++ b/internal/deployer/tencent_ecdn.go @@ -63,7 +63,7 @@ func (d *TencentECDNDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *TencentECDNDeployer) GetInfo() []string { +func (d *TencentECDNDeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/tencent_teo.go b/internal/deployer/tencent_teo.go index 83eca55e..d9d8e433 100644 --- a/internal/deployer/tencent_teo.go +++ b/internal/deployer/tencent_teo.go @@ -63,7 +63,7 @@ func (d *TencentTEODeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *TencentTEODeployer) GetInfo() []string { +func (d *TencentTEODeployer) GetInfos() []string { return d.infos } diff --git a/internal/deployer/webhook.go b/internal/deployer/webhook.go index bc227f0d..33b73f43 100644 --- a/internal/deployer/webhook.go +++ b/internal/deployer/webhook.go @@ -29,7 +29,7 @@ func (d *WebhookDeployer) GetID() string { return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id) } -func (d *WebhookDeployer) GetInfo() []string { +func (d *WebhookDeployer) GetInfos() []string { return d.infos } diff --git a/internal/domains/deploy.go b/internal/domains/deploy.go index 23b3a1dd..c9df14d3 100644 --- a/internal/domains/deploy.go +++ b/internal/domains/deploy.go @@ -105,11 +105,11 @@ func deploy(ctx context.Context, record *models.Record) error { if err = deployer.Deploy(ctx); err != nil { app.GetApp().Logger().Error("部署失败", "err", err) - history.record(deployPhase, "部署失败", &RecordInfo{Err: err, Info: deployer.GetInfo()}) + history.record(deployPhase, "部署失败", &RecordInfo{Err: err, Info: deployer.GetInfos()}) return err } history.record(deployPhase, fmt.Sprintf("[%s]-部署成功", deployer.GetID()), &RecordInfo{ - Info: deployer.GetInfo(), + Info: deployer.GetInfos(), }, false) } diff --git a/internal/pkg/core/uploader/uploader_tencentcloud_ssl.go b/internal/pkg/core/uploader/uploader_tencentcloud_ssl.go index 28837371..553e411c 100644 --- a/internal/pkg/core/uploader/uploader_tencentcloud_ssl.go +++ b/internal/pkg/core/uploader/uploader_tencentcloud_ssl.go @@ -37,13 +37,6 @@ func NewTencentCloudSSLUploader(config *TencentCloudSSLUploaderConfig) (Uploader } func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *UploadResult, err error) { - defer func() { - if r := recover(); r != nil { - fmt.Printf("Recovered from panic: %+v", r) - fmt.Println() - } - }() - // 生成新证书名（需符合腾讯云命名规则） var certId, certName string certName = fmt.Sprintf("certimate-%d", time.Now().UnixMilli())