diff --git a/internal/deployer/baiducloud_cdn.go b/internal/deployer/baiducloud_cdn.go index f38bc4d8..31d789df 100644 --- a/internal/deployer/baiducloud_cdn.go +++ b/internal/deployer/baiducloud_cdn.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - baiduCdn "github.com/baidubce/bce-sdk-go/services/cdn" - baiduCdnApi "github.com/baidubce/bce-sdk-go/services/cdn/api" + bceCdn "github.com/baidubce/bce-sdk-go/services/cdn" + bceCdnApi "github.com/baidubce/bce-sdk-go/services/cdn/api" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/domain" @@ -17,7 +17,7 @@ type BaiduCloudCDNDeployer struct { option *DeployerOption infos []string - sdkClient *baiduCdn.Client + sdkClient *bceCdn.Client } func NewBaiduCloudCDNDeployer(option *DeployerOption) (Deployer, error) { @@ -54,7 +54,7 @@ func (d *BaiduCloudCDNDeployer) Deploy(ctx context.Context) error { // REF: https://cloud.baidu.com/doc/CDN/s/qjzuz2hp8 putCertResp, err := d.sdkClient.PutCert( d.option.DeployConfig.GetConfigAsString("domain"), - &baiduCdnApi.UserCertificate{ + &bceCdnApi.UserCertificate{ CertName: fmt.Sprintf("certimate-%d", time.Now().UnixMilli()), ServerData: d.option.Certificate.Certificate, PrivateData: d.option.Certificate.PrivateKey, @@ -70,8 +70,8 @@ func (d *BaiduCloudCDNDeployer) Deploy(ctx context.Context) error { return nil } -func (d *BaiduCloudCDNDeployer) createSdkClient(accessKeyId, secretAccessKey string) (*baiduCdn.Client, error) { - client, err := baiduCdn.NewClient(accessKeyId, secretAccessKey, "") +func (d *BaiduCloudCDNDeployer) createSdkClient(accessKeyId, secretAccessKey string) (*bceCdn.Client, error) { + client, err := bceCdn.NewClient(accessKeyId, secretAccessKey, "") if err != nil { return nil, err } diff --git a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go index 534881d1..010c55d1 100644 --- a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go @@ -51,7 +51,7 @@ func (u *QiniuSSLCertUploader) Upload(ctx context.Context, certPem string, privk // 上传新证书 // REF: https://developer.qiniu.com/fusion/8593/interface-related-certificate - uploadSslCertResp, err := u.sdkClient.UploadSslCert(certName, certX509.Subject.CommonName, privkeyPem, certPem) + uploadSslCertResp, err := u.sdkClient.UploadSslCert(certName, certX509.Subject.CommonName, certPem, privkeyPem) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadSslCert'") } diff --git a/internal/pkg/vendors/qiniu-sdk/client.go b/internal/pkg/vendors/qiniu-sdk/client.go index 2bfbcc12..76c07ba9 100644 --- a/internal/pkg/vendors/qiniu-sdk/client.go +++ b/internal/pkg/vendors/qiniu-sdk/client.go @@ -105,12 +105,12 @@ func (c *Client) EnableDomainHttps(domain, certId string, forceHttps, http2Enabl return resp, nil } -func (c *Client) UploadSslCert(name, commonName, pri, ca string) (*UploadSslCertResponse, error) { +func (c *Client) UploadSslCert(name, commonName, certificate, privateKey string) (*UploadSslCertResponse, error) { req := &UploadSslCertRequest{ - Name: name, - CommonName: commonName, - Pri: pri, - Ca: ca, + Name: name, + CommonName: commonName, + Certificate: certificate, + PrivateKey: privateKey, } reqBytes, err := json.Marshal(req) diff --git a/internal/pkg/vendors/qiniu-sdk/models.go b/internal/pkg/vendors/qiniu-sdk/models.go index 47eac05d..b8652fd4 100644 --- a/internal/pkg/vendors/qiniu-sdk/models.go +++ b/internal/pkg/vendors/qiniu-sdk/models.go @@ -6,10 +6,10 @@ type BaseResponse struct { } type UploadSslCertRequest struct { - Name string `json:"name"` - CommonName string `json:"common_name"` - Pri string `json:"pri"` - Ca string `json:"ca"` + Name string `json:"name"` + CommonName string `json:"common_name"` + Certificate string `json:"ca"` + PrivateKey string `json:"pri"` } type UploadSslCertResponse struct {