mbiryukova/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

nifcloud: Get zone info from dns01.FindZoneByFqdn (#1383)

Browse source
This commit is contained in:
kakakikikeke-fork 2021-04-09 04:05:25 +09:00 committed by GitHub
parent ae7daa7d33
commit 2334340d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
providers/dns/nifcloud/nifcloud.go
View file

@ -99,7 +99,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
func (d *DNSProvider) Present(domain, token, keyAuth string) error { func (d *DNSProvider) Present(domain, token, keyAuth string) error {
fqdn, value := dns01.GetRecord(domain, keyAuth) fqdn, value := dns01.GetRecord(domain, keyAuth)
err := d.changeRecord("CREATE", fqdn, value, domain, d.config.TTL) err := d.changeRecord("CREATE", fqdn, value, d.config.TTL)
if err != nil { if err != nil {
return fmt.Errorf("nifcloud: %w", err) return fmt.Errorf("nifcloud: %w", err)
} }
@ -110,7 +110,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
fqdn, value := dns01.GetRecord(domain, keyAuth) fqdn, value := dns01.GetRecord(domain, keyAuth)
err := d.changeRecord("DELETE", fqdn, value, domain, d.config.TTL) err := d.changeRecord("DELETE", fqdn, value, d.config.TTL)
if err != nil { if err != nil {
return fmt.Errorf("nifcloud: %w", err) return fmt.Errorf("nifcloud: %w", err)
} }
@ -123,7 +123,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
return d.config.PropagationTimeout, d.config.PollingInterval return d.config.PropagationTimeout, d.config.PollingInterval
} }
func (d *DNSProvider) changeRecord(action, fqdn, value, domain string, ttl int) error { func (d *DNSProvider) changeRecord(action, fqdn, value string, ttl int) error {
name := dns01.UnFqdn(fqdn) name := dns01.UnFqdn(fqdn)
reqParams := internal.ChangeResourceRecordSetsRequest{ reqParams := internal.ChangeResourceRecordSetsRequest{
@ -152,9 +152,14 @@ func (d *DNSProvider) changeRecord(action, fqdn, value, domain string, ttl int)
}, },
} }
resp, err := d.client.ChangeResourceRecordSets(domain, reqParams) authZone, err := dns01.FindZoneByFqdn(fqdn)
if err != nil { if err != nil {
return fmt.Errorf("failed to change NIFCLOUD record set: %w", err) return fmt.Errorf("failed to find zone: %w", err)
}
resp, err := d.client.ChangeResourceRecordSets(dns01.UnFqdn(authZone), reqParams)
if err != nil {
return fmt.Errorf("failed to change record set: %w", err)
} }
statusID := resp.ChangeInfo.ID statusID := resp.ChangeInfo.ID
@ -162,7 +167,7 @@ func (d *DNSProvider) changeRecord(action, fqdn, value, domain string, ttl int)
return wait.For("nifcloud", 120*time.Second, 4*time.Second, func() (bool, error) { return wait.For("nifcloud", 120*time.Second, 4*time.Second, func() (bool, error) {
resp, err := d.client.GetChange(statusID) resp, err := d.client.GetChange(statusID)
if err != nil { if err != nil {
return false, fmt.Errorf("failed to query NIFCLOUD DNS change status: %w", err) return false, fmt.Errorf("failed to query change status: %w", err)
} }
return resp.ChangeInfo.Status == "INSYNC", nil return resp.ChangeInfo.Status == "INSYNC", nil
}) })