1
0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00

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
This commit is contained in:
Tom Limoncelli
2020-03-26 09:59:59 -04:00
committed by GitHub
parent 34c73d4025
commit 45f36ffd12
8 changed files with 13 additions and 11 deletions

View File

@ -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

View File

@ -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) {

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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) {

View File

@ -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.

View File

@ -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