fix: update lego.

vendor/github.com/go-acme/lego/providers/dns/sakuracloud/sakuracloud.go

@@ -5,13 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/go-acme/lego/challenge/dns01"
 	"github.com/go-acme/lego/platform/config/env"
 	"github.com/sacloud/libsacloud/api"
-	"github.com/sacloud/libsacloud/sacloud"
 )
 
 // Config is used to configure the creation of the DNSProvider
@@ -21,6 +19,7 @@ type Config struct {
 	PropagationTimeout time.Duration
 	PollingInterval    time.Duration
 	TTL                int
+	HTTPClient         *http.Client
 }
 
 // NewDefaultConfig returns a default configuration for the DNSProvider
@@ -29,13 +28,16 @@ func NewDefaultConfig() *Config {
 		TTL:                env.GetOrDefaultInt("SAKURACLOUD_TTL", dns01.DefaultTTL),
 		PropagationTimeout: env.GetOrDefaultSecond("SAKURACLOUD_PROPAGATION_TIMEOUT", dns01.DefaultPropagationTimeout),
 		PollingInterval:    env.GetOrDefaultSecond("SAKURACLOUD_POLLING_INTERVAL", dns01.DefaultPollingInterval),
+		HTTPClient: &http.Client{
+			Timeout: env.GetOrDefaultSecond("SAKURACLOUD_HTTP_TIMEOUT", 10*time.Second),
+		},
 	}
 }
 
 // DNSProvider is an implementation of the acme.ChallengeProvider interface.
 type DNSProvider struct {
 	config *Config
-	client *api.Client
+	client *api.DNSAPI
 }
 
 // NewDNSProvider returns a DNSProvider instance configured for SakuraCloud.
@@ -67,58 +69,29 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
 		return nil, errors.New("sakuracloud: AccessSecret is missing")
 	}
 
-	client := api.NewClient(config.Token, config.Secret, "tk1a")
+	apiClient := api.NewClient(config.Token, config.Secret, "is1a")
+	if config.HTTPClient == nil {
+		apiClient.HTTPClient = http.DefaultClient
+	} else {
+		apiClient.HTTPClient = config.HTTPClient
+	}
 
-	return &DNSProvider{client: client, config: config}, nil
+	return &DNSProvider{
+		client: apiClient.GetDNSAPI(),
+		config: config,
+	}, nil
 }
 
 // Present creates a TXT record to fulfill the dns-01 challenge.
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 	fqdn, value := dns01.GetRecord(domain, keyAuth)
-
-	zone, err := d.getHostedZone(domain)
-	if err != nil {
-		return fmt.Errorf("sakuracloud: %v", err)
-	}
-
-	name := d.extractRecordName(fqdn, zone.Name)
-
-	zone.AddRecord(zone.CreateNewRecord(name, "TXT", value, d.config.TTL))
-	_, err = d.client.GetDNSAPI().Update(zone.ID, zone)
-	if err != nil {
-		return fmt.Errorf("sakuracloud: API call failed: %v", err)
-	}
-
-	return nil
+	return d.addTXTRecord(fqdn, domain, value, d.config.TTL)
 }
 
 // CleanUp removes the TXT record matching the specified parameters.
 func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	fqdn, _ := dns01.GetRecord(domain, keyAuth)
-
-	zone, err := d.getHostedZone(domain)
-	if err != nil {
-		return fmt.Errorf("sakuracloud: %v", err)
-	}
-
-	records := d.findTxtRecords(fqdn, zone)
-
-	for _, record := range records {
-		var updRecords []sacloud.DNSRecordSet
-		for _, r := range zone.Settings.DNS.ResourceRecordSets {
-			if !(r.Name == record.Name && r.Type == record.Type && r.RData == record.RData) {
-				updRecords = append(updRecords, r)
-			}
-		}
-		zone.Settings.DNS.ResourceRecordSets = updRecords
-	}
-
-	_, err = d.client.GetDNSAPI().Update(zone.ID, zone)
-	if err != nil {
-		return fmt.Errorf("sakuracloud: API call failed: %v", err)
-	}
-
-	return nil
+	return d.cleanupTXTRecord(fqdn, domain)
 }
 
 // Timeout returns the timeout and interval to use when checking for DNS propagation.
@@ -126,48 +99,3 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
 	return d.config.PropagationTimeout, d.config.PollingInterval
 }
-
-func (d *DNSProvider) getHostedZone(domain string) (*sacloud.DNS, error) {
-	authZone, err := dns01.FindZoneByFqdn(dns01.ToFqdn(domain))
-	if err != nil {
-		return nil, err
-	}
-
-	zoneName := dns01.UnFqdn(authZone)
-
-	res, err := d.client.GetDNSAPI().WithNameLike(zoneName).Find()
-	if err != nil {
-		if notFound, ok := err.(api.Error); ok && notFound.ResponseCode() == http.StatusNotFound {
-			return nil, fmt.Errorf("zone %s not found on SakuraCloud DNS: %v", zoneName, err)
-		}
-		return nil, fmt.Errorf("API call failed: %v", err)
-	}
-
-	for _, zone := range res.CommonServiceDNSItems {
-		if zone.Name == zoneName {
-			return &zone, nil
-		}
-	}
-
-	return nil, fmt.Errorf("zone %s not found", zoneName)
-}
-
-func (d *DNSProvider) findTxtRecords(fqdn string, zone *sacloud.DNS) []sacloud.DNSRecordSet {
-	recordName := d.extractRecordName(fqdn, zone.Name)
-
-	var res []sacloud.DNSRecordSet
-	for _, record := range zone.Settings.DNS.ResourceRecordSets {
-		if record.Name == recordName && record.Type == "TXT" {
-			res = append(res, record)
-		}
-	}
-	return res
-}
-
-func (d *DNSProvider) extractRecordName(fqdn, domain string) string {
-	name := dns01.UnFqdn(fqdn)
-	if idx := strings.Index(name, "."+domain); idx != -1 {
-		return name[:idx]
-	}
-	return name
-}