From 6b5580a30c156edb0acfefa10b93f19155c863b7 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Fri, 1 Nov 2024 15:56:22 +0800 Subject: [PATCH] refactor: clean code --- .../pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go | 4 ++-- .../pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go | 4 ++-- .../uploader/providers/huaweicloud-elb/huaweicloud_elb.go | 8 ++++---- .../uploader/providers/huaweicloud-scm/huaweicloud_scm.go | 4 ++-- .../uploader/providers/qiniu-sslcert/qiniu_sslcert.go | 4 ++-- .../providers/tencentcloud-ssl/tencentcloud_ssl.go | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) 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 65e7275d..c524f115 100644 --- a/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go +++ b/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go @@ -27,7 +27,7 @@ type AliyunCASUploader struct { } func New(config *AliyunCASUploaderConfig) (*AliyunCASUploader, error) { - client, err := (&AliyunCASUploader{}).createSdkClient( + client, err := createSdkClient( config.AccessKeyId, config.AccessKeySecret, config.Region, @@ -132,7 +132,7 @@ func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyP }, nil } -func (u *AliyunCASUploader) createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunCas.Client, error) { +func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunCas.Client, error) { if region == "" { region = "cn-hangzhou" // CAS 服务默认区域：华东一杭州 } 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 a782a2a3..9a396c89 100644 --- a/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go +++ b/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go @@ -29,7 +29,7 @@ type AliyunSLBUploader struct { } func New(config *AliyunSLBUploaderConfig) (*AliyunSLBUploader, error) { - client, err := (&AliyunSLBUploader{}).createSdkClient( + client, err := createSdkClient( config.AccessKeyId, config.AccessKeySecret, config.Region, @@ -102,7 +102,7 @@ func (u *AliyunSLBUploader) Upload(ctx context.Context, certPem string, privkeyP }, nil } -func (u *AliyunSLBUploader) createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunSlb.Client, error) { +func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunSlb.Client, error) { if region == "" { region = "cn-hangzhou" // SLB 服务默认区域：华东一杭州 } 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 caba0175..198494b3 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go @@ -33,7 +33,7 @@ type HuaweiCloudELBUploader struct { } func New(config *HuaweiCloudELBUploaderConfig) (*HuaweiCloudELBUploader, error) { - client, err := (&HuaweiCloudELBUploader{}).createSdkClient( + client, err := createSdkClient( config.AccessKeyId, config.SecretAccessKey, config.Region, @@ -108,7 +108,7 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri // 获取项目 ID // REF: https://support.huaweicloud.com/api-iam/iam_06_0001.html - projectId, err := u.getSdkProjectId(u.config.Region, u.config.AccessKeyId, u.config.SecretAccessKey) + projectId, err := getSdkProjectId(u.config.AccessKeyId, u.config.SecretAccessKey, u.config.Region) if err != nil { return nil, xerrors.Wrap(err, "failed to get SDK project id") } @@ -142,7 +142,7 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri }, nil } -func (u *HuaweiCloudELBUploader) createSdkClient(accessKeyId, secretAccessKey, region string) (*hcElb.ElbClient, error) { +func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcElb.ElbClient, error) { if region == "" { region = "cn-north-4" // ELB 服务默认区域：华北四北京 } @@ -172,7 +172,7 @@ func (u *HuaweiCloudELBUploader) createSdkClient(accessKeyId, secretAccessKey, r return client, nil } -func (u *HuaweiCloudELBUploader) getSdkProjectId(accessKeyId, secretAccessKey, region string) (string, error) { +func getSdkProjectId(accessKeyId, secretAccessKey, region string) (string, error) { if region == "" { region = "cn-north-4" // IAM 服务默认区域：华北四北京 } 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 29a4ccf2..b8510900 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go @@ -28,7 +28,7 @@ type HuaweiCloudSCMUploader struct { } func New(config *HuaweiCloudSCMUploaderConfig) (*HuaweiCloudSCMUploader, error) { - client, err := (&HuaweiCloudSCMUploader{}).createSdkClient( + client, err := createSdkClient( config.AccessKeyId, config.SecretAccessKey, config.Region, @@ -139,7 +139,7 @@ func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, pri }, nil } -func (u *HuaweiCloudSCMUploader) createSdkClient(accessKeyId, secretAccessKey, region string) (*hcScm.ScmClient, error) { +func createSdkClient(accessKeyId, secretAccessKey, region string) (*hcScm.ScmClient, error) { if region == "" { region = "cn-north-4" // SCM 服务默认区域：华北四北京 } 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 247d4f2c..534881d1 100644 --- a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go @@ -24,7 +24,7 @@ type QiniuSSLCertUploader struct { } func New(config *QiniuSSLCertUploaderConfig) (*QiniuSSLCertUploader, error) { - client, err := (&QiniuSSLCertUploader{}).createSdkClient( + client, err := createSdkClient( config.AccessKey, config.SecretKey, ) @@ -63,7 +63,7 @@ func (u *QiniuSSLCertUploader) Upload(ctx context.Context, certPem string, privk }, nil } -func (u *QiniuSSLCertUploader) createSdkClient(accessKey, secretKey string) (*qiniuEx.Client, error) { +func createSdkClient(accessKey, secretKey string) (*qiniuEx.Client, error) { credential := auth.New(accessKey, secretKey) client := qiniuEx.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 35b08607..c6e5dcb5 100644 --- a/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -22,7 +22,7 @@ type TencentCloudSSLUploader struct { } func New(config *TencentCloudSSLUploaderConfig) (*TencentCloudSSLUploader, error) { - client, err := (&TencentCloudSSLUploader{}).createSdkClient( + client, err := createSdkClient( config.SecretId, config.SecretKey, ) @@ -55,7 +55,7 @@ func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, pr }, nil } -func (u *TencentCloudSSLUploader) 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()) if err != nil {