opensource/certimate
3
0
Fork 0
mirror of https://github.com/certimate-go/certimate.git synced 2026-09-24 23:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: normalize sdk requests logging

Browse Source
This commit is contained in:
Fu Diwei
2026-05-20 11:45:37 +08:00
committed by RHQYZ
parent c951f03760
commit f9e23960f6
31 changed files with 143 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/core/certmgr/errors.go
+3 -4
View File
@@ -1,11 +1,10 @@
package certmgr
import (
"errors"
"fmt"
"github.com/certimate-go/certimate/pkg/core"
)
var (
ErrNotImplemented = fmt.Errorf("not implemented function")
ErrUnsupported = errors.ErrUnsupported
ErrNotImplemented = core.ErrNotImplemented
ErrUnsupported = core.ErrUnsupported
)
pkg/core/certmgr/providers/1panel/1panel.go
+16 -16
View File
@@ -84,9 +84,9 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert
PrivateKey: privkeyPEM,
}
websiteSSLUploadResp, err := sdkClient.WebsiteSSLUploadWithContext(ctx, websiteSSLUploadReq)
c.logger.Debug("sdk request '1panel.WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
c.logger.Debug("sdk request 'WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLUpload': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLUpload': %w", err)
}
}
@@ -99,9 +99,9 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert
PrivateKey: privkeyPEM,
}
websiteSSLUploadResp, err := sdkClient.WebsiteSSLUploadWithContext(ctx, websiteSSLUploadReq)
c.logger.Debug("sdk request '1panel.WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
c.logger.Debug("sdk request 'WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLUpload': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLUpload': %w", err)
}
}
@@ -130,9 +130,9 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri
{
// 获取证书详情
websiteSSLGetResp, err := sdkClient.WebsiteSSLGetWithContext(ctx, sslId)
c.logger.Debug("sdk request '1panel.WebsiteSSLGet'", slog.Int64("sslId", sslId), slog.Any("response", websiteSSLGetResp))
c.logger.Debug("sdk request 'WebsiteSSLGet'", slog.Int64("sslId", sslId), slog.Any("response", websiteSSLGetResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLGet': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLGet': %w", err)
}
// 更新证书
@@ -144,9 +144,9 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri
PrivateKey: privkeyPEM,
}
websiteSSLUploadResp, err := sdkClient.WebsiteSSLUploadWithContext(ctx, websiteSSLUploadReq)
c.logger.Debug("sdk request '1panel.WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
c.logger.Debug("sdk request 'WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLUpload': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLUpload': %w", err)
}
}
@@ -154,9 +154,9 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri
{
// 获取证书详情
websiteSSLGetResp, err := sdkClient.WebsiteSSLGetWithContext(ctx, sslId)
c.logger.Debug("sdk request '1panel.WebsiteSSLGet'", slog.Any("sslId", sslId), slog.Any("response", websiteSSLGetResp))
c.logger.Debug("sdk request 'WebsiteSSLGet'", slog.Any("sslId", sslId), slog.Any("response", websiteSSLGetResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLGet': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLGet': %w", err)
}
// 更新证书
@@ -168,9 +168,9 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri
PrivateKey: privkeyPEM,
}
websiteSSLUploadResp, err := sdkClient.WebsiteSSLUploadWithContext(ctx, websiteSSLUploadReq)
c.logger.Debug("sdk request '1panel.WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
c.logger.Debug("sdk request 'WebsiteSSLUpload'", slog.Any("request", websiteSSLUploadReq), slog.Any("response", websiteSSLUploadResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLUpload': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSSLUpload': %w", err)
}
}
@@ -199,9 +199,9 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkey
PageSize: int32(searchWebsiteSSLPageSize),
}
websiteSSLSearchResp, err := sdkClient.WebsiteSSLSearchWithContext(ctx, websiteSSLSearchReq)
c.logger.Debug("sdk request '1panel.WebsiteSSLSearch'", slog.Any("request", websiteSSLSearchReq), slog.Any("response", websiteSSLSearchResp))
c.logger.Debug("sdk request 'WebsiteSSLSearch'", slog.Any("request", websiteSSLSearchReq), slog.Any("response", websiteSSLSearchResp))
if err != nil {
return nil, false, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLSearch': %w", err)
return nil, false, fmt.Errorf("failed to execute sdk request 'WebsiteSSLSearch': %w", err)
}
if websiteSSLSearchResp.Data == nil {
@@ -248,9 +248,9 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkey
PageSize: int32(searchWebsiteSSLPageSize),
}
websiteSSLSearchResp, err := sdkClient.WebsiteSSLSearchWithContext(ctx, websiteSSLSearchReq)
c.logger.Debug("sdk request '1panel.WebsiteSSLSearch'", slog.Any("request", websiteSSLSearchReq), slog.Any("response", websiteSSLSearchResp))
c.logger.Debug("sdk request 'WebsiteSSLSearch'", slog.Any("request", websiteSSLSearchReq), slog.Any("response", websiteSSLSearchResp))
if err != nil {
return nil, false, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSSLSearch': %w", err)
return nil, false, fmt.Errorf("failed to execute sdk request 'WebsiteSSLSearch': %w", err)
}
if websiteSSLSearchResp.Data == nil {
pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go
+4 -4
View File
@@ -65,7 +65,7 @@ func (d *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert
Key: lo.ToPtr(privkeyPEM),
}
uploadDomainCertificateResp, err := d.sdkClient.UploadDomainCertificateWithContext(ctx, uploadDomainCertificateReq)
d.logger.Debug("sdk request 'baishan.UploadDomainCertificate'", slog.Any("request", uploadDomainCertificateReq), slog.Any("response", uploadDomainCertificateResp))
d.logger.Debug("sdk request 'cdn.UploadDomainCertificate'", slog.Any("request", uploadDomainCertificateReq), slog.Any("response", uploadDomainCertificateResp))
if err != nil {
if uploadDomainCertificateResp != nil {
if uploadDomainCertificateResp.GetCode() == 400699 && strings.Contains(uploadDomainCertificateResp.GetMessage(), "this certificate is exists") {
@@ -76,7 +76,7 @@ func (d *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert
}
if certId == "" {
return nil, fmt.Errorf("failed to execute sdk request 'baishan.SetDomainCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'cdn.SetDomainCertificate': %w", err)
}
} else {
certId = uploadDomainCertificateResp.Data.CertId.String()
@@ -98,9 +98,9 @@ func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri
Key: lo.ToPtr(privkeyPEM),
}
uploadDomainCertificateResp, err := d.sdkClient.UploadDomainCertificateWithContext(ctx, uploadDomainCertificateReq)
d.logger.Debug("sdk request 'baishan.UploadDomainCertificate'", slog.Any("request", uploadDomainCertificateReq), slog.Any("response", uploadDomainCertificateResp))
d.logger.Debug("sdk request 'cdn.UploadDomainCertificate'", slog.Any("request", uploadDomainCertificateReq), slog.Any("response", uploadDomainCertificateResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'baishan.UploadDomainCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'cdn.UploadDomainCertificate': %w", err)
}
return &certmgr.ReplaceResult{}, nil
pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go
+2 -2
View File
@@ -65,9 +65,9 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert
Repeatable: ve.Bool(false),
}
importCertificateResp, err := c.sdkClient.ImportCertificateWithContext(ctx, importCertificateReq)
c.logger.Debug("sdk request 'certcenter.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp))
c.logger.Debug("sdk request 'certificateservice.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'certcenter.ImportCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'certificateservice.ImportCertificate': %w", err)
}
var sslId string
pkg/core/deployer/providers/1panel-console/1panel_console.go
+4 -4
View File
@@ -72,9 +72,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
AutoRestart: strconv.FormatBool(d.config.AutoRestart),
}
settingsSSLUpdateResp, err := sdkClient.SettingsSSLUpdateWithContext(ctx, settingsSSLUpdateReq)
d.logger.Debug("sdk request '1panel.SettingsSSLUpdate'", slog.Any("request", settingsSSLUpdateReq), slog.Any("response", settingsSSLUpdateResp))
d.logger.Debug("sdk request 'SettingsSSLUpdate'", slog.Any("request", settingsSSLUpdateReq), slog.Any("response", settingsSSLUpdateResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.SettingsSSLUpdate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'SettingsSSLUpdate': %w", err)
}
}
@@ -88,9 +88,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
AutoRestart: strconv.FormatBool(d.config.AutoRestart),
}
coreSettingsSSLUpdateResp, err := sdkClient.CoreSettingsSSLUpdateWithContext(ctx, coreSettingsSSLUpdateReq)
d.logger.Debug("sdk request '1panel.CoreSettingsSSLUpdate'", slog.Any("request", coreSettingsSSLUpdateReq), slog.Any("response", coreSettingsSSLUpdateResp))
d.logger.Debug("sdk request 'CoreSettingsSSLUpdate'", slog.Any("request", coreSettingsSSLUpdateReq), slog.Any("response", coreSettingsSSLUpdateResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.CoreSettingsSSLUpdate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'CoreSettingsSSLUpdate': %w", err)
}
}
pkg/core/deployer/providers/1panel/1panel.go
+16 -16
View File
@@ -213,9 +213,9 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE
PageSize: int32(websiteSearchPageSize),
}
websiteSearchResp, err := sdkClient.WebsiteSearchWithContext(ctx, websiteSearchReq)
d.logger.Debug("sdk request '1panel.WebsiteSearch'", slog.Any("request", websiteSearchReq), slog.Any("response", websiteSearchResp))
d.logger.Debug("sdk request 'WebsiteSearch'", slog.Any("request", websiteSearchReq), slog.Any("response", websiteSearchResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSearch': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSearch': %w", err)
}
if websiteSearchResp.Data == nil {
@@ -228,9 +228,9 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE
}
websiteGetResp, err := sdkClient.WebsiteGetWithContext(ctx, websiteItem.ID)
d.logger.Debug("sdk request '1panel.WebsiteGet'", slog.Int64("websiteId", websiteItem.ID), slog.Any("response", websiteGetResp))
d.logger.Debug("sdk request 'WebsiteGet'", slog.Int64("websiteId", websiteItem.ID), slog.Any("response", websiteGetResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteGet': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteGet': %w", err)
}
for _, domainInfo := range websiteGetResp.Data.Domains {
@@ -267,9 +267,9 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE
PageSize: int32(websiteSearchPageSize),
}
websiteSearchResp, err := sdkClient.WebsiteSearchWithContext(ctx, websiteSearchReq)
d.logger.Debug("sdk request '1panel.WebsiteSearch'", slog.Any("request", websiteSearchReq), slog.Any("response", websiteSearchResp))
d.logger.Debug("sdk request 'WebsiteSearch'", slog.Any("request", websiteSearchReq), slog.Any("response", websiteSearchResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteSearch': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteSearch': %w", err)
}
if websiteSearchResp.Data == nil {
@@ -282,9 +282,9 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE
}
websiteGetResp, err := sdkClient.WebsiteGetWithContext(ctx, websiteItem.ID)
d.logger.Debug("sdk request '1panel.WebsiteGet'", slog.Int64("websiteId", websiteItem.ID), slog.Any("response", websiteGetResp))
d.logger.Debug("sdk request 'WebsiteGet'", slog.Int64("websiteId", websiteItem.ID), slog.Any("response", websiteGetResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request '1panel.WebsiteGet': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'WebsiteGet': %w", err)
}
for _, domainInfo := range websiteGetResp.Data.Domains {
@@ -320,9 +320,9 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64
{
// 获取网站 HTTPS 配置
websiteHttpsGetResp, err := sdkClient.WebsiteHttpsGetWithContext(ctx, websiteId)
d.logger.Debug("sdk request '1panel.WebsiteHttpsGet'", slog.Int64("websiteId", websiteId), slog.Any("response", websiteHttpsGetResp))
d.logger.Debug("sdk request 'WebsiteHttpsGet'", slog.Int64("websiteId", websiteId), slog.Any("response", websiteHttpsGetResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request '1panel.WebsiteHttpsGet': %w", err)
return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsGet': %w", err)
} else {
if websiteHttpsGetResp.Data.Enable && websiteHttpsGetResp.Data.WebsiteSSLID == websiteSSLId {
return nil
@@ -344,9 +344,9 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64
websiteHttpsPostReq.HttpConfig = "HTTPToHTTPS"
}
websiteHttpsPostResp, err := sdkClient.WebsiteHttpsPostWithContext(ctx, websiteId, websiteHttpsPostReq)
d.logger.Debug("sdk request '1panel.WebsiteHttpsPost'", slog.Int64("websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp))
d.logger.Debug("sdk request 'WebsiteHttpsPost'", slog.Int64("websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request '1panel.WebsiteHttpsPost': %w", err)
return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsPost': %w", err)
}
}
@@ -354,9 +354,9 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64
{
// 获取网站 HTTPS 配置
websiteHttpsGetResp, err := sdkClient.WebsiteHttpsGetWithContext(ctx, websiteId)
d.logger.Debug("sdk request '1panel.WebsiteHttpsGet'", slog.Int64("websiteId", websiteId), slog.Any("response", websiteHttpsGetResp))
d.logger.Debug("sdk request 'WebsiteHttpsGet'", slog.Int64("websiteId", websiteId), slog.Any("response", websiteHttpsGetResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request '1panel.WebsiteHttpsGet': %w", err)
return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsGet': %w", err)
} else {
if websiteHttpsGetResp.Data.Enable && websiteHttpsGetResp.Data.WebsiteSSLID == websiteSSLId {
return nil
@@ -379,9 +379,9 @@ func (d *Deployer) updateWebsiteCertificate(ctx context.Context, websiteId int64
websiteHttpsPostReq.HttpConfig = "HTTPToHTTPS"
}
websiteHttpsPostResp, err := sdkClient.WebsiteHttpsPostWithContext(ctx, websiteId, websiteHttpsPostReq)
d.logger.Debug("sdk request '1panel.WebsiteHttpsPost'", slog.Int64("websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp))
d.logger.Debug("sdk request 'WebsiteHttpsPost'", slog.Int64("websiteId", websiteId), slog.Any("request", websiteHttpsPostReq), slog.Any("response", websiteHttpsPostResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request '1panel.WebsiteHttpsPost': %w", err)
return fmt.Errorf("failed to execute sdk request 'WebsiteHttpsPost': %w", err)
}
}
pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go
+4 -4
View File
@@ -183,9 +183,9 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) {
ResourceGroupId: lo.EmptyableToPtr(d.config.ResourceGroupId),
}
describeDomainsResp, err := d.sdkClient.DescribeDomainsWithContext(ctx, describeDomainsReq, &dara.RuntimeOptions{})
d.logger.Debug("sdk request 'aliddoscoo.DescribeLiveUserDomains'", slog.Any("request", describeDomainsReq), slog.Any("response", describeDomainsResp))
d.logger.Debug("sdk request 'ddoscoo.DescribeLiveUserDomains'", slog.Any("request", describeDomainsReq), slog.Any("response", describeDomainsResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'aliddoscoo.DescribeDomains': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'ddoscoo.DescribeDomains': %w", err)
}
for _, domain := range describeDomainsResp.Body.Domains {
@@ -203,9 +203,9 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c
CertIdentifier: tea.String(cloudCertId),
}
associateWebCertResp, err := d.sdkClient.AssociateWebCertWithContext(ctx, associateWebCertReq, &dara.RuntimeOptions{})
d.logger.Debug("sdk request 'dcdn.AssociateWebCert'", slog.Any("request", associateWebCertReq), slog.Any("response", associateWebCertResp))
d.logger.Debug("sdk request 'ddoscoo.AssociateWebCert'", slog.Any("request", associateWebCertReq), slog.Any("response", associateWebCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'dcdn.AssociateWebCert': %w", err)
return fmt.Errorf("failed to execute sdk request 'ddoscoo.AssociateWebCert': %w", err)
}
return nil
pkg/core/deployer/providers/apisix/apisix.go
+2 -2
View File
@@ -97,9 +97,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
Status: lo.ToPtr(int32(1)),
}
sslUpdateResp, err := d.sdkClient.SslUpdateWithContext(ctx, d.config.CertificateId, sslUpdateReq)
d.logger.Debug("sdk request 'apisix.SslUpdate'", slog.Any("request", sslUpdateReq), slog.Any("response", sslUpdateResp))
d.logger.Debug("sdk request 'SslUpdate'", slog.Any("request", sslUpdateReq), slog.Any("response", sslUpdateResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'apisix.SslUpdate': %w", err)
return fmt.Errorf("failed to execute sdk request 'SslUpdate': %w", err)
}
return nil
pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go
+4 -4
View File
@@ -111,9 +111,9 @@ func (d *Deployer) deployToDomain(ctx context.Context, certPEM, privkeyPEM strin
Config: lo.ToPtr([]string{"https"}),
}
getDomainConfigResp, err := d.sdkClient.GetDomainConfigWithContext(ctx, getDomainConfigReq)
d.logger.Debug("sdk request 'baishan.GetDomainConfig'", slog.Any("request", getDomainConfigReq), slog.Any("response", getDomainConfigResp))
d.logger.Debug("sdk request 'cdn.GetDomainConfig'", slog.Any("request", getDomainConfigReq), slog.Any("response", getDomainConfigResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'baishan.GetDomainConfig': %w", err)
return fmt.Errorf("failed to execute sdk request 'cdn.GetDomainConfig': %w", err)
} else if len(getDomainConfigResp.Data) == 0 {
return fmt.Errorf("could not find domain '%s'", d.config.Domain)
}
@@ -132,9 +132,9 @@ func (d *Deployer) deployToDomain(ctx context.Context, certPEM, privkeyPEM strin
},
}
setDomainConfigResp, err := d.sdkClient.SetDomainConfigWithContext(ctx, setDomainConfigReq)
d.logger.Debug("sdk request 'baishan.SetDomainConfig'", slog.Any("request", setDomainConfigReq), slog.Any("response", setDomainConfigResp))
d.logger.Debug("sdk request 'cdn.SetDomainConfig'", slog.Any("request", setDomainConfigReq), slog.Any("response", setDomainConfigResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'baishan.SetDomainConfig': %w", err)
return fmt.Errorf("failed to execute sdk request 'cdn.SetDomainConfig': %w", err)
}
return nil
pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go
+3 -3
View File
@@ -61,9 +61,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
Certificate: certPEM,
}
configSavePanelSSLResp, err := d.sdkClient.ConfigSavePanelSSLWithContext(ctx, configSavePanelSSLReq)
d.logger.Debug("sdk request 'bt.ConfigSavePanelSSL'", slog.Any("request", configSavePanelSSLReq), slog.Any("response", configSavePanelSSLResp))
d.logger.Debug("sdk request 'config.SavePanelSSL'", slog.Any("request", configSavePanelSSLReq), slog.Any("response", configSavePanelSSLResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.ConfigSavePanelSSL': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'config.SavePanelSSL': %w", err)
}
if d.config.AutoRestart {
@@ -73,7 +73,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
Type: "restart",
}
systemServiceAdminResp, _ := d.sdkClient.SystemServiceAdminWithContext(ctx, systemServiceAdminReq)
d.logger.Debug("sdk request 'bt.SystemServiceAdmin'", slog.Any("request", systemServiceAdminReq), slog.Any("response", systemServiceAdminResp))
d.logger.Debug("sdk request 'system.ServiceAdmin'", slog.Any("request", systemServiceAdminReq), slog.Any("response", systemServiceAdminResp))
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/baotapanel/baotapanel.go
+8 -8
View File
@@ -77,9 +77,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
PrivateKey: privkeyPEM,
}
sslCertSaveCertResp, err := d.sdkClient.SSLCertSaveCertWithContext(ctx, sslCertSaveCertReq)
d.logger.Debug("sdk request 'bt.SSLCertSaveCert'", slog.Any("request", sslCertSaveCertReq), slog.Any("response", sslCertSaveCertResp))
d.logger.Debug("sdk request 'ssl.cert.SaveCert'", slog.Any("request", sslCertSaveCertReq), slog.Any("response", sslCertSaveCertResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.SSLCertSaveCert': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'ssl.cert.SaveCert': %w", err)
}
// 设置站点证书
@@ -92,9 +92,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
}),
}
sslSetBatchCertToSiteResp, err := d.sdkClient.SSLSetBatchCertToSiteWithContext(ctx, sslSetBatchCertToSiteReq)
d.logger.Debug("sdk request 'bt.SSLSetBatchCertToSite'", slog.Any("request", sslSetBatchCertToSiteReq), slog.Any("response", sslSetBatchCertToSiteResp))
d.logger.Debug("sdk request 'ssl.SetBatchCertToSite'", slog.Any("request", sslSetBatchCertToSiteReq), slog.Any("response", sslSetBatchCertToSiteResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.SSLSetBatchCertToSite': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'ssl.SetBatchCertToSite': %w", err)
}
}
@@ -140,9 +140,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName
PrivateKey: privkeyPEM,
}
modProxyComSetSSLResp, err := d.sdkClient.ModProxyComSetSSLWithContext(ctx, modProxyComSetSSLReq)
d.logger.Debug("sdk request 'bt.ModProxyComSetSSL'", slog.Any("request", modProxyComSetSSLReq), slog.Any("response", modProxyComSetSSLResp))
d.logger.Debug("sdk request 'mod.proxy.com.SetSSL'", slog.Any("request", modProxyComSetSSLReq), slog.Any("response", modProxyComSetSSLResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.ModProxyComSetSSL': %w", err)
return fmt.Errorf("failed to execute sdk request 'mod.proxy.com.SetSSL': %w", err)
}
}
@@ -156,9 +156,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName
PrivateKey: privkeyPEM,
}
siteSetSSLResp, err := d.sdkClient.SiteSetSSLWithContext(ctx, siteSetSSLReq)
d.logger.Debug("sdk request 'bt.SiteSetSSL'", slog.Any("request", siteSetSSLReq), slog.Any("response", siteSetSSLResp))
d.logger.Debug("sdk request 'site.SetSSL'", slog.Any("request", siteSetSSLReq), slog.Any("response", siteSetSSLResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.SiteSetSSL': %w", err)
return fmt.Errorf("failed to execute sdk request 'site.SetSSL': %w", err)
}
}
}
pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console.go
+2 -2
View File
@@ -62,9 +62,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
SSLPem: lo.ToPtr(certPEM),
}
configSetPanelSSLResp, err := d.sdkClient.ConfigSetPanelSSLWithContext(ctx, configSetPanelSSLReq)
d.logger.Debug("sdk request 'bt.ConfigSetPanelSSL'", slog.Any("request", configSetPanelSSLReq), slog.Any("response", configSetPanelSSLResp))
d.logger.Debug("sdk request 'config.SetPanelSSL'", slog.Any("request", configSetPanelSSLReq), slog.Any("response", configSetPanelSSLResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.ConfigSetPanelSSL': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'config.SetPanelSSL': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go
+12 -12
View File
@@ -121,9 +121,9 @@ func (d *Deployer) findSiteByName(ctx context.Context, siteType, siteName string
Limit: lo.ToPtr(int32(datalistGetDataListLimit)),
}
datalistGetDataListResp, err := d.sdkClient.DatalistGetDataListWithContext(ctx, datalistGetDataListReq)
d.logger.Debug("sdk request 'bt.DatalistGetDataList'", slog.Any("request", datalistGetDataListReq), slog.Any("response", datalistGetDataListResp))
d.logger.Debug("sdk request 'datalist.GetDataList'", slog.Any("request", datalistGetDataListReq), slog.Any("response", datalistGetDataListResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.DatalistGetDataList': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'datalist.GetDataList': %w", err)
}
for _, siteItem := range datalistGetDataListResp.Data {
@@ -156,9 +156,9 @@ func (d *Deployer) findSiteByName(ctx context.Context, siteType, siteName string
Limit: lo.ToPtr(int32(siteGetProjectListLimit)),
}
siteGetProjectListResp, err := d.sdkClient.SiteGetProjectListWithContext(ctx, siteGetProjectListReq)
d.logger.Debug("sdk request 'bt.SiteGetProjectList'", slog.Any("request", siteGetProjectListReq), slog.Any("response", siteGetProjectListResp))
d.logger.Debug("sdk request 'site.GetProjectList'", slog.Any("request", siteGetProjectListReq), slog.Any("response", siteGetProjectListResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.SiteGetProjectList': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'site.GetProjectList': %w", err)
}
for _, siteItem := range siteGetProjectListResp.Data {
@@ -182,9 +182,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName
// 获取面板配置
panelGetConfigReq := &btsdk.PanelGetConfigRequest{}
panelGetConfigResp, err := d.sdkClient.PanelGetConfigWithContext(ctx, panelGetConfigReq)
d.logger.Debug("sdk request 'bt.PanelGetConfig'", slog.Any("request", panelGetConfigReq), slog.Any("response", panelGetConfigResp))
d.logger.Debug("sdk request 'panel.GetConfig'", slog.Any("request", panelGetConfigReq), slog.Any("response", panelGetConfigResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.PanelGetConfig': %w", err)
return fmt.Errorf("failed to execute sdk request 'panel.GetConfig': %w", err)
}
// 获取网站
@@ -217,9 +217,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName
Force: lo.ToPtr(true),
}
filesUploadResp, err := d.sdkClient.FilesUploadWithContext(ctx, filesUploadReq)
d.logger.Debug("sdk request 'bt.FilesUpload'", slog.Any("request", filesUploadReq), slog.Any("response", filesUploadResp))
d.logger.Debug("sdk request 'files.Upload'", slog.Any("request", filesUploadReq), slog.Any("response", filesUploadResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.FilesUpload': %w", err)
return fmt.Errorf("failed to execute sdk request 'files.Upload': %w", err)
}
// 服务器为 IIS，设置网站 SSL
@@ -229,9 +229,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName
Password: lo.ToPtr(certPFXPassword),
}
siteSetSitePFXSSLResp, err := d.sdkClient.SiteSetSitePFXSSLWithContext(ctx, siteSetSitePFXSSLReq)
d.logger.Debug("sdk request 'bt.SiteSetSitePFXSSL'", slog.Any("request", siteSetSitePFXSSLReq), slog.Any("response", siteSetSitePFXSSLResp))
d.logger.Debug("sdk request 'site.SetSitePFXSSL'", slog.Any("request", siteSetSitePFXSSLReq), slog.Any("response", siteSetSitePFXSSLResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.SiteSetSitePFXSSL': %w", err)
return fmt.Errorf("failed to execute sdk request 'site.SetSitePFXSSL': %w", err)
}
} else {
// 服务器非 IIS，设置网站 SSL
@@ -242,9 +242,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName
Cert: lo.ToPtr(certPEM),
}
siteSetSiteSSLResp, err := d.sdkClient.SiteSetSiteSSLWithContext(ctx, siteSetSiteSSLReq)
d.logger.Debug("sdk request 'bt.SiteSetSiteSSL'", slog.Any("request", siteSetSiteSSLReq), slog.Any("response", siteSetSiteSSLResp))
d.logger.Debug("sdk request 'site.SetSiteSSL'", slog.Any("request", siteSetSiteSSLReq), slog.Any("response", siteSetSiteSSLResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.SiteSetSiteSSL': %w", err)
return fmt.Errorf("failed to execute sdk request 'site.SetSiteSSL': %w", err)
}
}
pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go
+2 -2
View File
@@ -61,9 +61,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
KeyContent: lo.ToPtr(privkeyPEM),
}
configSetCertResp, err := d.sdkClient.ConfigSetCertWithContext(ctx, configSetCertReq)
d.logger.Debug("sdk request 'bt.ConfigSetCert'", slog.Any("request", configSetCertReq), slog.Any("response", configSetCertResp))
d.logger.Debug("sdk request 'config.SetCert'", slog.Any("request", configSetCertReq), slog.Any("response", configSetCertResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.ConfigSetCert': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'config.SetCert': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/baotawaf/baotawaf.go
+4 -4
View File
@@ -105,9 +105,9 @@ func (d *Deployer) findSiteByName(ctx context.Context, siteName string) (*btwafs
PageSize: lo.ToPtr(int32(getSiteListPageSize)),
}
getSiteListResp, err := d.sdkClient.GetSiteListWithContext(ctx, getSiteListReq)
d.logger.Debug("sdk request 'bt.GetSiteList'", slog.Any("request", getSiteListReq), slog.Any("response", getSiteListResp))
d.logger.Debug("sdk request 'wafmastersite.GetSiteList'", slog.Any("request", getSiteListReq), slog.Any("response", getSiteListResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bt.GetSiteList': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'wafmastersite.GetSiteList': %w", err)
}
if getSiteListResp.Result == nil {
@@ -155,9 +155,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteName string, s
},
}
modifySiteResp, err := d.sdkClient.ModifySiteWithContext(ctx, modifySiteReq)
d.logger.Debug("sdk request 'bt.ModifySite'", slog.Any("request", modifySiteReq), slog.Any("response", modifySiteResp))
d.logger.Debug("sdk request 'wafmastersite.ModifySite'", slog.Any("request", modifySiteReq), slog.Any("response", modifySiteResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'bt.ModifySite': %w", err)
return fmt.Errorf("failed to execute sdk request 'wafmastersite.ModifySite': %w", err)
}
return nil
pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go
+2 -2
View File
@@ -67,9 +67,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
CertificateKey: base64.StdEncoding.EncodeToString([]byte(privkeyPEM)),
}
err := d.sdkClient.AddCustomCertificateWithContext(ctx, d.config.PullZoneId, createCertificateReq)
d.logger.Debug("sdk request 'bunny.AddCustomCertificate'", slog.Any("request", createCertificateReq))
d.logger.Debug("sdk request 'cdn.AddCustomCertificate'", slog.Any("request", createCertificateReq))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'bunny.AddCustomCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCustomCertificate': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/cachefly/cachefly.go
+2 -2
View File
@@ -57,9 +57,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
CertificateKey: lo.ToPtr(privkeyPEM),
}
createCertificateResp, err := d.sdkClient.CreateCertificateWithContext(ctx, createCertificateReq)
d.logger.Debug("sdk request 'cachefly.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))
d.logger.Debug("sdk request 'CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'cachefly.CreateCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'CreateCertificate': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/cdnfly/cdnfly.go
+8 -8
View File
@@ -94,9 +94,9 @@ func (d *Deployer) deployToSite(ctx context.Context, certPEM, privkeyPEM string)
// 获取单个网站详情
// REF: https://doc.cdnfly.cn/wangzhanguanli-v1-sites.html#%E8%8E%B7%E5%8F%96%E5%8D%95%E4%B8%AA%E7%BD%91%E7%AB%99%E8%AF%A6%E6%83%85
getSiteResp, err := d.sdkClient.GetSiteWithContext(ctx, d.config.SiteId)
d.logger.Debug("sdk request 'cdnfly.GetSite'", slog.String("siteId", d.config.SiteId), slog.Any("response", getSiteResp))
d.logger.Debug("sdk request 'GetSite'", slog.String("siteId", d.config.SiteId), slog.Any("response", getSiteResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'cdnfly.GetSite': %w", err)
return fmt.Errorf("failed to execute sdk request 'GetSite': %w", err)
}
// 添加单个证书
@@ -108,9 +108,9 @@ func (d *Deployer) deployToSite(ctx context.Context, certPEM, privkeyPEM string)
Key: lo.ToPtr(privkeyPEM),
}
createCertificateResp, err := d.sdkClient.CreateCertWithContext(ctx, createCertificateReq)
d.logger.Debug("sdk request 'cdnfly.CreateCert'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))
d.logger.Debug("sdk request 'CreateCert'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'cdnfly.CreateCert': %w", err)
return fmt.Errorf("failed to execute sdk request 'CreateCert': %w", err)
}
// 修改单个网站
@@ -122,9 +122,9 @@ func (d *Deployer) deployToSite(ctx context.Context, certPEM, privkeyPEM string)
HttpsListen: lo.ToPtr(updateSiteReqHttpsListen),
}
updateSiteResp, err := d.sdkClient.UpdateSiteWithContext(ctx, d.config.SiteId, updateSiteReq)
d.logger.Debug("sdk request 'cdnfly.UpdateSite'", slog.String("siteId", d.config.SiteId), slog.Any("request", updateSiteReq), slog.Any("response", updateSiteResp))
d.logger.Debug("sdk request 'UpdateSite'", slog.String("siteId", d.config.SiteId), slog.Any("request", updateSiteReq), slog.Any("response", updateSiteResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'cdnfly.UpdateSite': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateSite': %w", err)
}
return nil
@@ -143,9 +143,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
Key: lo.ToPtr(privkeyPEM),
}
updateCertResp, err := d.sdkClient.UpdateCertWithContext(ctx, d.config.CertificateId, updateCertReq)
d.logger.Debug("sdk request 'cdnfly.UpdateCert'", slog.String("certId", d.config.CertificateId), slog.Any("request", updateCertReq), slog.Any("response", updateCertResp))
d.logger.Debug("sdk request 'UpdateCert'", slog.String("certId", d.config.CertificateId), slog.Any("request", updateCertReq), slog.Any("response", updateCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'cdnfly.UpdateCert': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateCert': %w", err)
}
return nil
pkg/core/deployer/providers/flexcdn/flexcdn.go
+2 -2
View File
@@ -108,9 +108,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
CommonNames: []string{certX509.Subject.CommonName},
}
updateSSLCertResp, err := d.sdkClient.UpdateSSLCertWithContext(ctx, updateSSLCertReq)
d.logger.Debug("sdk request 'flexcdn.UpdateSSLCert'", slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
d.logger.Debug("sdk request 'UpdateSSLCert'", slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'flexcdn.UpdateSSLCert': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateSSLCert': %w", err)
}
return nil
pkg/core/deployer/providers/flyio/flyio.go
+2 -2
View File
@@ -68,9 +68,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
PrivateKey: privkeyPEM,
}
importCustomCertificateResp, err := d.sdkClient.ImportCustomCertificateWithContext(ctx, importCustomCertificateReq)
d.logger.Debug("sdk request 'flyio.ImportCustomCertificate'", slog.Any("request", importCustomCertificateReq), slog.Any("response", importCustomCertificateResp))
d.logger.Debug("sdk request 'ImportCustomCertificate'", slog.Any("request", importCustomCertificateReq), slog.Any("response", importCustomCertificateResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'flyio.ImportCustomCertificate': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'ImportCustomCertificate': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/goedge/goedge.go
+2 -2
View File
@@ -108,9 +108,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
CommonNames: []string{certX509.Subject.CommonName},
}
updateSSLCertResp, err := d.sdkClient.UpdateSSLCertWithContext(ctx, updateSSLCertReq)
d.logger.Debug("sdk request 'goedge.UpdateSSLCert'", slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
d.logger.Debug("sdk request 'UpdateSSLCert'", slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'goedge.UpdateSSLCert': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateSSLCert': %w", err)
}
return nil
pkg/core/deployer/providers/k8s-secret/k8s_secret.go
+6 -6
View File
@@ -9,7 +9,7 @@ import (
k8score "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
k8smeta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
k8stypedcore "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
@@ -111,7 +111,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
}
// 获取 Secret 实例，如果不存在则创建
secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Get(ctx, d.config.SecretName, k8smeta.GetOptions{})
secretPayload, err = client.Secrets(d.config.Namespace).Get(ctx, d.config.SecretName, k8smeta.GetOptions{})
if err != nil {
if !k8serrors.IsNotFound(err) {
return nil, fmt.Errorf("failed to get kubernetes secret: %w", err)
@@ -133,7 +133,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
secretPayload.Data[d.config.SecretDataKeyForCrt] = []byte(certPEM)
secretPayload.Data[d.config.SecretDataKeyForKey] = []byte(privkeyPEM)
secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Create(ctx, secretPayload, k8smeta.CreateOptions{})
secretPayload, err = client.Secrets(d.config.Namespace).Create(ctx, secretPayload, k8smeta.CreateOptions{})
d.logger.Debug("kubernetes operate 'Secrets.Create'", slog.String("namespace", d.config.Namespace), slog.Any("secret", secretPayload))
if err != nil {
return nil, fmt.Errorf("failed to create kubernetes secret: %w", err)
@@ -163,7 +163,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
}
secretPayload.Data[d.config.SecretDataKeyForCrt] = []byte(certPEM)
secretPayload.Data[d.config.SecretDataKeyForKey] = []byte(privkeyPEM)
secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Update(ctx, secretPayload, k8smeta.UpdateOptions{})
secretPayload, err = client.Secrets(d.config.Namespace).Update(ctx, secretPayload, k8smeta.UpdateOptions{})
d.logger.Debug("kubernetes operate 'Secrets.Update'", slog.String("namespace", d.config.Namespace), slog.Any("secret", secretPayload))
if err != nil {
return nil, fmt.Errorf("failed to update kubernetes secret: %w", err)
@@ -172,7 +172,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
return &deployer.DeployResult{}, nil
}
func createK8sClient(kubeConfig string) (*kubernetes.Clientset, error) {
func createK8sClient(kubeConfig string) (*k8stypedcore.CoreV1Client, error) {
var config *rest.Config
var err error
if kubeConfig == "" {
@@ -188,7 +188,7 @@ func createK8sClient(kubeConfig string) (*kubernetes.Clientset, error) {
return nil, err
}
client, err := kubernetes.NewForConfig(config)
client, err := k8stypedcore.NewForConfig(config)
if err != nil {
return nil, err
}
pkg/core/deployer/providers/kong/kong.go
+2 -2
View File
@@ -100,9 +100,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
SNIs: kong.StringSlice(certX509.DNSNames...),
}
updateCertificateResp, err := d.sdkClient.Certificates.Update(ctx, updateCertificateReq)
d.logger.Debug("sdk request 'kong.UpdateCertificate'", slog.String("sslId", d.config.CertificateId), slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp))
d.logger.Debug("sdk request 'UpdateCertificate'", slog.String("sslId", d.config.CertificateId), slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'kong.UpdateCertificate': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateCertificate': %w", err)
}
return nil
pkg/core/deployer/providers/lecdn/lecdn.go
+4 -4
View File
@@ -104,9 +104,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
AutoRenewal: false,
}
updateSSLCertResp, err := sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateSSLCertReq)
d.logger.Debug("sdk request 'lecdn.UpdateCertificate'", slog.Int64("certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
d.logger.Debug("sdk request 'UpdateCertificate'", slog.Int64("certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'lecdn.UpdateCertificate': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateCertificate': %w", err)
}
}
@@ -122,9 +122,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
AutoRenewal: false,
}
updateSSLCertResp, err := sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateSSLCertReq)
d.logger.Debug("sdk request 'lecdn.UpdateCertificate'", slog.Int64("certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
d.logger.Debug("sdk request 'UpdateCertificate'", slog.Int64("certId", d.config.CertificateId), slog.Any("request", updateSSLCertReq), slog.Any("response", updateSSLCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'lecdn.UpdateCertificate': %w", err)
return fmt.Errorf("failed to execute sdk request 'UpdateCertificate': %w", err)
}
}
pkg/core/deployer/providers/netlify/netlify.go
+2 -2
View File
@@ -87,9 +87,9 @@ func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM stri
Key: privkeyPEM,
}
provisionSiteTLSCertificateResp, err := d.sdkClient.ProvisionSiteTLSCertificateWithContext(ctx, d.config.SiteId, provisionSiteTLSCertificateReq)
d.logger.Debug("sdk request 'netlify.ProvisionSiteTLSCertificate'", slog.String("siteId", d.config.SiteId), slog.Any("request", provisionSiteTLSCertificateReq), slog.Any("response", provisionSiteTLSCertificateResp))
d.logger.Debug("sdk request 'ProvisionSiteTLSCertificate'", slog.String("siteId", d.config.SiteId), slog.Any("request", provisionSiteTLSCertificateReq), slog.Any("response", provisionSiteTLSCertificateResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'netlify.ProvisionSiteTLSCertificate': %w", err)
return fmt.Errorf("failed to execute sdk request 'ProvisionSiteTLSCertificate': %w", err)
}
return nil
pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go
+2 -2
View File
@@ -61,9 +61,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
PrivateKey: privkeyPEM,
}
setSettingCertResp, err := d.sdkClient.SetSettingCertWithContext(ctx, setSettingCertReq)
d.logger.Debug("sdk request 'ratpanel.SetSettingCert'", slog.Any("request", setSettingCertReq), slog.Any("response", setSettingCertResp))
d.logger.Debug("sdk request 'SetSettingCert'", slog.Any("request", setSettingCertReq), slog.Any("response", setSettingCertResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'ratpanel.SetSettingCert': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'SetSettingCert': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/deployer/providers/ratpanel/ratpanel.go
+4 -4
View File
@@ -128,9 +128,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
PrivateKey: privkeyPEM,
}
certUpdateResp, err := d.sdkClient.CertUpdateWithContext(ctx, certUpdateReq)
d.logger.Debug("sdk request 'ratpanel.CertUpdate'", slog.Any("request", certUpdateReq), slog.Any("response", certUpdateResp))
d.logger.Debug("sdk request 'CertUpdate'", slog.Any("request", certUpdateReq), slog.Any("response", certUpdateResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'ratpanel.CertUpdate': %w", err)
return fmt.Errorf("failed to execute sdk request 'CertUpdate': %w", err)
}
return nil
@@ -144,9 +144,9 @@ func (d *Deployer) updateSiteCertificate(ctx context.Context, siteName string, c
PrivateKey: privkeyPEM,
}
setWebsiteCertResp, err := d.sdkClient.SetWebsiteCertWithContext(ctx, setWebsiteCertReq)
d.logger.Debug("sdk request 'ratpanel.SetWebsiteCert'", slog.Any("request", setWebsiteCertReq), slog.Any("response", setWebsiteCertResp))
d.logger.Debug("sdk request 'SetWebsiteCert'", slog.Any("request", setWebsiteCertReq), slog.Any("response", setWebsiteCertResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'ratpanel.SetWebsiteCert': %w", err)
return fmt.Errorf("failed to execute sdk request 'SetWebsiteCert': %w", err)
}
return nil
pkg/core/deployer/providers/safeline/safeline.go
+2 -2
View File
@@ -87,9 +87,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
},
}
updateCertificateResp, err := d.sdkClient.UpdateCertificateWithContext(ctx, updateCertificateReq)
d.logger.Debug("sdk request 'safeline.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp))
d.logger.Debug("sdk request 'open.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'safeline.UpdateCertificate': %w", err)
return fmt.Errorf("failed to execute sdk request 'open.UpdateCertificate': %w", err)
}
return nil
pkg/core/deployer/providers/samwaf/samwaf.go
+4 -4
View File
@@ -80,9 +80,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
// 获取 SSL 证书 详情
// REF: https://doc.samwaf.com/api/
sslConfigDetailResp, err := d.sdkClient.SslConfigDetailWithContext(ctx, d.config.CertificateId)
d.logger.Debug("sdk request 'samwaf.SslConfigDetail'", slog.Any("request.sslId", d.config.CertificateId), slog.Any("response", sslConfigDetailResp))
d.logger.Debug("sdk request 'sslconfig.Detail'", slog.Any("request.sslId", d.config.CertificateId), slog.Any("response", sslConfigDetailResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'samwaf.SslConfigDetail': %w", err)
return fmt.Errorf("failed to execute sdk request 'sslconfig.Detail': %w", err)
} else if sslConfigDetailResp.Data == nil || sslConfigDetailResp.Data.Id == "" {
return fmt.Errorf("could not find ssl config: '%s'", d.config.CertificateId)
}
@@ -95,9 +95,9 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
KeyContent: privkeyPEM,
}
sslConfigEditResp, err := d.sdkClient.SslConfigEditWithContext(ctx, sslConfigEditReq)
d.logger.Debug("sdk request 'samwaf.SslConfigEdit'", slog.Any("request", sslConfigEditReq), slog.Any("response", sslConfigEditResp))
d.logger.Debug("sdk request 'sslconfig.Edit'", slog.Any("request", sslConfigEditReq), slog.Any("response", sslConfigEditResp))
if err != nil {
return fmt.Errorf("failed to execute sdk request 'samwaf.SslConfigEdit': %w", err)
return fmt.Errorf("failed to execute sdk request 'sslconfig.Edit': %w", err)
}
return nil
pkg/core/deployer/providers/vercel/vercel.go
+2 -2
View File
@@ -66,9 +66,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep
SkipValidation: true,
}
uploadCertResp, err := d.sdkClient.UploadCertWithContext(ctx, uploadCertReq)
d.logger.Debug("sdk request 'vercel.UploadCert'", slog.Any("request", uploadCertReq), slog.Any("response", uploadCertResp))
d.logger.Debug("sdk request 'UploadCert'", slog.Any("request", uploadCertReq), slog.Any("response", uploadCertResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'vercel.UploadCert': %w", err)
return nil, fmt.Errorf("failed to execute sdk request 'UploadCert': %w", err)
}
return &deployer.DeployResult{}, nil
pkg/core/errors.go
+11
View File
@@ -0,0 +1,11 @@
package core
import (
"errors"
"fmt"
)
var (
ErrNotImplemented = fmt.Errorf("not implemented function")
ErrUnsupported = errors.ErrUnsupported
)