From 38dc8a63d962268dcfdb7e2a7a1863d63bac4c40 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Sun, 27 Oct 2024 23:48:52 +0800 Subject: [PATCH] enhance: resolve error on tencent cdn dupe deployment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化:腾讯云cdn重复部署报错的问题 --- internal/deployer/deployer.go | 10 ++++++ internal/deployer/tencent_cdn.go | 60 +++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index c4530df4..113a92d6 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -195,3 +195,13 @@ func getDeployVariables(conf domain.DeployConfig) map[string]string { return rs } + +// contains 检查字符串切片中是否包含指定的字符串 +func contains(slice []string, item string) bool { + for _, s := range slice { + if s == item { + return true + } + } + return false +} \ No newline at end of file diff --git a/internal/deployer/tencent_cdn.go b/internal/deployer/tencent_cdn.go index aa315466..e3c968e9 100644 --- a/internal/deployer/tencent_cdn.go +++ b/internal/deployer/tencent_cdn.go @@ -2,7 +2,6 @@ package deployer import ( "context" - "encoding/base64" "encoding/json" "fmt" "strings" @@ -100,16 +99,23 @@ func (d *TencentCDNDeployer) deploy(certId string) error { // 如果是泛域名就从cdn列表下获取SSL证书中的可用域名 domain := getDeployString(d.option.DeployConfig, "domain") if strings.Contains(domain, "*") { - list, errGetList := d.getDomainList() + list, errGetList := d.getDomainList(certId) if errGetList != nil { return fmt.Errorf("failed to get certificate domain list: %w", errGetList) } - if list == nil || len(list) == 0 { - return fmt.Errorf("failed to get certificate domain list: empty list.") + if len(list) == 0 { + d.infos = append(d.infos, "没有需要部署的实例") + return nil } request.InstanceIdList = common.StringPtrs(list) } else { // 否则直接使用传入的域名 - request.InstanceIdList = common.StringPtrs([]string{domain}) + if(isDomainDeployed(certId, domain)){ + d.infos = append(d.infos, "域名已部署") + return nil + } + else{ + request.InstanceIdList = common.StringPtrs([]string{domain}) + } } // 返回的resp是一个DeployCertificateInstanceResponse的实例,与请求对象对应 @@ -121,23 +127,61 @@ func (d *TencentCDNDeployer) deploy(certId string) error { return nil } -func (d *TencentCDNDeployer) getDomainList() ([]string, error) { +func (d *TencentCDNDeployer) getDomainList(certId string) ([]string, error) { cpf := profile.NewClientProfile() cpf.HttpProfile.Endpoint = "cdn.tencentcloudapi.com" client, _ := cdn.NewClient(d.credential, "", cpf) request := cdn.NewDescribeCertDomainsRequest() - cert := base64.StdEncoding.EncodeToString([]byte(d.option.Certificate.Certificate)) - request.Cert = &cert + request.CertId = common.StringPtr(certId) response, err := client.DescribeCertDomains(request) if err != nil { return nil, fmt.Errorf("failed to get domain list: %w", err) } + deployedDomains, err := d.getDeployedDomainList(certId) + if err != nil { + return nil, fmt.Errorf("failed to get deployed domain list: %w", err) + } + domains := make([]string, 0) for _, domain := range response.Response.Domains { + domainStr := *domain + if(contains(deployedDomains, domainStr)){ + domains = append(domains, domainStr) + } + } + + return domains, nil +} + +func (d *TencentCDNDeployer) isDomainDeployed(certId, domain string) (bool, error) { + deployedDomains, err := d.getDeployedDomainList(certId) + if(err != nil){ + return false, err + } + + return contains(deployedDomains, domain), nil +} + +func (d *TencentCDNDeployer) getDeployedDomainList(certId string) ([]string, error) { + cpf := profile.NewClientProfile() + cpf.HttpProfile.Endpoint = "ssl.tencentcloudapi.com" + client, _ := ssl.NewClient(d.credential, "", cpf) + + request := ssl.NewDescribeDeployedResourcesRequest() + request.CertificateIds = common.StringPtrs([]string{certId}) + request.ResourceType = common.StringPtr("cdn") + + response, err := client.DescribeDeployedResources(request) + if err != nil { + return nil, fmt.Errorf("failed to get deployed domain list: %w", err) + } + + domains := make([]string, 0) + for _, domain := range response.Response.DeployedResources[0].Resources { domains = append(domains, *domain) }