jiazhizhong/certimate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei
2025-06-15 20:51:28 +08:00
parent 94a0292fad
commit 769b24aa88
7 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/pkg/core/uploader/providers/ctcccloud-ao/ctcccloud_ao.go
View File

@@ -73,19 +73,19 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
default:
}
listCertReq := &ctyunao.ListCertRequest{
listCertsReq := &ctyunao.ListCertsRequest{
Page: typeutil.ToPtr(listCertPage),
PerPage: typeutil.ToPtr(listCertPerPage),
UsageMode: typeutil.ToPtr(int32(0)),
}
listCertResp, err := u.sdkClient.ListCert(listCertReq)
u.logger.Debug("sdk request 'ao.ListCert'", slog.Any("request", listCertReq), slog.Any("response", listCertResp))
listCertsResp, err := u.sdkClient.ListCerts(listCertsReq)
u.logger.Debug("sdk request 'ao.ListCerts'", slog.Any("request", listCertsReq), slog.Any("response", listCertsResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'ao.ListCert': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'ao.ListCerts': %w", err)
}
if listCertResp.ReturnObj != nil {
for _, certRecord := range listCertResp.ReturnObj.Results {
if listCertsResp.ReturnObj != nil {
for _, certRecord := range listCertsResp.ReturnObj.Results {
// 对比证书通用名称
if !strings.EqualFold(certX509.Subject.CommonName, certRecord.CN) {
continue
@@ -137,7 +137,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
}
}
if listCertResp.ReturnObj == nil || len(listCertResp.ReturnObj.Results) < int(listCertPerPage) {
if listCertsResp.ReturnObj == nil || len(listCertsResp.ReturnObj.Results) < int(listCertPerPage) {
break
} else {
listCertPage++

10
internal/pkg/core/uploader/providers/ctcccloud-elb/ctcccloud_elb.go
View File

@@ -66,15 +66,15 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
// 查询证书列表，避免重复上传
// REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=24&api=5692&data=88&isNormal=1&vid=82
listCertificateReq := &ctyunelb.ListCertificateRequest{
listCertificatesReq := &ctyunelb.ListCertificatesRequest{
RegionID: typeutil.ToPtr(u.config.RegionId),
}
listCertificateResp, err := u.sdkClient.ListCertificate(listCertificateReq)
u.logger.Debug("sdk request 'elb.ListCertificate'", slog.Any("request", listCertificateReq), slog.Any("response", listCertificateResp))
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, fmt.Errorf("failed to execute sdk request 'elb.ListCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'elb.ListCertificates': %w", err)
} else {
for _, certRecord := range listCertificateResp.ReturnObj {
for _, certRecord := range listCertificatesResp.ReturnObj {
var isSameCert bool
if certRecord.Certificate == certPEM {
isSameCert = true