From 45f36ffd12b0ef086576774f6d85bccadbe72e15 Mon Sep 17 00:00:00 2001 From: Tom Limoncelli Date: Thu, 26 Mar 2020 09:59:59 -0400 Subject: [PATCH] Fix #491 for BIND, HEXONET, LINODE, NAMECHEAP, NS1, OPENSRS, SOFTLAYER, VULTR (#710) * BIND: issues/491 * HEXONET: Fixe #491 * LINODE: Fix #491 * NAMECHEAP: Fix #491 * NS1: Fix #491 * OPENSRS: Fix #491 * SOFTLAYER: Fix #491 * VULTR: Fix #491 --- providers/bind/bindProvider.go | 7 ++++++- providers/hexonet/nameservers.go | 2 +- providers/linode/linodeProvider.go | 2 +- providers/namecheap/namecheapProvider.go | 4 +--- providers/ns1/ns1provider.go | 2 +- providers/opensrs/opensrsProvider.go | 2 +- providers/softlayer/softlayerProvider.go | 3 +-- providers/vultr/vultrProvider.go | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/providers/bind/bindProvider.go b/providers/bind/bindProvider.go index b17db7bc0..862641b57 100644 --- a/providers/bind/bindProvider.go +++ b/providers/bind/bindProvider.go @@ -102,7 +102,12 @@ type Bind struct { // GetNameservers returns the nameservers for a domain. func (c *Bind) GetNameservers(string) ([]*models.Nameserver, error) { - return c.nameservers, nil + var r []string + for _, j := range c.nameservers { + r = append(r, j.Name) + fmt.Printf("DEBUG: %q\n", j.Name) + } + return models.ToNameservers(r) } // ListZones returns all the zones in an account diff --git a/providers/hexonet/nameservers.go b/providers/hexonet/nameservers.go index c34fc4550..d028b3227 100644 --- a/providers/hexonet/nameservers.go +++ b/providers/hexonet/nameservers.go @@ -37,7 +37,7 @@ func (n *HXClient) GetNameservers(domain string) ([]*models.Nameserver, error) { toUse[idx] = matches[0] } } - return models.StringsToNameservers(toUse), nil + return models.ToNameservers(toUse) } func (n *HXClient) getNameserversRaw(domain string) ([]string, error) { diff --git a/providers/linode/linodeProvider.go b/providers/linode/linodeProvider.go index 52f867d44..147c6fc8c 100644 --- a/providers/linode/linodeProvider.go +++ b/providers/linode/linodeProvider.go @@ -98,7 +98,7 @@ func init() { // GetNameservers returns the nameservers for a domain. func (api *LinodeApi) GetNameservers(domain string) ([]*models.Nameserver, error) { - return models.StringsToNameservers(defaultNameServerNames), nil + return models.ToNameservers(defaultNameServerNames) } // GetZoneRecords gets the records of a zone and returns them in RecordConfig format. diff --git a/providers/namecheap/namecheapProvider.go b/providers/namecheap/namecheapProvider.go index 479d93821..f21ea2d26 100644 --- a/providers/namecheap/namecheapProvider.go +++ b/providers/namecheap/namecheapProvider.go @@ -249,9 +249,7 @@ func (n *Namecheap) generateRecords(dc *models.DomainConfig) error { // GetNameservers returns the nameservers for a domain. func (n *Namecheap) GetNameservers(domainName string) ([]*models.Nameserver, error) { // return default namecheap nameservers - ns := NamecheapDefaultNs - - return models.StringsToNameservers(ns), nil + return models.ToNameservers(NamecheapDefaultNs) } // GetRegistrarCorrections returns corrections to update nameservers. diff --git a/providers/ns1/ns1provider.go b/providers/ns1/ns1provider.go index 6d9b6570d..781a4dc87 100644 --- a/providers/ns1/ns1provider.go +++ b/providers/ns1/ns1provider.go @@ -40,7 +40,7 @@ func (n *nsone) GetNameservers(domain string) ([]*models.Nameserver, error) { if err != nil { return nil, err } - return models.StringsToNameservers(z.DNSServers), nil + return models.ToNameservers(z.DNSServers) } // GetZoneRecords gets the records of a zone and returns them in RecordConfig format. diff --git a/providers/opensrs/opensrsProvider.go b/providers/opensrs/opensrsProvider.go index 5956421e2..f130f7e33 100644 --- a/providers/opensrs/opensrsProvider.go +++ b/providers/opensrs/opensrsProvider.go @@ -39,7 +39,7 @@ type OpenSRSApi struct { } func (c *OpenSRSApi) GetNameservers(domainName string) ([]*models.Nameserver, error) { - return models.StringsToNameservers(defaultNameServerNames), nil + return models.ToNameservers(defaultNameServerNames) } func (c *OpenSRSApi) GetRegistrarCorrections(dc *models.DomainConfig) ([]*models.Correction, error) { diff --git a/providers/softlayer/softlayerProvider.go b/providers/softlayer/softlayerProvider.go index 7dbd2b185..c3e0bcc68 100644 --- a/providers/softlayer/softlayerProvider.go +++ b/providers/softlayer/softlayerProvider.go @@ -49,8 +49,7 @@ func newReg(conf map[string]string, _ json.RawMessage) (providers.DNSServiceProv // GetNameservers returns the nameservers for a domain. func (s *SoftLayer) GetNameservers(domain string) ([]*models.Nameserver, error) { // Always use the same nameservers for softlayer - nservers := []string{"ns1.softlayer.com", "ns2.softlayer.com"} - return models.StringsToNameservers(nservers), nil + return models.ToNameservers([]string{"ns1.softlayer.com", "ns2.softlayer.com"}) } // GetZoneRecords gets the records of a zone and returns them in RecordConfig format. diff --git a/providers/vultr/vultrProvider.go b/providers/vultr/vultrProvider.go index 0c710ef7b..27be6360f 100644 --- a/providers/vultr/vultrProvider.go +++ b/providers/vultr/vultrProvider.go @@ -137,7 +137,7 @@ func (api *Provider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Co // GetNameservers gets the Vultr nameservers for a domain func (api *Provider) GetNameservers(domain string) ([]*models.Nameserver, error) { - return models.StringsToNameservers(defaultNS), nil + return models.ToNameservers(defaultNS) } // EnsureDomainExists adds a domain to the Vutr DNS service if it does not exist