Merge branch 'main' into feat/cloud-load-balance

internal/deployer/qiniu_cdn.go

@@ -76,7 +76,8 @@ func (d *QiniuCDNDeployer) Deploy(ctx context.Context) error {
 }
 
 func (d *QiniuCDNDeployer) enableHttps(certId string) error {
-	path := fmt.Sprintf("/domain/%s/sslize", getDeployString(d.option.DeployConfig, "domain"))
+	domain := d.option.DeployConfig.GetDomain()
+	path := fmt.Sprintf("/domain/%s/sslize", domain)
 
 	body := &qiniuModifyDomainCertReq{
 		CertID:      certId,
@@ -102,7 +103,9 @@ type qiniuDomainInfo struct {
 }
 
 func (d *QiniuCDNDeployer) getDomainInfo() (*qiniuDomainInfo, error) {
-	path := fmt.Sprintf("/domain/%s", getDeployString(d.option.DeployConfig, "domain"))
+	domain := d.option.DeployConfig.GetDomain()
+
+	path := fmt.Sprintf("/domain/%s", domain)
 
 	res, err := d.req(qiniuGateway+path, http.MethodGet, nil)
 	if err != nil {
@@ -164,7 +167,8 @@ type qiniuModifyDomainCertReq struct {
 }
 
 func (d *QiniuCDNDeployer) modifyDomainCert(certId string) error {
-	path := fmt.Sprintf("/domain/%s/httpsconf", getDeployString(d.option.DeployConfig, "domain"))
+	domain := d.option.DeployConfig.GetDomain()
+	path := fmt.Sprintf("/domain/%s/httpsconf", domain)
 
 	body := &qiniuModifyDomainCertReq{
 		CertID:      certId,

internal/domain/domains.go

@@ -1,5 +1,7 @@
 package domain
 
+import "strings"
+
 type ApplyConfig struct {
 	Email              string `json:"email"`
 	Access             string `json:"access"`
@@ -16,6 +18,7 @@ type DeployConfig struct {
 	Config map[string]any `json:"config"`
 }
 
+
 // 以字符串形式获取配置项。
 //
 // 入参：
@@ -82,6 +85,25 @@ func (dc *DeployConfig) GetConfigOrDefaultAsBool(key string, defaultValue bool)
 	return defaultValue
 }
 
+// GetDomain returns the domain from the deploy config
+// if the domain is a wildcard domain, and wildcard is true, return the wildcard domain
+func (dc *DeployConfig) GetDomain(wildcard ...bool) string {
+	val := dc.GetConfigAsString("domain")
+	if val == "" {
+		return ""
+	}
+
+	if !strings.HasPrefix(val, "*") {
+		return val
+	}
+
+	if len(wildcard) > 0 && wildcard[0] {
+		return val
+	}
+
+	return strings.TrimPrefix(val, "*")
+}
+
 type KV struct {
 	Key   string `json:"key"`
 	Value string `json:"value"`