From e59e070e986149003eee16fa05aa9c0cecd22156 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 13 Mar 2018 13:57:30 -0700 Subject: [PATCH] Revert "Use API v2 official client" This reverts commit 646edbff2f243a62d33b7210d48d5ad0530c1bf3. --- providers/dnsimple/dnsimple.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/providers/dnsimple/dnsimple.go b/providers/dnsimple/dnsimple.go index 1f623bc..9ff4bbf 100644 --- a/providers/dnsimple/dnsimple.go +++ b/providers/dnsimple/dnsimple.go @@ -6,7 +6,6 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/dnsimple/dnsimple-go/dnsimple" "github.com/juju/ratelimit" "github.com/rancher/external-dns/providers" "github.com/rancher/external-dns/utils" @@ -15,7 +14,6 @@ import ( type DNSimpleProvider struct { client *api.Client - client2 *dnsimple.Client root string limiter *ratelimit.Bucket } @@ -25,8 +23,7 @@ func init() { } func (d *DNSimpleProvider) Init(rootDomainName string) error { - var email, apiToken, oauthToken string - + var email, apiToken string if email = os.Getenv("DNSIMPLE_EMAIL"); len(email) == 0 { return fmt.Errorf("DNSIMPLE_EMAIL is not set") } @@ -35,13 +32,8 @@ func (d *DNSimpleProvider) Init(rootDomainName string) error { return fmt.Errorf("DNSIMPLE_TOKEN is not set") } - if oauthToken = os.Getenv("DNSIMPLE_TOKEN"); len(oauthToken) == 0 { - return fmt.Errorf("DNSIMPLE_TOKEN is not set") - } - d.root = utils.UnFqdn(rootDomainName) d.client = api.NewClient(apiToken, email) - d.client2 = dnsimple.NewClient(dnsimple.NewOauthTokenCredentials(oauthToken)) d.limiter = ratelimit.NewBucketWithRate(1.5, 5) domains, _, err := d.client.Domains.List() @@ -71,7 +63,7 @@ func (*DNSimpleProvider) GetName() string { func (d *DNSimpleProvider) HealthCheck() error { d.limiter.Wait(1) - _, err := d.client2.Identity.Whoami() + _, _, err := d.client.Users.User() return err }