From e2fd9c4ceedb7dbba687205e6c86aa3f6ba37f13 Mon Sep 17 00:00:00 2001 From: belier Date: Thu, 14 Nov 2024 14:28:35 +0800 Subject: [PATCH] style: modify variable name --- internal/deployer/volcengine_cdn.go | 4 ++-- internal/deployer/volcengine_live.go | 4 ++-- .../providers/volcengine-cdn/volcengine_cdn.go | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/deployer/volcengine_cdn.go b/internal/deployer/volcengine_cdn.go index 66dd0be7..6955716f 100644 --- a/internal/deployer/volcengine_cdn.go +++ b/internal/deployer/volcengine_cdn.go @@ -104,11 +104,11 @@ func (d *VolcengineCDNDeployer) Deploy(ctx context.Context) error { CertId: upres.CertId, Domain: domains[i], } - BindCertResp, err := d.sdkClient.BatchDeployCert(batchDeployCertReq) + batchDeployCertResp, err := d.sdkClient.BatchDeployCert(batchDeployCertReq) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'cdn.BatchDeployCert'") } else { - d.infos = append(d.infos, toStr(fmt.Sprintf("%s域名的证书已修改", domains[i]), BindCertResp)) + d.infos = append(d.infos, toStr(fmt.Sprintf("%s域名的证书已修改", domains[i]), batchDeployCertResp)) } } diff --git a/internal/deployer/volcengine_live.go b/internal/deployer/volcengine_live.go index 3eee9720..f456bb83 100644 --- a/internal/deployer/volcengine_live.go +++ b/internal/deployer/volcengine_live.go @@ -91,11 +91,11 @@ func (d *VolcengineLiveDeployer) Deploy(ctx context.Context) error { Domain: domains[i], HTTPS: cast.BoolPtr(true), } - BindCertResp, err := d.sdkClient.BindCert(apiCtx, bindCertReq) + bindCertResp, err := d.sdkClient.BindCert(apiCtx, bindCertReq) if err != nil { return xerrors.Wrap(err, "failed to execute sdk request 'live.BindCert'") } else { - d.infos = append(d.infos, toStr(fmt.Sprintf("%s域名的证书已修改", domains[i]), BindCertResp)) + d.infos = append(d.infos, toStr(fmt.Sprintf("%s域名的证书已修改", domains[i]), bindCertResp)) } } diff --git a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go index bca7ca38..b53ef4c5 100644 --- a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go +++ b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go @@ -54,20 +54,20 @@ func (u *VolcengineCDNUploader) Upload(ctx context.Context, certPem string, priv pageNum := int64(1) pageSize := int64(100) certSource := "volc_cert_center" - listCertReq := &cdn.ListCertInfoRequest{ + listCertInfoReq := &cdn.ListCertInfoRequest{ PageNum: &pageNum, PageSize: &pageSize, Source: certSource, } searchTotal := 0 for { - listCertResp, err := u.sdkClient.ListCertInfo(listCertReq) + listCertInfoResp, err := u.sdkClient.ListCertInfo(listCertInfoReq) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ListCertInfo'") } - if listCertResp.Result.CertInfo != nil { - for _, certDetail := range listCertResp.Result.CertInfo { + if listCertInfoResp.Result.CertInfo != nil { + for _, certDetail := range listCertInfoResp.Result.CertInfo { hash := sha256.Sum256(certX509.Raw) isSameCert := strings.EqualFold(hex.EncodeToString(hash[:]), certDetail.CertFingerprint.Sha256) // 如果已存在相同证书,直接返回已有的证书信息 @@ -80,8 +80,8 @@ func (u *VolcengineCDNUploader) Upload(ctx context.Context, certPem string, priv } } - searchTotal += len(listCertResp.Result.CertInfo) - if int(listCertResp.Result.Total) > searchTotal { + searchTotal += len(listCertInfoResp.Result.CertInfo) + if int(listCertInfoResp.Result.Total) > searchTotal { pageNum++ } else { break @@ -99,12 +99,12 @@ func (u *VolcengineCDNUploader) Upload(ctx context.Context, certPem string, priv Source: &certSource, Desc: &certName, } - createCertResp, err := u.sdkClient.AddCertificate(addCertificateReq) + addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.AddCertificate'") } - certId = createCertResp.Result.CertId + certId = addCertificateResp.Result.CertId return &uploader.UploadResult{ CertId: certId, CertName: certName,