Update lego

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

@@ -3,6 +3,7 @@
 package vegadns
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -13,8 +14,28 @@ import (
 	"github.com/xenolf/lego/platform/config/env"
 )
 
+// Config is used to configure the creation of the DNSProvider
+type Config struct {
+	BaseURL            string
+	APIKey             string
+	APISecret          string
+	PropagationTimeout time.Duration
+	PollingInterval    time.Duration
+	TTL                int
+}
+
+// NewDefaultConfig returns a default configuration for the DNSProvider
+func NewDefaultConfig() *Config {
+	return &Config{
+		TTL:                env.GetOrDefaultInt("VEGADNS_TTL", 10),
+		PropagationTimeout: env.GetOrDefaultSecond("VEGADNS_PROPAGATION_TIMEOUT", 12*time.Minute),
+		PollingInterval:    env.GetOrDefaultSecond("VEGADNS_POLLING_INTERVAL", 1*time.Minute),
+	}
+}
+
 // DNSProvider describes a provider for VegaDNS
 type DNSProvider struct {
+	config *Config
 	client vegaClient.VegaDNSClient
 }
 
@@ -24,62 +45,83 @@ type DNSProvider struct {
 func NewDNSProvider() (*DNSProvider, error) {
 	values, err := env.Get("VEGADNS_URL")
 	if err != nil {
-		return nil, fmt.Errorf("VegaDNS: %v", err)
+		return nil, fmt.Errorf("vegadns: %v", err)
 	}
 
-	key := os.Getenv("SECRET_VEGADNS_KEY")
-	secret := os.Getenv("SECRET_VEGADNS_SECRET")
+	config := NewDefaultConfig()
+	config.BaseURL = values["VEGADNS_URL"]
+	config.APIKey = os.Getenv("SECRET_VEGADNS_KEY")
+	config.APISecret = os.Getenv("SECRET_VEGADNS_SECRET")
 
-	return NewDNSProviderCredentials(values["VEGADNS_URL"], key, secret)
+	return NewDNSProviderConfig(config)
 }
 
-// NewDNSProviderCredentials uses the supplied credentials to return a
-// DNSProvider instance configured for VegaDNS.
+// NewDNSProviderCredentials uses the supplied credentials
+// to return a DNSProvider instance configured for VegaDNS.
+// Deprecated
 func NewDNSProviderCredentials(vegaDNSURL string, key string, secret string) (*DNSProvider, error) {
-	vega := vegaClient.NewVegaDNSClient(vegaDNSURL)
-	vega.APIKey = key
-	vega.APISecret = secret
+	config := NewDefaultConfig()
+	config.BaseURL = vegaDNSURL
+	config.APIKey = key
+	config.APISecret = secret
 
-	return &DNSProvider{
-		client: vega,
-	}, nil
+	return NewDNSProviderConfig(config)
 }
 
-// Timeout returns the timeout and interval to use when checking for DNS
-// propagation. Adjusting here to cope with spikes in propagation times.
-func (r *DNSProvider) Timeout() (timeout, interval time.Duration) {
-	timeout = 12 * time.Minute
-	interval = 1 * time.Minute
-	return
+// NewDNSProviderConfig return a DNSProvider instance configured for VegaDNS.
+func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
+	if config == nil {
+		return nil, errors.New("vegadns: the configuration of the DNS provider is nil")
+	}
+
+	vega := vegaClient.NewVegaDNSClient(config.BaseURL)
+	vega.APIKey = config.APIKey
+	vega.APISecret = config.APISecret
+
+	return &DNSProvider{client: vega, config: config}, 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
 }
 
 // Present creates a TXT record to fulfil the dns-01 challenge
-func (r *DNSProvider) Present(domain, token, keyAuth string) error {
+func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 	fqdn, value, _ := acme.DNS01Record(domain, keyAuth)
 
-	_, domainID, err := r.client.GetAuthZone(fqdn)
+	_, domainID, err := d.client.GetAuthZone(fqdn)
 	if err != nil {
-		return fmt.Errorf("can't find Authoritative Zone for %s in Present: %v", fqdn, err)
+		return fmt.Errorf("vegadns: can't find Authoritative Zone for %s in Present: %v", fqdn, err)
 	}
 
-	return r.client.CreateTXT(domainID, fqdn, value, 10)
+	err = d.client.CreateTXT(domainID, fqdn, value, d.config.TTL)
+	if err != nil {
+		return fmt.Errorf("vegadns: %v", err)
+	}
+	return nil
 }
 
 // CleanUp removes the TXT record matching the specified parameters
-func (r *DNSProvider) CleanUp(domain, token, keyAuth string) error {
+func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	fqdn, _, _ := acme.DNS01Record(domain, keyAuth)
 
-	_, domainID, err := r.client.GetAuthZone(fqdn)
+	_, domainID, err := d.client.GetAuthZone(fqdn)
 	if err != nil {
-		return fmt.Errorf("can't find Authoritative Zone for %s in CleanUp: %v", fqdn, err)
+		return fmt.Errorf("vegadns: can't find Authoritative Zone for %s in CleanUp: %v", fqdn, err)
 	}
 
 	txt := strings.TrimSuffix(fqdn, ".")
 
-	recordID, err := r.client.GetRecordID(domainID, txt, "TXT")
+	recordID, err := d.client.GetRecordID(domainID, txt, "TXT")
 	if err != nil {
-		return fmt.Errorf("couldn't get Record ID in CleanUp: %s", err)
+		return fmt.Errorf("vegadns: couldn't get Record ID in CleanUp: %s", err)
 	}
 
-	return r.client.DeleteRecord(recordID)
+	err = d.client.DeleteRecord(recordID)
+	if err != nil {
+		return fmt.Errorf("vegadns: %v", err)
+	}
+	return nil
 }