opensource/certimate
3
0
Fork 0
mirror of https://github.com/certimate-go/certimate.git synced 2026-09-24 23:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed a potential panic

Browse Source
This commit is contained in:
Fu Diwei
2026-07-30 16:39:59 +08:00
committed by RHQYZ
parent 3a32ee65ad
commit c53f195034
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go
+3
View File
@@ -113,6 +113,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
if err != nil {
return nil, err
}
if len(domainsInZone) == 0 {
return nil, fmt.Errorf("could not find domains in zone '%s'", d.config.ZoneId)
}
// 获取待部署的域名列表
var domains []string
pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers.go
+9 -6
View File
@@ -117,10 +117,13 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
}
// 获取全部可部署的域名列表
domainsInMakers, err := d.getAllDomainsInProject(ctx, d.config.MakersProjectId)
domainsInProject, err := d.getAllDomainsInProject(ctx, d.config.MakersProjectId)
if err != nil {
return nil, err
}
if len(domainsInProject) == 0 {
return nil, fmt.Errorf("could not find domains in project '%s'", d.config.MakersProjectId)
}
// 获取待部署的域名列表
var domains []string
@@ -140,7 +143,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
return nil, fmt.Errorf("config `domains` is required")
}
domainCandidates := lo.Map(domainsInMakers, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain, _ int) string {
domainCandidates := lo.Map(domainsInProject, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain, _ int) string {
return lo.FromPtr(domainInfo.Domain)
})
domains = lo.Filter(domainCandidates, func(domain string, _ int) bool {
@@ -158,7 +161,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
case DomainMatchPatternCertSan:
{
domainCandidates := lo.Map(domainsInMakers, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain, _ int) string {
domainCandidates := lo.Map(domainsInProject, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain, _ int) string {
return lo.FromPtr(domainInfo.Domain)
})
domains = lo.Filter(domainCandidates, func(domain string, _ int) bool {
@@ -180,7 +183,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
d.logger.Info("found edgeone makers domains to deploy", slog.Any("domains", domains))
// 获取站点 ID
zoneId := domainsInMakers[0].ZoneId
zoneId := domainsInProject[0].ZoneId
// 获取证书列表
describeHostCertificatesReq := tceo.NewDescribeHostCertificatesRequest()
@@ -195,7 +198,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
domains = lo.Filter(domains, func(domain string, _ int) bool {
var deployed bool
domainInfo, _ := lo.Find(domainsInMakers, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain) bool {
domainInfo, _ := lo.Find(domainsInProject, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain) bool {
return domain == lo.FromPtr(domainInfo.Domain)
})
if domainInfo != nil && describeHostCertificatesResp.Response != nil {
@@ -242,7 +245,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*Dep
modifyHostsCertificateReq.Hosts = common.StringPtrs([]string{domain})
modifyHostsCertificateReq.ServerCertInfo = []*tceo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}}
domainInfo, _ := lo.Find(domainsInMakers, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain) bool {
domainInfo, _ := lo.Find(domainsInProject, func(domainInfo *tceomakersssdk.PagesZoneCustomDomain) bool {
return domain == lo.FromPtr(domainInfo.Domain)
})
if domainInfo != nil && describeHostCertificatesResp.Response != nil {