refactor: clean code

2025-01-13 20:03:07 +08:00
parent 21cc1d43de
commit 7160589ac7
17 changed files with 86 additions and 118 deletions
--- a/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go
+++ b/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go
@@ -113,9 +113,6 @@ func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyP
 			break
 		} else {
 			listUserCertificateOrderPage += 1
-			if listUserCertificateOrderPage > 99 { // 避免死循环
-				break
-			}
 		}
 	}

--- a/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go
+++ b/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go
@@ -120,10 +120,6 @@ func (u *AliyunSLBUploader) Upload(ctx context.Context, certPem string, privkeyP
 }

 func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunSlb.Client, error) {
-	if region == "" {
-		region = "cn-hangzhou" // SLB 服务默认区域：华东一杭州
-	}
-
 	// 接入点一览 https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-endpoint
 	var endpoint string
 	switch region {
--- a/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go
+++ b/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go
@@ -14,7 +14,6 @@ import (
 	xerrors "github.com/pkg/errors"

 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
 )

@@ -60,9 +59,9 @@ func (u *ByteplusCDNUploader) Upload(ctx context.Context, certPem string, privke
 	listCertInfoPageSize := int64(100)
 	listCertInfoTotal := 0
 	listCertInfoReq := &bpCdn.ListCertInfoRequest{
-		PageNum:  cast.Int64Ptr(listCertInfoPageNum),
-		PageSize: cast.Int64Ptr(listCertInfoPageSize),
-		Source:   cast.StringPtr("cert_center"),
+		PageNum:  bpCdn.GetInt64Ptr(listCertInfoPageNum),
+		PageSize: bpCdn.GetInt64Ptr(listCertInfoPageSize),
+		Source:   bpCdn.GetStrPtr("cert_center"),
 	}
 	for {
 		listCertInfoResp, err := u.sdkClient.ListCertInfo(listCertInfoReq)
@@ -104,8 +103,8 @@ func (u *ByteplusCDNUploader) Upload(ctx context.Context, certPem string, privke
 	addCertificateReq := &bpCdn.AddCertificateRequest{
 		Certificate: certPem,
 		PrivateKey:  privkeyPem,
-		Source:      cast.StringPtr("cert_center"),
-		Desc:        cast.StringPtr(certName),
+		Source:      bpCdn.GetStrPtr("cert_center"),
+		Desc:        bpCdn.GetStrPtr(certName),
 	}
 	addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq)
 	if err != nil {
--- a/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go
+++ b/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go
@@ -17,8 +17,8 @@ import (
 	xerrors "github.com/pkg/errors"

 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
+	hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
 )

 type HuaweiCloudELBUploaderConfig struct {
@@ -66,12 +66,11 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri

 	// 遍历查询已有证书，避免重复上传
 	// REF: https://support.huaweicloud.com/api-elb/ListCertificates.html
-	listCertificatesPage := 1
 	listCertificatesLimit := int32(2000)
 	var listCertificatesMarker *string = nil
 	for {
 		listCertificatesReq := &hcElbModel.ListCertificatesRequest{
-			Limit:  cast.Int32Ptr(listCertificatesLimit),
+			Limit:  hwsdk.Int32Ptr(listCertificatesLimit),
 			Marker: listCertificatesMarker,
 			Type:   &[]string{"server"},
 		}
@@ -108,10 +107,6 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri
 			break
 		} else {
 			listCertificatesMarker = listCertificatesResp.PageInfo.NextMarker
-			listCertificatesPage++
-			if listCertificatesPage >= 9 { // 避免死循环
-				break
-			}
 		}
 	}

@@ -131,10 +126,10 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri
 	createCertificateReq := &hcElbModel.CreateCertificateRequest{
 		Body: &hcElbModel.CreateCertificateRequestBody{
 			Certificate: &hcElbModel.CreateCertificateOption{
-				ProjectId:   cast.StringPtr(projectId),
-				Name:        cast.StringPtr(certName),
-				Certificate: cast.StringPtr(certPem),
-				PrivateKey:  cast.StringPtr(privkeyPem),
+				ProjectId:   hwsdk.StringPtr(projectId),
+				Name:        hwsdk.StringPtr(certName),
+				Certificate: hwsdk.StringPtr(certPem),
+				PrivateKey:  hwsdk.StringPtr(privkeyPem),
 			},
 		},
 	}
--- a/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go
+++ b/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go
@@ -13,8 +13,8 @@ import (
 	xerrors "github.com/pkg/errors"

 	"github.com/usual2970/certimate/internal/pkg/core/uploader"
-	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
+	hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
 )

 type HuaweiCloudSCMUploaderConfig struct {
@@ -63,15 +63,14 @@ func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, pri
 	// 遍历查询已有证书，避免重复上传
 	// REF: https://support.huaweicloud.com/api-ccm/ListCertificates.html
 	// REF: https://support.huaweicloud.com/api-ccm/ExportCertificate_0.html
-	listCertificatesPage := 1
 	listCertificatesLimit := int32(50)
 	listCertificatesOffset := int32(0)
 	for {
 		listCertificatesReq := &hcScmModel.ListCertificatesRequest{
-			Limit:   cast.Int32Ptr(listCertificatesLimit),
-			Offset:  cast.Int32Ptr(listCertificatesOffset),
-			SortDir: cast.StringPtr("DESC"),
-			SortKey: cast.StringPtr("certExpiredTime"),
+			Limit:   hwsdk.Int32Ptr(listCertificatesLimit),
+			Offset:  hwsdk.Int32Ptr(listCertificatesOffset),
+			SortDir: hwsdk.StringPtr("DESC"),
+			SortKey: hwsdk.StringPtr("certExpiredTime"),
 		}
 		listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq)
 		if err != nil {
@@ -117,10 +116,6 @@ func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, pri
 			break
 		} else {
 			listCertificatesOffset += listCertificatesLimit
-			listCertificatesPage += 1
-			if listCertificatesPage > 99 { // 避免死循环
-				break
-			}
 		}
 	}

--- a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go
+++ b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go
@@ -12,9 +12,9 @@ import (

 	xerrors "github.com/pkg/errors"
 	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"
-	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
 )

@@ -60,8 +60,8 @@ func (u *VolcEngineCDNUploader) Upload(ctx context.Context, certPem string, priv
 	listCertInfoPageSize := int64(100)
 	listCertInfoTotal := 0
 	listCertInfoReq := &veCdn.ListCertInfoRequest{
-		PageNum:  cast.Int64Ptr(listCertInfoPageNum),
-		PageSize: cast.Int64Ptr(listCertInfoPageSize),
+		PageNum:  ve.Int64(listCertInfoPageNum),
+		PageSize: ve.Int64(listCertInfoPageSize),
 		Source:   "volc_cert_center",
 	}
 	for {
@@ -104,8 +104,8 @@ func (u *VolcEngineCDNUploader) Upload(ctx context.Context, certPem string, priv
 	addCertificateReq := &veCdn.AddCertificateRequest{
 		Certificate: certPem,
 		PrivateKey:  privkeyPem,
-		Source:      cast.StringPtr("volc_cert_center"),
-		Desc:        cast.StringPtr(certName),
+		Source:      ve.String("volc_cert_center"),
+		Desc:        ve.String(certName),
 	}
 	addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq)
 	if err != nil {
--- a/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go
+++ b/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go
@@ -9,9 +9,9 @@ import (

 	xerrors "github.com/pkg/errors"
 	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"
-	"github.com/usual2970/certimate/internal/pkg/utils/cast"
 	"github.com/usual2970/certimate/internal/pkg/utils/x509"
 )

@@ -63,7 +63,7 @@ func (u *VolcEngineLiveUploader) Upload(ctx context.Context, certPem string, pri
 			// 查询证书详细信息
 			// 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{
-				ChainID: cast.StringPtr(certDetail.ChainID),
+				ChainID: ve.String(certDetail.ChainID),
 			}
 			describeCertDetailSecretResp, err := u.sdkClient.DescribeCertDetailSecretV2(ctx, describeCertDetailSecretReq)
 			if err != nil {
@@ -100,9 +100,9 @@ func (u *VolcEngineLiveUploader) Upload(ctx context.Context, certPem string, pri
 	// 上传新证书
 	// REF: https://www.volcengine.com/docs/6469/1186278#%E6%B7%BB%E5%8A%A0%E8%AF%81%E4%B9%A6
 	createCertReq := &veLive.CreateCertBody{
-		CertName:    &certName,
+		CertName:    ve.String(certName),
 		UseWay:      "https",
-		ProjectName: cast.StringPtr("default"),
+		ProjectName: ve.String("default"),
 		Rsa: veLive.CreateCertBodyRsa{
 			Prikey: privkeyPem,
 			Pubkey: certPem,