From 5fe24465d7abd27a0d446a92c336642bfbdbd90e Mon Sep 17 00:00:00 2001 From: fondoger Date: Thu, 17 Apr 2025 12:54:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=81=AB=E5=B1=B1?= =?UTF-8?q?=E4=BA=91=E8=AF=81=E4=B9=A6=E4=B8=8A=E4=BC=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volcengine-certcenter/volcengine_certcenter.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go index 990d9550..b802dc25 100644 --- a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go @@ -72,12 +72,17 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } var certId string - if importCertificateResp.InstanceId != nil { + if importCertificateResp.InstanceId != nil && *importCertificateResp.InstanceId != "" { certId = *importCertificateResp.InstanceId } - if importCertificateResp.RepeatId != nil { + if importCertificateResp.RepeatId != nil && *importCertificateResp.RepeatId != "" { certId = *importCertificateResp.RepeatId } + + if certId == "" { + return nil, xerrors.New("failed to get certId from importCertificateResp, both InstanceId and RepeatId are empty") + } + return &uploader.UploadResult{ CertId: certId, }, nil From 6c70b0655a7276993034b5d4de61df2284aaad4c Mon Sep 17 00:00:00 2001 From: RHQYZ Date: Thu, 17 Apr 2025 13:39:04 +0800 Subject: [PATCH 2/2] chore: modify error log --- .../providers/volcengine-certcenter/volcengine_certcenter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go index b802dc25..66540699 100644 --- a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go @@ -80,7 +80,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe } if certId == "" { - return nil, xerrors.New("failed to get certId from importCertificateResp, both InstanceId and RepeatId are empty") + return nil, xerrors.New("failed to get certificate id, both `InstanceId` and `RepeatId` are empty") } return &uploader.UploadResult{