Compare commits

...

10 Commits

Author SHA1 Message Date
yoan
42f9fba82c update version 2025-01-09 07:07:57 +08:00
Yoan.liu
d653ab442f Merge pull request #409 from fudiwei/bugfix/tencent-teo-deploy-error
bugfix #367 on v0.2.x
2025-01-09 07:05:10 +08:00
Fu Diwei
a924a2df77 fix #367 2025-01-08 20:17:21 +08:00
Yoan.liu
7590bb5cbc Merge pull request #408 from yfmeii/fix-tencent-cdn
fix domain validation logic in Tencent CDN/ECDN certificate deployer
2025-01-08 18:04:08 +08:00
yfmeii
5042930aaa fix: fix domain validation logic in Tencent CDN/ECDN certificate deployer 2025-01-08 16:10:24 +08:00
Yoan.liu
9d36df211e Update version.ts 2024-12-11 09:07:44 +08:00
Yoan.liu
cec56b6e49 Merge pull request #372 from fudiwei/bugfix/huaweicloud-cdn-deploy-panic
bugfix #361
2024-12-11 09:06:26 +08:00
Fu Diwei
dfd2fccc1e fix: #361 2024-12-10 19:19:40 +08:00
yoan
4ffb7ae969 update version 2024-11-24 21:00:57 +08:00
yoan
302ddcdd07 update version 2024-11-24 21:00:21 +08:00
8 changed files with 26 additions and 10 deletions

View File

@@ -161,7 +161,7 @@ func (d *TencentCDNDeployer) getDomainsByCertificateId(tcCertId string) ([]strin
}
domains := make([]string, 0)
if describeCertDomainsResp.Response.Domains == nil {
if describeCertDomainsResp.Response.Domains != nil {
for _, domain := range describeCertDomainsResp.Response.Domains {
domains = append(domains, *domain)
}

View File

@@ -144,7 +144,7 @@ func (d *TencentECDNDeployer) getDomainsByCertificateId(tcCertId string) ([]stri
}
domains := make([]string, 0)
if describeCertDomainsResp.Response.Domains == nil {
if describeCertDomainsResp.Response.Domains != nil {
for _, domain := range describeCertDomainsResp.Response.Domains {
domains = append(domains, *domain)
}

View File

@@ -74,6 +74,12 @@ func (d *TencentTEODeployer) Deploy(ctx context.Context) error {
return xerrors.New("`zoneId` is required")
}
tcDomain := strings.ReplaceAll(strings.TrimSpace(d.option.DeployConfig.GetConfigAsString("domain")), "\r", "")
tcDomains := strings.Split(tcDomain, "\n")
if len(tcDomains) == 0 {
return xerrors.New("`domain` is required")
}
// 上传证书到 SSL
upres, err := d.sslUploader.Upload(ctx, d.option.Certificate.Certificate, d.option.Certificate.PrivateKey)
if err != nil {
@@ -87,7 +93,7 @@ func (d *TencentTEODeployer) Deploy(ctx context.Context) error {
modifyHostsCertificateReq := tcTeo.NewModifyHostsCertificateRequest()
modifyHostsCertificateReq.ZoneId = common.StringPtr(tcZoneId)
modifyHostsCertificateReq.Mode = common.StringPtr("sslcert")
modifyHostsCertificateReq.Hosts = common.StringPtrs(strings.Split(strings.ReplaceAll(d.option.Domain, "\r\n", "\n"), "\n"))
modifyHostsCertificateReq.Hosts = common.StringPtrs(tcDomains)
modifyHostsCertificateReq.ServerCertInfo = []*tcTeo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}}
modifyHostsCertificateResp, err := d.sdkClients.teo.ModifyHostsCertificate(modifyHostsCertificateReq)
if err != nil {

View File

@@ -146,7 +146,7 @@ func (d *TencentCloudCDNDeployer) getDomainsByCertificateId(cloudCertId string)
}
domains := make([]string, 0)
if describeCertDomainsResp.Response.Domains == nil {
if describeCertDomainsResp.Response.Domains != nil {
for _, domain := range describeCertDomainsResp.Response.Domains {
domains = append(domains, *domain)
}

View File

@@ -129,7 +129,7 @@ func (d *TencentCloudECDNDeployer) getDomainsByCertificateId(cloudCertId string)
}
domains := make([]string, 0)
if describeCertDomainsResp.Response.Domains == nil {
if describeCertDomainsResp.Response.Domains != nil {
for _, domain := range describeCertDomainsResp.Response.Domains {
domains = append(domains, *domain)
}

View File

@@ -3,6 +3,7 @@
import (
"github.com/huaweicloud/huaweicloud-sdk-go-v3/core"
hcCdn "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2"
hcCdnModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/model"
)
type Client struct {
@@ -21,6 +22,7 @@ func (c *Client) UploadDomainMultiCertificatesEx(request *UpdateDomainMultiCerti
if resp, err := c.HcClient.Sync(request, requestDef); err != nil {
return nil, err
} else {
return resp.(*UpdateDomainMultiCertificatesExResponse), nil
temp := resp.(*hcCdnModel.UpdateDomainMultiCertificatesResponse)
return &UpdateDomainMultiCertificatesExResponse{UpdateDomainMultiCertificatesResponse: *temp}, nil
}
}

View File

@@ -33,9 +33,17 @@ const DeployToTencentTEO = () => {
const formSchema = z.object({
zoneId: z.string().min(1, t("domain.deployment.form.tencent_teo_zone_id.placeholder")),
domain: z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
message: t("common.errmsg.domain_invalid"),
}),
domain: z.string().refine(
(v) =>
!!v &&
v
.trim()
.split("\n")
.every((s) => /^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/.test(s)),
{
message: t("common.errmsg.domain_invalid"),
}
),
});
useEffect(() => {

View File

@@ -1 +1 @@
export const version = "Certimate v0.2.21";
export const version = "Certimate v0.2.24-beta";