diff --git a/pkg/core/ssl-deployer/providers/azure-keyvault/azure_keyvault.go b/pkg/core/ssl-deployer/providers/azure-keyvault/azure_keyvault.go index 4965f4dbb..dd0dd3b31 100644 --- a/pkg/core/ssl-deployer/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/ssl-deployer/providers/azure-keyvault/azure_keyvault.go @@ -117,7 +117,7 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke } else { oldCertX509, err := x509.ParseCertificate(getCertificateResp.CER) if err == nil { - if xcert.EqualCertificate(certX509, oldCertX509) { + if xcert.EqualCertificates(certX509, oldCertX509) { return &core.SSLDeployResult{}, nil } } diff --git a/pkg/core/ssl-manager/providers/aliyun-cas/aliyun_cas.go b/pkg/core/ssl-manager/providers/aliyun-cas/aliyun_cas.go index d76eb357d..f75979f1b 100644 --- a/pkg/core/ssl-manager/providers/aliyun-cas/aliyun_cas.go +++ b/pkg/core/ssl-manager/providers/aliyun-cas/aliyun_cas.go @@ -126,7 +126,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/aws-acm/aws_acm.go b/pkg/core/ssl-manager/providers/aws-acm/aws_acm.go index 21de4df71..a64068034 100644 --- a/pkg/core/ssl-manager/providers/aws-acm/aws_acm.go +++ b/pkg/core/ssl-manager/providers/aws-acm/aws_acm.go @@ -121,7 +121,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - if !xcert.EqualCertificate(certX509, oldCertX509) { + if !xcert.EqualCertificates(certX509, oldCertX509) { continue } } diff --git a/pkg/core/ssl-manager/providers/aws-iam/aws_iam.go b/pkg/core/ssl-manager/providers/aws-iam/aws_iam.go index df2555a8c..cff65a05e 100644 --- a/pkg/core/ssl-manager/providers/aws-iam/aws_iam.go +++ b/pkg/core/ssl-manager/providers/aws-iam/aws_iam.go @@ -124,7 +124,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - if !xcert.EqualCertificate(certX509, oldCertX509) { + if !xcert.EqualCertificates(certX509, oldCertX509) { continue } } diff --git a/pkg/core/ssl-manager/providers/azure-keyvault/azure_keyvault.go b/pkg/core/ssl-manager/providers/azure-keyvault/azure_keyvault.go index b03ecafb5..72979937a 100644 --- a/pkg/core/ssl-manager/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/ssl-manager/providers/azure-keyvault/azure_keyvault.go @@ -124,7 +124,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - if !xcert.EqualCertificate(certX509, oldCertX509) { + if !xcert.EqualCertificates(certX509, oldCertX509) { continue } } diff --git a/pkg/core/ssl-manager/providers/baiducloud-cert/baiducloud_cert.go b/pkg/core/ssl-manager/providers/baiducloud-cert/baiducloud_cert.go index 5c9bbde3f..3fe0c6893 100644 --- a/pkg/core/ssl-manager/providers/baiducloud-cert/baiducloud_cert.go +++ b/pkg/core/ssl-manager/providers/baiducloud-cert/baiducloud_cert.go @@ -95,7 +95,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey if err != nil { continue } - if !xcert.EqualCertificate(certX509, oldCertX509) { + if !xcert.EqualCertificates(certX509, oldCertX509) { continue } } diff --git a/pkg/core/ssl-manager/providers/ctcccloud-ao/ctcccloud_ao.go b/pkg/core/ssl-manager/providers/ctcccloud-ao/ctcccloud_ao.go index be382a0e4..30f6ef948 100644 --- a/pkg/core/ssl-manager/providers/ctcccloud-ao/ctcccloud_ao.go +++ b/pkg/core/ssl-manager/providers/ctcccloud-ao/ctcccloud_ao.go @@ -123,7 +123,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/ctcccloud-cdn/ctcccloud_cdn.go b/pkg/core/ssl-manager/providers/ctcccloud-cdn/ctcccloud_cdn.go index 48b5a0399..6bc4f1dfe 100644 --- a/pkg/core/ssl-manager/providers/ctcccloud-cdn/ctcccloud_cdn.go +++ b/pkg/core/ssl-manager/providers/ctcccloud-cdn/ctcccloud_cdn.go @@ -123,7 +123,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/ctcccloud-elb/ctcccloud_elb.go b/pkg/core/ssl-manager/providers/ctcccloud-elb/ctcccloud_elb.go index f048e6f66..43104d002 100644 --- a/pkg/core/ssl-manager/providers/ctcccloud-elb/ctcccloud_elb.go +++ b/pkg/core/ssl-manager/providers/ctcccloud-elb/ctcccloud_elb.go @@ -84,7 +84,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/ctcccloud-icdn/ctcccloud_icdn.go b/pkg/core/ssl-manager/providers/ctcccloud-icdn/ctcccloud_icdn.go index 878172165..d42d1be56 100644 --- a/pkg/core/ssl-manager/providers/ctcccloud-icdn/ctcccloud_icdn.go +++ b/pkg/core/ssl-manager/providers/ctcccloud-icdn/ctcccloud_icdn.go @@ -123,7 +123,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/ctcccloud-lvdn/ctcccloud_lvdn.go b/pkg/core/ssl-manager/providers/ctcccloud-lvdn/ctcccloud_lvdn.go index ae7cc31ec..94faf178a 100644 --- a/pkg/core/ssl-manager/providers/ctcccloud-lvdn/ctcccloud_lvdn.go +++ b/pkg/core/ssl-manager/providers/ctcccloud-lvdn/ctcccloud_lvdn.go @@ -123,7 +123,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/ssl-manager/providers/huaweicloud-elb/huaweicloud_elb.go index 29b33c805..bc9e24362 100644 --- a/pkg/core/ssl-manager/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/ssl-manager/providers/huaweicloud-elb/huaweicloud_elb.go @@ -105,7 +105,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/huaweicloud-scm/huaweicloud_scm.go b/pkg/core/ssl-manager/providers/huaweicloud-scm/huaweicloud_scm.go index b9c1a02b0..6f17d27a5 100644 --- a/pkg/core/ssl-manager/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/pkg/core/ssl-manager/providers/huaweicloud-scm/huaweicloud_scm.go @@ -127,7 +127,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/ssl-manager/providers/huaweicloud-waf/huaweicloud_waf.go index 4ae36ac29..4daa7d369 100644 --- a/pkg/core/ssl-manager/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/ssl-manager/providers/huaweicloud-waf/huaweicloud_waf.go @@ -116,7 +116,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/core/ssl-manager/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/ssl-manager/providers/rainyun-sslcenter/rainyun_sslcenter.go index 50aa64daa..82b9c9a40 100644 --- a/pkg/core/ssl-manager/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/ssl-manager/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -141,7 +141,7 @@ func (m *SSLManagerProvider) findCertIfExists(ctx context.Context, certPEM strin continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } } diff --git a/pkg/core/ssl-manager/providers/volcengine-live/volcengine_live.go b/pkg/core/ssl-manager/providers/volcengine-live/volcengine_live.go index 2f06683a6..baf7e0c48 100644 --- a/pkg/core/ssl-manager/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/ssl-manager/providers/volcengine-live/volcengine_live.go @@ -92,7 +92,7 @@ func (m *SSLManagerProvider) Upload(ctx context.Context, certPEM string, privkey continue } - isSameCert = xcert.EqualCertificate(certX509, oldCertX509) + isSameCert = xcert.EqualCertificates(certX509, oldCertX509) } // 如果已存在相同证书,直接返回 diff --git a/pkg/utils/cert/common.go b/pkg/utils/cert/common.go index bdc863673..fbae63019 100644 --- a/pkg/utils/cert/common.go +++ b/pkg/utils/cert/common.go @@ -14,7 +14,7 @@ import ( // // 出参: // - 是否相同。 -func EqualCertificate(a, b *x509.Certificate) bool { +func EqualCertificates(a, b *x509.Certificate) bool { if a == nil || b == nil { return false }