Update lego

vendor/github.com/xenolf/lego/providers/dns/exoscale/exoscale.go

@@ -5,15 +5,43 @@ package exoscale
 import (
 	"errors"
 	"fmt"
+	"net/http"
 	"os"
+	"time"
 
 	"github.com/exoscale/egoscale"
 	"github.com/xenolf/lego/acme"
 	"github.com/xenolf/lego/platform/config/env"
 )
 
+const defaultBaseURL = "https://api.exoscale.ch/dns"
+
+// Config is used to configure the creation of the DNSProvider
+type Config struct {
+	APIKey             string
+	APISecret          string
+	Endpoint           string
+	HTTPClient         *http.Client
+	PropagationTimeout time.Duration
+	PollingInterval    time.Duration
+	TTL                int
+}
+
+// NewDefaultConfig returns a default configuration for the DNSProvider
+func NewDefaultConfig() *Config {
+	return &Config{
+		TTL:                env.GetOrDefaultInt("EXOSCALE_TTL", 120),
+		PropagationTimeout: env.GetOrDefaultSecond("EXOSCALE_PROPAGATION_TIMEOUT", acme.DefaultPropagationTimeout),
+		PollingInterval:    env.GetOrDefaultSecond("EXOSCALE_POLLING_INTERVAL", acme.DefaultPollingInterval),
+		HTTPClient: &http.Client{
+			Timeout: env.GetOrDefaultSecond("EXOSCALE_HTTP_TIMEOUT", 0),
+		},
+	}
+}
+
 // DNSProvider is an implementation of the acme.ChallengeProvider interface.
 type DNSProvider struct {
+	config *Config
 	client *egoscale.Client
 }
 
@@ -22,32 +50,52 @@ type DNSProvider struct {
 func NewDNSProvider() (*DNSProvider, error) {
 	values, err := env.Get("EXOSCALE_API_KEY", "EXOSCALE_API_SECRET")
 	if err != nil {
-		return nil, fmt.Errorf("Exoscale: %v", err)
+		return nil, fmt.Errorf("exoscale: %v", err)
 	}
 
-	endpoint := os.Getenv("EXOSCALE_ENDPOINT")
-	return NewDNSProviderClient(values["EXOSCALE_API_KEY"], values["EXOSCALE_API_SECRET"], endpoint)
+	config := NewDefaultConfig()
+	config.APIKey = values["EXOSCALE_API_KEY"]
+	config.APISecret = values["EXOSCALE_API_SECRET"]
+	config.Endpoint = os.Getenv("EXOSCALE_ENDPOINT")
+
+	return NewDNSProviderConfig(config)
 }
 
-// NewDNSProviderClient Uses the supplied parameters to return a DNSProvider instance
-// configured for Exoscale.
+// NewDNSProviderClient Uses the supplied parameters
+// to return a DNSProvider instance configured for Exoscale.
+// Deprecated
 func NewDNSProviderClient(key, secret, endpoint string) (*DNSProvider, error) {
-	if key == "" || secret == "" {
-		return nil, fmt.Errorf("Exoscale credentials missing")
+	config := NewDefaultConfig()
+	config.APIKey = key
+	config.APISecret = secret
+	config.Endpoint = endpoint
+
+	return NewDNSProviderConfig(config)
+}
+
+// NewDNSProviderConfig return a DNSProvider instance configured for Exoscale.
+func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
+	if config == nil {
+		return nil, errors.New("the configuration of the DNS provider is nil")
 	}
 
-	if endpoint == "" {
-		endpoint = "https://api.exoscale.ch/dns"
+	if config.APIKey == "" || config.APISecret == "" {
+		return nil, fmt.Errorf("exoscale: credentials missing")
 	}
 
-	return &DNSProvider{
-		client: egoscale.NewClient(endpoint, key, secret),
-	}, nil
+	if config.Endpoint == "" {
+		config.Endpoint = defaultBaseURL
+	}
+
+	client := egoscale.NewClient(config.Endpoint, config.APIKey, config.APISecret)
+	client.HTTPClient = config.HTTPClient
+
+	return &DNSProvider{client: client, config: config}, nil
 }
 
 // Present creates a TXT record to fulfil the dns-01 challenge.
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
-	fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
+	fqdn, value, _ := acme.DNS01Record(domain, keyAuth)
 	zone, recordName, err := d.FindZoneAndRecordName(fqdn, domain)
 	if err != nil {
 		return err
@@ -61,7 +109,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 	if recordID == 0 {
 		record := egoscale.DNSRecord{
 			Name:       recordName,
-			TTL:        ttl,
+			TTL:        d.config.TTL,
 			Content:    value,
 			RecordType: "TXT",
 		}
@@ -74,7 +122,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 		record := egoscale.UpdateDNSRecord{
 			ID:         recordID,
 			Name:       recordName,
-			TTL:        ttl,
+			TTL:        d.config.TTL,
 			Content:    value,
 			RecordType: "TXT",
 		}
@@ -111,6 +159,12 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	return nil
 }
 
+// Timeout returns the timeout and interval to use when checking for DNS propagation.
+// Adjusting here to cope with spikes in propagation times.
+func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
+	return d.config.PropagationTimeout, d.config.PollingInterval
+}
+
 // FindExistingRecordID Query Exoscale to find an existing record for this name.
 // Returns nil if no record could be found
 func (d *DNSProvider) FindExistingRecordID(zone, recordName string) (int64, error) {