github
/
certimate
mirror of https://github.com/usual2970/certimate
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: fix typo

main
Fu Diwei 2024-10-31 18:25:22 +08:00
parent f82eee4636
commit 4fec0036cb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/deployer/tencent_cdn.go
View File

@ -79,7 +79,7 @@ func (d *TencentCDNDeployer) Deploy(ctx context.Context) error {
// 获取待部署的 CDN 实例 // 获取待部署的 CDN 实例
// 如果是泛域名，根据证书匹配 CDN 实例 // 如果是泛域名，根据证书匹配 CDN 实例
aliInstanceIds := make([]string, 0) tcInstanceIds := make([]string, 0)
domain := d.option.DeployConfig.GetConfigAsString("domain") domain := d.option.DeployConfig.GetConfigAsString("domain")
if strings.HasPrefix(domain, "*") { if strings.HasPrefix(domain, "*") {
domains, err := d.getDomainsByCertificateId(upres.CertId) domains, err := d.getDomainsByCertificateId(upres.CertId)
@ -87,27 +87,27 @@ func (d *TencentCDNDeployer) Deploy(ctx context.Context) error {
return err return err
} }
aliInstanceIds = domains tcInstanceIds = domains
} else { } else {
aliInstanceIds = append(aliInstanceIds, domain) tcInstanceIds = append(tcInstanceIds, domain)
} }
// 跳过已部署的 CDN 实例 // 跳过已部署的 CDN 实例
if len(aliInstanceIds) > 0 { if len(tcInstanceIds) > 0 {
deployedDomains, err := d.getDeployedDomainsByCertificateId(upres.CertId) deployedDomains, err := d.getDeployedDomainsByCertificateId(upres.CertId)
if err != nil { if err != nil {
return err return err
} }
temp := make([]string, 0) temp := make([]string, 0)
for _, aliInstanceId := range aliInstanceIds { for _, aliInstanceId := range tcInstanceIds {
if !slices.Contains(deployedDomains, aliInstanceId) { if !slices.Contains(deployedDomains, aliInstanceId) {
temp = append(temp, aliInstanceId) temp = append(temp, aliInstanceId)
} }
} }
aliInstanceIds = temp tcInstanceIds = temp
} }
if len(aliInstanceIds) == 0 { if len(tcInstanceIds) == 0 {
d.infos = append(d.infos, "已部署过或没有要部署的 CDN 实例") d.infos = append(d.infos, "已部署过或没有要部署的 CDN 实例")
return nil return nil
} }
@ -118,7 +118,7 @@ func (d *TencentCDNDeployer) Deploy(ctx context.Context) error {
deployCertificateInstanceReq.CertificateId = common.StringPtr(upres.CertId) deployCertificateInstanceReq.CertificateId = common.StringPtr(upres.CertId)
deployCertificateInstanceReq.ResourceType = common.StringPtr("cdn") deployCertificateInstanceReq.ResourceType = common.StringPtr("cdn")
deployCertificateInstanceReq.Status = common.Int64Ptr(1) deployCertificateInstanceReq.Status = common.Int64Ptr(1)
deployCertificateInstanceReq.InstanceIdList = common.StringPtrs(aliInstanceIds) deployCertificateInstanceReq.InstanceIdList = common.StringPtrs(tcInstanceIds)
deployCertificateInstanceResp, err := d.sdkClients.ssl.DeployCertificateInstance(deployCertificateInstanceReq) deployCertificateInstanceResp, err := d.sdkClients.ssl.DeployCertificateInstance(deployCertificateInstanceReq)
if err != nil { if err != nil {
return xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") return xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'")

2
internal/deployer/tencent_cos.go
View File

@ -77,7 +77,7 @@ func (d *TencentCOSDeployer) Deploy(ctx context.Context) error {
d.infos = append(d.infos, toStr("已上传证书", upres)) d.infos = append(d.infos, toStr("已上传证书", upres))
// 证书部署到 CLB 实例 // 证书部署到 COS 实例
// REF: https://cloud.tencent.com/document/product/400/91667 // REF: https://cloud.tencent.com/document/product/400/91667
deployCertificateInstanceReq := tcSsl.NewDeployCertificateInstanceRequest() deployCertificateInstanceReq := tcSsl.NewDeployCertificateInstanceRequest()
deployCertificateInstanceReq.CertificateId = common.StringPtr(upres.CertId) deployCertificateInstanceReq.CertificateId = common.StringPtr(upres.CertId)