diff --git a/pkg/core/certmgr/provider.go b/pkg/core/certmgr/provider.go index bebdcd782..c571965e6 100644 --- a/pkg/core/certmgr/provider.go +++ b/pkg/core/certmgr/provider.go @@ -37,17 +37,16 @@ type Provider interface { // 出参: // - res:操作结果。 // - err: 错误。 - Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (_res *OperateResult, _err error) + Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (_res *ReplaceResult, _err error) } // 表示 SSL 证书管理操作结果的数据结构。 -type OperateResult struct { +type ReplaceResult struct { ExtendedData map[string]any `json:"extendedData,omitempty"` } // 表示 SSL 证书管理上传结果的数据结构,包含上传后的证书 ID、名称和其他数据。 type UploadResult struct { - OperateResult CertId string `json:"certId,omitempty"` CertName string `json:"certName,omitempty"` ExtendedData map[string]any `json:"extendedData,omitempty"` diff --git a/pkg/core/certmgr/providers/1panel/1panel.go b/pkg/core/certmgr/providers/1panel/1panel.go index 2fb539784..69dff99d3 100644 --- a/pkg/core/certmgr/providers/1panel/1panel.go +++ b/pkg/core/certmgr/providers/1panel/1panel.go @@ -119,7 +119,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { sslId, err := strconv.ParseInt(certIdOrName, 10, 64) if err != nil { return nil, err @@ -178,7 +178,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri panic("unreachable") } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, bool, error) { diff --git a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go index 95f316b35..020b3703d 100644 --- a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go +++ b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go @@ -182,7 +182,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go index a2b1cc374..967f98461 100644 --- a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go +++ b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go @@ -144,7 +144,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/aws-acm/aws_acm.go b/pkg/core/certmgr/providers/aws-acm/aws_acm.go index 8841c1c7f..afa80f94b 100644 --- a/pkg/core/certmgr/providers/aws-acm/aws_acm.go +++ b/pkg/core/certmgr/providers/aws-acm/aws_acm.go @@ -150,7 +150,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -171,7 +171,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'acm.ImportCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*awsacm.Client, error) { diff --git a/pkg/core/certmgr/providers/aws-iam/aws_iam.go b/pkg/core/certmgr/providers/aws-iam/aws_iam.go index e921d4e13..1dd6be99c 100644 --- a/pkg/core/certmgr/providers/aws-iam/aws_iam.go +++ b/pkg/core/certmgr/providers/aws-iam/aws_iam.go @@ -163,7 +163,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go index dad6e8364..2a1572651 100644 --- a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go @@ -167,7 +167,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -192,7 +192,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri } else { // 如果已存在相同证书,直接返回 if xcert.EqualCertificatesFromPEM(certPEM, string(getCertificateResp.CER)) { - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } } @@ -216,7 +216,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } const ( diff --git a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go index 150aed7cf..cc81689cb 100644 --- a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go +++ b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go @@ -122,7 +122,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go b/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go index 28257967b..43a8de7c0 100644 --- a/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go +++ b/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go @@ -88,7 +88,7 @@ func (d *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { // 替换证书 // REF: https://portal.baishancloud.com/track/document/downloadPdf/1441 uploadDomainCertificateReq := &baishansdk.UploadDomainCertificateRequest{ @@ -103,7 +103,7 @@ func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'baishan.UploadDomainCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(apiToken string) (*baishansdk.Client, error) { diff --git a/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go b/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go index 77e4cd67e..61676647b 100644 --- a/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go +++ b/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go @@ -135,6 +135,6 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go b/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go index 0e77484c2..f22ac847c 100644 --- a/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go +++ b/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go @@ -158,7 +158,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go b/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go index d44bef81a..721bc4bef 100644 --- a/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go +++ b/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go @@ -158,7 +158,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go index 921fb8ca0..422ea2800 100644 --- a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go +++ b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go @@ -110,7 +110,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go b/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go index bd2feb3dd..e2660dda4 100644 --- a/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go +++ b/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go @@ -105,7 +105,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go b/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go index 89810243c..df44c259d 100644 --- a/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go +++ b/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go @@ -158,7 +158,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go b/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go index 75acc299a..1b5089ec4 100644 --- a/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go +++ b/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go @@ -158,7 +158,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/dogecloud/dogecloud.go b/pkg/core/certmgr/providers/dogecloud/dogecloud.go index 629f7d1fa..93d738c26 100644 --- a/pkg/core/certmgr/providers/dogecloud/dogecloud.go +++ b/pkg/core/certmgr/providers/dogecloud/dogecloud.go @@ -73,7 +73,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/dokploy/dokploy.go b/pkg/core/certmgr/providers/dokploy/dokploy.go index 40ff870ec..d561ff249 100644 --- a/pkg/core/certmgr/providers/dokploy/dokploy.go +++ b/pkg/core/certmgr/providers/dokploy/dokploy.go @@ -105,7 +105,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go index 8eac690b6..31dbc8328 100644 --- a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go +++ b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go @@ -73,7 +73,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go index b0134a5b2..9b48e6c9f 100644 --- a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go @@ -143,7 +143,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { // 更新证书 // REF: https://support.huaweicloud.com/api-elb/UpdateCertificate.html updateCertificateReq := &hwelbmodel.UpdateCertificateRequest{ @@ -161,7 +161,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'elb.UpdateCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwelb.ElbClient, error) { diff --git a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go index 9b98c8e3a..aa8cd7b67 100644 --- a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go @@ -165,7 +165,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go index a41a653b2..777bd808f 100644 --- a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go @@ -145,7 +145,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go index fca77304d..53a2b1318 100644 --- a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go @@ -152,7 +152,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go index 0ab89c40a..64798d0e3 100644 --- a/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go @@ -122,7 +122,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { certId, err := strconv.ParseInt(certIdOrName, 10, 64) if err != nil { return nil, err @@ -148,7 +148,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'nginx.UploadCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(serverUrl, authMethod, username, password, apiToken string, skipTlsVerify bool) (*npmsdk.Client, error) { diff --git a/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go b/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go index f21ac8880..c3e36ed86 100644 --- a/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go @@ -145,7 +145,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go index 2ff7ddcae..401789317 100644 --- a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -83,7 +83,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { certId, err := strconv.ParseInt(certIdOrName, 10, 64) if err != nil { return nil, err @@ -101,7 +101,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'sslcenter.Update': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*certmgr.UploadResult, bool, error) { diff --git a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go index 8f282c7ed..c387cf79b 100644 --- a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -72,7 +72,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go index 11687a17c..ad6766c4a 100644 --- a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go +++ b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go @@ -94,7 +94,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go index 461630253..a53fb76ba 100644 --- a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go +++ b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go @@ -93,7 +93,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go index c9f57f902..7d209db71 100644 --- a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go +++ b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go @@ -104,7 +104,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go b/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go index 15c5ee79e..e1bdf6a4c 100644 --- a/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go +++ b/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go @@ -66,7 +66,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go index bc2271ce0..d66e00a98 100644 --- a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go @@ -138,7 +138,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go index 1d826649a..5f2e41bf6 100644 --- a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go @@ -87,7 +87,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go b/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go index 443d72bab..91d6d5d2f 100644 --- a/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go @@ -112,6 +112,6 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { return nil, certmgr.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go b/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go index c98d339fb..9171a9939 100644 --- a/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go +++ b/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go @@ -125,7 +125,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { certId := certIdOrName certName := fmt.Sprintf("certimate_%d", time.Now().UnixMilli()) @@ -143,7 +143,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'certificatemanagement.UpdateCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret string) (*wangsusdk.Client, error) { diff --git a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go index ed64cfbf8..e4b5ef5b0 100644 --- a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go @@ -172,7 +172,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { // 更新证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/cdn/certificate/modifycertificate modifyCertificateReq := zcdnsdk.NewModifyCertificateRequest() @@ -185,7 +185,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'cdn.ModifyCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(accessKeyId, accessKeyPassword string) (*zcdnsdk.Client, error) { diff --git a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go index 557879c21..662b38e59 100644 --- a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go @@ -172,7 +172,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { // 更新证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/certificate/modifycertificate modifyCertificateReq := zgasdk.NewModifyCertificateRequest() @@ -185,7 +185,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'zga.ModifyCertificate': %w", err) } - return &certmgr.OperateResult{}, nil + return &certmgr.ReplaceResult{}, nil } func createSDKClient(accessKeyId, accessKeyPassword string) (*zgasdk.Client, error) { diff --git a/pkg/core/deployer/providers/1panel/1panel.go b/pkg/core/deployer/providers/1panel/1panel.go index c72405986..a884ef770 100644 --- a/pkg/core/deployer/providers/1panel/1panel.go +++ b/pkg/core/deployer/providers/1panel/1panel.go @@ -182,11 +182,11 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM } // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, strconv.FormatInt(d.config.CertificateId, 10), certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, strconv.FormatInt(d.config.CertificateId, 10), certPEM, privkeyPEM) if err != nil { return fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } return nil diff --git a/pkg/core/deployer/providers/aws-acm/aws_acm.go b/pkg/core/deployer/providers/aws-acm/aws_acm.go index 075d7260f..85ae5db1e 100644 --- a/pkg/core/deployer/providers/aws-acm/aws_acm.go +++ b/pkg/core/deployer/providers/aws-acm/aws_acm.go @@ -72,11 +72,11 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } else { // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateArn, certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateArn, certPEM, privkeyPEM) if err != nil { return nil, fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } } diff --git a/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go b/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go index 5d7cd6f83..429d202c3 100644 --- a/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go @@ -78,11 +78,11 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } else { // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateName, certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateName, certPEM, privkeyPEM) if err != nil { return nil, fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } } diff --git a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index b8a60de03..ed6fe43be 100644 --- a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -146,11 +146,11 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM } // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) if err != nil { return fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } return nil diff --git a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 1e02a54b5..20d660ef0 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -234,11 +234,11 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM } // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) if err != nil { return fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } return nil diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go index 58144822f..f1269f972 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go @@ -220,11 +220,11 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM } // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, strconv.FormatInt(d.config.CertificateId, 10), certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, strconv.FormatInt(d.config.CertificateId, 10), certPEM, privkeyPEM) if err != nil { return fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } // 获取默认站点 diff --git a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go index 72202f9a0..25aabe786 100644 --- a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -67,11 +67,11 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } else { // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, strconv.FormatInt(d.config.CertificateId, 10), certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, strconv.FormatInt(d.config.CertificateId, 10), certPEM, privkeyPEM) if err != nil { return nil, fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } } diff --git a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go index 631821748..e8731f209 100644 --- a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go +++ b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go @@ -75,11 +75,11 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } else { // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) if err != nil { return nil, fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } } diff --git a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go index 4f08f378e..e5b184545 100644 --- a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go @@ -222,11 +222,11 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM } // 替换证书 - opres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) + rplres, err := d.sdkCertmgr.Replace(ctx, d.config.CertificateId, certPEM, privkeyPEM) if err != nil { return fmt.Errorf("failed to replace certificate file: %w", err) } else { - d.logger.Info("ssl certificate replaced", slog.Any("result", opres)) + d.logger.Info("ssl certificate replaced", slog.Any("result", rplres)) } return nil