Update lego

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

@@ -3,6 +3,7 @@
 package nifcloud
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -12,49 +13,110 @@ import (
 	"github.com/xenolf/lego/platform/config/env"
 )
 
+// Config is used to configure the creation of the DNSProvider
+type Config struct {
+	BaseURL            string
+	AccessKey          string
+	SecretKey          string
+	PropagationTimeout time.Duration
+	PollingInterval    time.Duration
+	TTL                int
+	HTTPClient         *http.Client
+}
+
+// NewDefaultConfig returns a default configuration for the DNSProvider
+func NewDefaultConfig() *Config {
+	return &Config{
+		TTL:                env.GetOrDefaultInt("NIFCLOUD_TTL", 120),
+		PropagationTimeout: env.GetOrDefaultSecond("NIFCLOUD_PROPAGATION_TIMEOUT", acme.DefaultPropagationTimeout),
+		PollingInterval:    env.GetOrDefaultSecond("NIFCLOUD_POLLING_INTERVAL", acme.DefaultPollingInterval),
+		HTTPClient: &http.Client{
+			Timeout: env.GetOrDefaultSecond("NIFCLOUD_HTTP_TIMEOUT", 30*time.Second),
+		},
+	}
+}
+
 // DNSProvider implements the acme.ChallengeProvider interface
 type DNSProvider struct {
 	client *Client
+	config *Config
 }
 
 // NewDNSProvider returns a DNSProvider instance configured for the NIFCLOUD DNS service.
-// Credentials must be passed in the environment variables: NIFCLOUD_ACCESS_KEY_ID and NIFCLOUD_SECRET_ACCESS_KEY.
+// Credentials must be passed in the environment variables:
+// NIFCLOUD_ACCESS_KEY_ID and NIFCLOUD_SECRET_ACCESS_KEY.
 func NewDNSProvider() (*DNSProvider, error) {
 	values, err := env.Get("NIFCLOUD_ACCESS_KEY_ID", "NIFCLOUD_SECRET_ACCESS_KEY")
 	if err != nil {
-		return nil, fmt.Errorf("NIFCLOUD: %v", err)
+		return nil, fmt.Errorf("nifcloud: %v", err)
 	}
 
-	endpoint := os.Getenv("NIFCLOUD_DNS_ENDPOINT")
-	if endpoint == "" {
-		endpoint = defaultEndpoint
-	}
+	config := NewDefaultConfig()
+	config.BaseURL = os.Getenv("NIFCLOUD_DNS_ENDPOINT")
+	config.AccessKey = values["NIFCLOUD_ACCESS_KEY_ID"]
+	config.SecretKey = values["NIFCLOUD_SECRET_ACCESS_KEY"]
 
-	httpClient := &http.Client{Timeout: 30 * time.Second}
-
-	return NewDNSProviderCredentials(httpClient, endpoint, values["NIFCLOUD_ACCESS_KEY_ID"], values["NIFCLOUD_SECRET_ACCESS_KEY"])
+	return NewDNSProviderConfig(config)
 }
 
-// NewDNSProviderCredentials uses the supplied credentials to return a
-// DNSProvider instance configured for NIFCLOUD.
+// NewDNSProviderCredentials uses the supplied credentials
+// to return a DNSProvider instance configured for NIFCLOUD.
+// Deprecated
 func NewDNSProviderCredentials(httpClient *http.Client, endpoint, accessKey, secretKey string) (*DNSProvider, error) {
-	client := newClient(httpClient, accessKey, secretKey, endpoint)
+	config := NewDefaultConfig()
+	config.HTTPClient = httpClient
+	config.BaseURL = endpoint
+	config.AccessKey = accessKey
+	config.SecretKey = secretKey
 
-	return &DNSProvider{
-		client: client,
-	}, nil
+	return NewDNSProviderConfig(config)
+}
+
+// NewDNSProviderConfig return a DNSProvider instance configured for NIFCLOUD.
+func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
+	if config == nil {
+		return nil, errors.New("nifcloud: the configuration of the DNS provider is nil")
+	}
+
+	client := NewClient(config.AccessKey, config.SecretKey)
+
+	if config.HTTPClient != nil {
+		client.HTTPClient = config.HTTPClient
+	}
+
+	if len(config.BaseURL) > 0 {
+		client.BaseURL = config.BaseURL
+	}
+
+	return &DNSProvider{client: client, config: config}, nil
 }
 
 // Present creates a TXT record using the specified parameters
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
-	fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
-	return d.changeRecord("CREATE", fqdn, value, domain, ttl)
+	fqdn, value, _ := acme.DNS01Record(domain, keyAuth)
+
+	err := d.changeRecord("CREATE", fqdn, value, domain, d.config.TTL)
+	if err != nil {
+		return fmt.Errorf("nifcloud: %v", err)
+	}
+	return err
 }
 
 // CleanUp removes the TXT record matching the specified parameters
 func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
-	fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
-	return d.changeRecord("DELETE", fqdn, value, domain, ttl)
+	fqdn, value, _ := acme.DNS01Record(domain, keyAuth)
+
+	err := d.changeRecord("DELETE", fqdn, value, domain, d.config.TTL)
+	if err != nil {
+		return fmt.Errorf("nifcloud: %v", err)
+	}
+	return err
+}
+
+// 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
 }
 
 func (d *DNSProvider) changeRecord(action, fqdn, value, domain string, ttl int) error {