diff --git a/internal/deployer/aliyun_cdn.go b/internal/deployer/aliyun_cdn.go index 71a96d6d..a23ce8a5 100644 --- a/internal/deployer/aliyun_cdn.go +++ b/internal/deployer/aliyun_cdn.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "time" aliyunCdn "github.com/alibabacloud-go/cdn-20180510/v5/client" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" @@ -11,7 +12,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/domain" - "github.com/usual2970/certimate/internal/utils/rand" ) type AliyunCDNDeployer struct { @@ -51,14 +51,12 @@ func (d *AliyunCDNDeployer) GetInfos() []string { } func (d *AliyunCDNDeployer) Deploy(ctx context.Context) error { - certName := fmt.Sprintf("%s-%s-%s", d.option.Domain, d.option.DomainId, rand.RandStr(6)) - // 设置 CDN 域名域名证书 // REF: https://help.aliyun.com/zh/cdn/developer-reference/api-cdn-2018-05-10-setcdndomainsslcertificate setCdnDomainSSLCertificateReq := &aliyunCdn.SetCdnDomainSSLCertificateRequest{ DomainName: tea.String(d.option.DeployConfig.GetConfigAsString("domain")), CertRegion: tea.String(d.option.DeployConfig.GetConfigOrDefaultAsString("region", "cn-hangzhou")), - CertName: tea.String(certName), + CertName: tea.String(fmt.Sprintf("certimate-%d", time.Now().UnixMilli())), CertType: tea.String("upload"), SSLProtocol: tea.String("on"), SSLPub: tea.String(d.option.Certificate.Certificate), diff --git a/internal/deployer/aliyun_clb.go b/internal/deployer/aliyun_clb.go index 3344b501..9669001b 100644 --- a/internal/deployer/aliyun_clb.go +++ b/internal/deployer/aliyun_clb.go @@ -112,12 +112,11 @@ func (d *AliyunCLBDeployer) createSdkClient(accessKeyId, accessKeySecret, region func (d *AliyunCLBDeployer) deployToLoadbalancer(ctx context.Context) error { aliLoadbalancerId := d.option.DeployConfig.GetConfigAsString("loadbalancerId") + aliListenerPorts := make([]int32, 0) if aliLoadbalancerId == "" { return errors.New("`loadbalancerId` is required") } - aliListenerPorts := make([]int32, 0) - // 查询负载均衡实例的详细信息 // REF: https://help.aliyun.com/zh/slb/classic-load-balancer/developer-reference/api-slb-2014-05-15-describeloadbalancerattribute describeLoadBalancerAttributeReq := &aliyunSlb.DescribeLoadBalancerAttributeRequest{ diff --git a/internal/deployer/aliyun_dcdn.go b/internal/deployer/aliyun_dcdn.go index 75b03cbc..0f969787 100644 --- a/internal/deployer/aliyun_dcdn.go +++ b/internal/deployer/aliyun_dcdn.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "strings" + "time" aliyunOpen "github.com/alibabacloud-go/darabonba-openapi/v2/client" aliyunDcdn "github.com/alibabacloud-go/dcdn-20180115/v3/client" @@ -12,7 +13,6 @@ import ( xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/domain" - "github.com/usual2970/certimate/internal/utils/rand" ) type AliyunDCDNDeployer struct { @@ -52,8 +52,6 @@ func (d *AliyunDCDNDeployer) GetInfos() []string { } func (d *AliyunDCDNDeployer) Deploy(ctx context.Context) error { - certName := fmt.Sprintf("%s-%s-%s", d.option.Domain, d.option.DomainId, rand.RandStr(6)) - // 支持泛解析域名,在 Aliyun DCDN 中泛解析域名表示为 .example.com domain := d.option.DeployConfig.GetConfigAsString("domain") if strings.HasPrefix(domain, "*") { @@ -65,7 +63,7 @@ func (d *AliyunDCDNDeployer) Deploy(ctx context.Context) error { setDcdnDomainSSLCertificateReq := &aliyunDcdn.SetDcdnDomainSSLCertificateRequest{ DomainName: tea.String(domain), CertRegion: tea.String(d.option.DeployConfig.GetConfigOrDefaultAsString("region", "cn-hangzhou")), - CertName: tea.String(certName), + CertName: tea.String(fmt.Sprintf("certimate-%d", time.Now().UnixMilli())), CertType: tea.String("upload"), SSLProtocol: tea.String("on"), SSLPub: tea.String(d.option.Certificate.Certificate), diff --git a/internal/utils/rand/rand.go b/internal/utils/rand/rand.go index 3b0b71f6..05fa684e 100644 --- a/internal/utils/rand/rand.go +++ b/internal/utils/rand/rand.go @@ -5,7 +5,8 @@ import ( "time" ) -// RandStr 随机生成指定长度字符串 +// Deprecated: this will be removed in the future. +// 随机生成指定长度字符串 func RandStr(n int) string { seed := time.Now().UnixNano() source := rand.NewSource(seed)