GuanM/certimate
1
0
Fork 0
mirror of https://github.com/usual2970/certimate.git synced 2025-07-07 19:49:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: GuanM:0e8b271e8d0d96991ed998d5deb263841c973904
Branches Tags
GuanM:main
GuanM:mirror
GuanM:v0.3.19
..
compare: GuanM:c34346cb319510e05bacd3618b5d784b2f58b5cc
Branches Tags
GuanM:mirror
GuanM:main
GuanM:v0.3.19

No commits in common. "0e8b271e8d0d96991ed998d5deb263841c973904" and "c34346cb319510e05bacd3618b5d784b2f58b5cc" have entirely different histories.
0e8b271e8d ... c34346cb31

1 changed files with 12 additions and 16 deletions
Show Stats Expand all files Collapse all files

28
internal/pkg/core/applicant/acme-dns-01/lego-providers/aliyun-esa/internal/lego.go
View File

@ -89,8 +89,6 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
return &DNSProvider{ return &DNSProvider{
client: client, client: client,
config: config, config: config,
siteIDs: make(map[string]int64),
}, nil }, nil
} }
@ -102,7 +100,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
return fmt.Errorf("alicloud-esa: could not find zone for domain %q: %w", domain, err) return fmt.Errorf("alicloud-esa: could not find zone for domain %q: %w", domain, err)
} }
siteId, err := d.getSiteId(strings.TrimRight(authZone, ".")) siteId, err := d.getSiteId(authZone)
if err != nil { if err != nil {
return fmt.Errorf("alicloud-esa: could not find site for zone %q: %w", authZone, err) return fmt.Errorf("alicloud-esa: could not find site for zone %q: %w", authZone, err)
} }
@ -122,7 +120,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
return fmt.Errorf("alicloud-esa: could not find zone for domain %q: %w", domain, err) return fmt.Errorf("alicloud-esa: could not find zone for domain %q: %w", domain, err)
} }
siteId, err := d.getSiteId(strings.TrimRight(authZone, ".")) siteId, err := d.getSiteId(authZone)
if err != nil { if err != nil {
return fmt.Errorf("alicloud-esa: could not find site for zone %q: %w", authZone, err) return fmt.Errorf("alicloud-esa: could not find site for zone %q: %w", authZone, err)
} }
@ -150,11 +148,10 @@ func (d *DNSProvider) getSiteId(siteName string) (int64, error) {
pageSize := 500 pageSize := 500
for { for {
request := &aliesa.ListSitesRequest{ request := &aliesa.ListSitesRequest{
SiteName: tea.String(siteName), SiteName: tea.String(siteName),
SiteSearchType: tea.String("exact"), PageNumber: tea.Int32(int32(pageNumber)),
PageNumber: tea.Int32(int32(pageNumber)), PageSize: tea.Int32(int32(pageNumber)),
PageSize: tea.Int32(int32(pageSize)), AccessType: tea.String("NS"),
AccessType: tea.String("NS"),
} }
response, err := d.client.ListSites(request) response, err := d.client.ListSites(request)
if err != nil { if err != nil {
@ -181,7 +178,7 @@ func (d *DNSProvider) getSiteId(siteName string) (int64, error) {
} }
} }
return 0, errors.New("site not found") return 0, errors.New("failed to get site id")
} }
func (d *DNSProvider) findDNSRecord(siteId int64, effectiveFQDN string) (*aliesa.ListRecordsResponseBodyRecords, error) { func (d *DNSProvider) findDNSRecord(siteId int64, effectiveFQDN string) (*aliesa.ListRecordsResponseBodyRecords, error) {
@ -189,12 +186,11 @@ func (d *DNSProvider) findDNSRecord(siteId int64, effectiveFQDN string) (*aliesa
pageSize := 500 pageSize := 500
for { for {
request := &aliesa.ListRecordsRequest{ request := &aliesa.ListRecordsRequest{
SiteId: tea.Int64(siteId), SiteId: tea.Int64(siteId),
Type: tea.String("TXT"), Type: tea.String("TXT"),
RecordName: tea.String(effectiveFQDN), RecordName: tea.String(effectiveFQDN),
RecordMatchType: tea.String("exact"), PageNumber: tea.Int32(int32(pageNumber)),
PageNumber: tea.Int32(int32(pageNumber)), PageSize: tea.Int32(int32(pageNumber)),
PageSize: tea.Int32(int32(pageSize)),
} }
response, err := d.client.ListRecords(request) response, err := d.client.ListRecords(request)
if err != nil { if err != nil {