wood/certimate
1
0
Fork 0
mirror of https://github.com/woodchen-ink/certimate.git synced 2025-07-18 09:21:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: #827

Browse Source
This commit is contained in:
Fu Diwei 2025-06-27 13:13:50 +08:00 committed by RHQYZ
parent 808370fd10
commit f29cdae648
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/core/ssl-deployer/providers/aliyun-alb/aliyun_alb.go
View File

@ -109,12 +109,12 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
// 根据部署资源类型决定部署方式 // 根据部署资源类型决定部署方式
switch d.config.ResourceType { switch d.config.ResourceType {
case RESOURCE_TYPE_LOADBALANCER: case RESOURCE_TYPE_LOADBALANCER:
if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { if err := d.deployToLoadbalancer(ctx, upres.ExtendedData["certIdentifier"].(string)); err != nil {
return nil, err return nil, err
} }
case RESOURCE_TYPE_LISTENER: case RESOURCE_TYPE_LISTENER:
if err := d.deployToListener(ctx, upres.CertId); err != nil { if err := d.deployToListener(ctx, upres.ExtendedData["certIdentifier"].(string)); err != nil {
return nil, err return nil, err
} }
@ -338,13 +338,13 @@ func (d *SSLDeployerProvider) updateListenerCertificate(ctx context.Context, clo
continue continue
} }
// 监听证书 ID 格式：${证书 ID}-${地域} if tea.StringValue(listenerCertificate.CertificateId) == cloudCertId {
certificateId := strings.Split(tea.StringValue(listenerCertificate.CertificateId), "-")[0]
if certificateId == cloudCertId {
certificateIsAlreadyAssociated = true certificateIsAlreadyAssociated = true
break break
} }
// 监听证书 ID 格式：${证书 ID}-${地域}
certificateId := strings.Split(tea.StringValue(listenerCertificate.CertificateId), "-")[0]
certificateIdAsInt64, err := strconv.ParseInt(certificateId, 10, 64) certificateIdAsInt64, err := strconv.ParseInt(certificateId, 10, 64)
if err != nil { if err != nil {
errs = append(errs, err) errs = append(errs, err)

4
pkg/core/ssl-deployer/providers/aliyun-nlb/aliyun_nlb.go
View File

@ -97,12 +97,12 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
// 根据部署资源类型决定部署方式 // 根据部署资源类型决定部署方式
switch d.config.ResourceType { switch d.config.ResourceType {
case RESOURCE_TYPE_LOADBALANCER: case RESOURCE_TYPE_LOADBALANCER:
if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { if err := d.deployToLoadbalancer(ctx, upres.ExtendedData["certIdentifier"].(string)); err != nil {
return nil, err return nil, err
} }
case RESOURCE_TYPE_LISTENER: case RESOURCE_TYPE_LISTENER:
if err := d.deployToListener(ctx, upres.CertId); err != nil { if err := d.deployToListener(ctx, upres.ExtendedData["certIdentifier"].(string)); err != nil {
return nil, err return nil, err
} }