Use DNSimple official Go client (#363)

providers/dns/dnsimple/dnsimple.go

@@ -5,9 +5,10 @@ package dnsimple
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
-	"github.com/weppos/dnsimple-go/dnsimple"
+	"github.com/dnsimple/dnsimple-go/dnsimple"
 	"github.com/xenolf/lego/acme"
 )
 
@@ -17,37 +18,50 @@ type DNSProvider struct {
 }
 
 // NewDNSProvider returns a DNSProvider instance configured for dnsimple.
-// Credentials must be passed in the environment variables: DNSIMPLE_EMAIL
+// Credentials must be passed in the environment variables: DNSIMPLE_OAUTH_TOKEN.
-// and DNSIMPLE_API_KEY.
+//
+// See: https://developer.dnsimple.com/v2/#authentication
 func NewDNSProvider() (*DNSProvider, error) {
-	email := os.Getenv("DNSIMPLE_EMAIL")
+	accessToken := os.Getenv("DNSIMPLE_OAUTH_TOKEN")
-	key := os.Getenv("DNSIMPLE_API_KEY")
+	baseUrl := os.Getenv("DNSIMPLE_BASE_URL")
-	return NewDNSProviderCredentials(email, key)
+
+	return NewDNSProviderCredentials(accessToken, baseUrl)
 }
 
 // NewDNSProviderCredentials uses the supplied credentials to return a
 // DNSProvider instance configured for dnsimple.
-func NewDNSProviderCredentials(email, key string) (*DNSProvider, error) {
+func NewDNSProviderCredentials(accessToken, baseUrl string) (*DNSProvider, error) {
-	if email == "" || key == "" {
+	if accessToken == "" {
-		return nil, fmt.Errorf("DNSimple credentials missing")
+		return nil, fmt.Errorf("DNSimple OAuth token missing")
 	}
 
-	return &DNSProvider{
+	client := dnsimple.NewClient(dnsimple.NewOauthTokenCredentials(accessToken))
-		client: dnsimple.NewClient(key, email),
+	client.UserAgent = "lego"
-	}, nil
+
+	if baseUrl != "" {
+		client.BaseURL = baseUrl
+	}
+
+	return &DNSProvider{client: client}, nil
 }
 
 // Present creates a TXT record to fulfil the dns-01 challenge.
 func (c *DNSProvider) Present(domain, token, keyAuth string) error {
 	fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
 
-	zoneID, zoneName, err := c.getHostedZone(domain)
+	zoneName, err := c.getHostedZone(domain)
+
+	if err != nil {
+		return err
+	}
+
+	accountID, err := c.getAccountID()
 	if err != nil {
 		return err
 	}
 
 	recordAttributes := c.newTxtRecord(zoneName, fqdn, value, ttl)
-	_, _, err = c.client.Domains.CreateRecord(zoneID, *recordAttributes)
+	_, err = c.client.Zones.CreateRecord(accountID, zoneName, *recordAttributes)
 	if err != nil {
 		return fmt.Errorf("DNSimple API call failed: %v", err)
 	}
@@ -64,67 +78,79 @@ func (c *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 		return err
 	}
 
+	accountID, err := c.getAccountID()
+	if err != nil {
+		return err
+	}
+
 	for _, rec := range records {
-		_, err := c.client.Domains.DeleteRecord(rec.DomainId, rec.Id)
+		_, err := c.client.Zones.DeleteRecord(accountID, rec.ZoneID, rec.ID)
 		if err != nil {
 			return err
 		}
 	}
+
 	return nil
 }
 
-func (c *DNSProvider) getHostedZone(domain string) (string, string, error) {
+func (c *DNSProvider) getHostedZone(domain string) (string, error) {
-	zones, _, err := c.client.Domains.List()
-	if err != nil {
-		return "", "", fmt.Errorf("DNSimple API call failed: %v", err)
-	}
-
 	authZone, err := acme.FindZoneByFqdn(acme.ToFqdn(domain), acme.RecursiveNameservers)
 	if err != nil {
-		return "", "", err
+		return "", err
 	}
 
-	var hostedZone dnsimple.Domain
+	accountID, err := c.getAccountID()
-	for _, zone := range zones {
+	if err != nil {
-		if zone.Name == acme.UnFqdn(authZone) {
+		return "", err
+	}
+
+	zoneName := acme.UnFqdn(authZone)
+
+	zones, err := c.client.Zones.ListZones(accountID, &dnsimple.ZoneListOptions{NameLike: zoneName})
+	if err != nil {
+		return "", fmt.Errorf("DNSimple API call failed: %v", err)
+	}
+
+	var hostedZone dnsimple.Zone
+	for _, zone := range zones.Data {
+		if zone.Name == zoneName {
 			hostedZone = zone
 		}
 	}
 
-	if hostedZone.Id == 0 {
+	if hostedZone.ID == 0 {
-		return "", "", fmt.Errorf("Zone %s not found in DNSimple for domain %s", authZone, domain)
+		return "", fmt.Errorf("Zone %s not found in DNSimple for domain %s", authZone, domain)
 
 	}
 
-	return fmt.Sprintf("%v", hostedZone.Id), hostedZone.Name, nil
+	return hostedZone.Name, nil
 }
 
-func (c *DNSProvider) findTxtRecords(domain, fqdn string) ([]dnsimple.Record, error) {
+func (c *DNSProvider) findTxtRecords(domain, fqdn string) ([]dnsimple.ZoneRecord, error) {
-	zoneID, zoneName, err := c.getHostedZone(domain)
+	zoneName, err := c.getHostedZone(domain)
 	if err != nil {
 		return nil, err
 	}
 
-	var records []dnsimple.Record
+	accountID, err := c.getAccountID()
-	result, _, err := c.client.Domains.ListRecords(zoneID, "", "TXT")
 	if err != nil {
-		return records, fmt.Errorf("DNSimple API call has failed: %v", err)
+		return nil, err
 	}
 
 	recordName := c.extractRecordName(fqdn, zoneName)
-	for _, record := range result {
+
-		if record.Name == recordName {
+	result, err := c.client.Zones.ListRecords(accountID, zoneName, &dnsimple.ZoneRecordListOptions{Name: recordName, Type: "TXT", ListOptions: dnsimple.ListOptions{}})
-			records = append(records, record)
+	if err != nil {
-		}
+		return []dnsimple.ZoneRecord{}, fmt.Errorf("DNSimple API call has failed: %v", err)
 	}
 
-	return records, nil
+	return result.Data, nil
 }
 
-func (c *DNSProvider) newTxtRecord(zone, fqdn, value string, ttl int) *dnsimple.Record {
+func (c *DNSProvider) newTxtRecord(zoneName, fqdn, value string, ttl int) *dnsimple.ZoneRecord {
-	name := c.extractRecordName(fqdn, zone)
+	name := c.extractRecordName(fqdn, zoneName)
 
-	return &dnsimple.Record{
+	return &dnsimple.ZoneRecord{
 		Type:    "TXT",
 		Name:    name,
 		Content: value,
@@ -139,3 +165,16 @@ func (c *DNSProvider) extractRecordName(fqdn, domain string) string {
 	}
 	return name
 }
+
+func (c *DNSProvider) getAccountID() (string, error) {
+	whoamiResponse, err := c.client.Identity.Whoami()
+	if err != nil {
+		return "", err
+	}
+
+	if whoamiResponse.Data.Account == nil {
+		return "", fmt.Errorf("DNSimple API returned empty account ID")
+	}
+
+	return strconv.Itoa(whoamiResponse.Data.Account.ID), nil
+}

providers/dns/dnsimple/dnsimple_test.go

@@ -9,61 +9,122 @@ import (
 )
 
 var (
-	dnsimpleLiveTest bool
+	dnsimpleLiveTest   bool
-	dnsimpleEmail    string
+	dnsimpleOauthToken string
-	dnsimpleAPIKey   string
+	dnsimpleDomain     string
-	dnsimpleDomain   string
+	dnsimpleBaseUrl    string
 )
 
 func init() {
-	dnsimpleEmail = os.Getenv("DNSIMPLE_EMAIL")
+	dnsimpleOauthToken = os.Getenv("DNSIMPLE_OAUTH_TOKEN")
-	dnsimpleAPIKey = os.Getenv("DNSIMPLE_API_KEY")
 	dnsimpleDomain = os.Getenv("DNSIMPLE_DOMAIN")
-	if len(dnsimpleEmail) > 0 && len(dnsimpleAPIKey) > 0 && len(dnsimpleDomain) > 0 {
+	dnsimpleBaseUrl = "https://api.sandbox.dnsimple.com"
+
+	if len(dnsimpleOauthToken) > 0 && len(dnsimpleDomain) > 0 {
+		baseUrl := os.Getenv("DNSIMPLE_BASE_URL")
+
+		if baseUrl != "" {
+			dnsimpleBaseUrl = baseUrl
+		}
+
 		dnsimpleLiveTest = true
 	}
 }
 
 func restoreDNSimpleEnv() {
-	os.Setenv("DNSIMPLE_EMAIL", dnsimpleEmail)
+	os.Setenv("DNSIMPLE_OAUTH_TOKEN", dnsimpleOauthToken)
-	os.Setenv("DNSIMPLE_API_KEY", dnsimpleAPIKey)
+	os.Setenv("DNSIMPLE_BASE_URL", dnsimpleBaseUrl)
 }
 
+//
+// NewDNSProvider
+//
+
 func TestNewDNSProviderValid(t *testing.T) {
-	os.Setenv("DNSIMPLE_EMAIL", "")
+	defer restoreDNSimpleEnv()
-	os.Setenv("DNSIMPLE_API_KEY", "")
+
-	_, err := NewDNSProviderCredentials("example@example.com", "123")
+	os.Setenv("DNSIMPLE_OAUTH_TOKEN", "123")
+	provider, err := NewDNSProvider()
+
+	assert.NotNil(t, provider)
+	assert.Equal(t, "lego", provider.client.UserAgent)
 	assert.NoError(t, err)
-	restoreDNSimpleEnv()
-}
-func TestNewDNSProviderValidEnv(t *testing.T) {
-	os.Setenv("DNSIMPLE_EMAIL", "example@example.com")
-	os.Setenv("DNSIMPLE_API_KEY", "123")
-	_, err := NewDNSProvider()
-	assert.NoError(t, err)
-	restoreDNSimpleEnv()
 }
 
-func TestNewDNSProviderMissingCredErr(t *testing.T) {
+func TestNewDNSProviderValidWithBaseUrl(t *testing.T) {
-	os.Setenv("DNSIMPLE_EMAIL", "")
+	defer restoreDNSimpleEnv()
-	os.Setenv("DNSIMPLE_API_KEY", "")
+
-	_, err := NewDNSProvider()
+	os.Setenv("DNSIMPLE_OAUTH_TOKEN", "123")
-	assert.EqualError(t, err, "DNSimple credentials missing")
+	os.Setenv("DNSIMPLE_BASE_URL", "https://api.dnsimple.test")
-	restoreDNSimpleEnv()
+	provider, err := NewDNSProvider()
+
+	assert.NotNil(t, provider)
+	assert.NoError(t, err)
+
+	assert.Equal(t, provider.client.BaseURL, "https://api.dnsimple.test")
 }
 
+func TestNewDNSProviderInvalidWithMissingOauthToken(t *testing.T) {
+	if dnsimpleLiveTest {
+		t.Skip("skipping test in live mode")
+	}
+
+	defer restoreDNSimpleEnv()
+
+	provider, err := NewDNSProvider()
+
+	assert.Nil(t, provider)
+	assert.EqualError(t, err, "DNSimple OAuth token missing")
+}
+
+//
+// NewDNSProviderCredentials
+//
+
+func TestNewDNSProviderCredentialsValid(t *testing.T) {
+	provider, err := NewDNSProviderCredentials("123", "")
+
+	assert.NotNil(t, provider)
+	assert.Equal(t, "lego", provider.client.UserAgent)
+	assert.NoError(t, err)
+}
+
+func TestNewDNSProviderCredentialsValidWithBaseUrl(t *testing.T) {
+	provider, err := NewDNSProviderCredentials("123", "https://api.dnsimple.test")
+
+	assert.NotNil(t, provider)
+	assert.NoError(t, err)
+
+	assert.Equal(t, provider.client.BaseURL, "https://api.dnsimple.test")
+}
+
+func TestNewDNSProviderCredentialsInvalidWithMissingOauthToken(t *testing.T) {
+	provider, err := NewDNSProviderCredentials("", "")
+
+	assert.Nil(t, provider)
+	assert.EqualError(t, err, "DNSimple OAuth token missing")
+}
+
+//
+// Present
+//
+
 func TestLiveDNSimplePresent(t *testing.T) {
 	if !dnsimpleLiveTest {
 		t.Skip("skipping live test")
 	}
 
-	provider, err := NewDNSProviderCredentials(dnsimpleEmail, dnsimpleAPIKey)
+	provider, err := NewDNSProviderCredentials(dnsimpleOauthToken, dnsimpleBaseUrl)
 	assert.NoError(t, err)
 
 	err = provider.Present(dnsimpleDomain, "", "123d==")
 	assert.NoError(t, err)
 }
 
+//
+// Cleanup
+//
+
 func TestLiveDNSimpleCleanUp(t *testing.T) {
 	if !dnsimpleLiveTest {
 		t.Skip("skipping live test")
@@ -71,7 +132,7 @@ func TestLiveDNSimpleCleanUp(t *testing.T) {
 
 	time.Sleep(time.Second * 1)
 
-	provider, err := NewDNSProviderCredentials(dnsimpleEmail, dnsimpleAPIKey)
+	provider, err := NewDNSProviderCredentials(dnsimpleOauthToken, dnsimpleBaseUrl)
 	assert.NoError(t, err)
 
 	err = provider.CleanUp(dnsimpleDomain, "", "123d==")