From 6ec0782e0808c5d771eb69f61f99133f7732e6d5 Mon Sep 17 00:00:00 2001 From: Tom Limoncelli Date: Thu, 9 Mar 2023 14:48:38 -0800 Subject: [PATCH] wip! --- .../akamaiedgedns/akamaiEdgeDnsProvider.go | 2 +- providers/hedns/hednsProvider.go | 2 +- providers/softlayer/softlayerProvider.go | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/providers/akamaiedgedns/akamaiEdgeDnsProvider.go b/providers/akamaiedgedns/akamaiEdgeDnsProvider.go index fafbc5294..472b5ac02 100644 --- a/providers/akamaiedgedns/akamaiEdgeDnsProvider.go +++ b/providers/akamaiedgedns/akamaiEdgeDnsProvider.go @@ -125,7 +125,7 @@ func (a *edgeDNSProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mode } func (a *edgeDNSProvider) GetZoneRecordsCorrections(dc *models.DomainConfig, existingRecords models.Records) ([]*models.Correction, error) { - txtutil.SplitSingleLongTxt(records) + txtutil.SplitSingleLongTxt(existingRecords) var corrections []*models.Correction var keysToUpdate map[models.RecordKey][]string diff --git a/providers/hedns/hednsProvider.go b/providers/hedns/hednsProvider.go index 1c4d4cb63..b06169055 100644 --- a/providers/hedns/hednsProvider.go +++ b/providers/hedns/hednsProvider.go @@ -189,7 +189,7 @@ func (c *hednsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models if err != nil { return nil, err } - models.PostProcessRecords(prunedRecords) + models.PostProcessRecords(records) return c.GetZoneRecordsCorrections(dc, records) } diff --git a/providers/softlayer/softlayerProvider.go b/providers/softlayer/softlayerProvider.go index b1af2919a..90f831c08 100644 --- a/providers/softlayer/softlayerProvider.go +++ b/providers/softlayer/softlayerProvider.go @@ -58,13 +58,13 @@ func (s *softlayerProvider) GetNameservers(domain string) ([]*models.Nameserver, return models.ToNameservers([]string{"ns1.softlayer.com", "ns2.softlayer.com"}) } -// GetZoneRecords gets the records of a zone and returns them in RecordConfig format. -func (s *softlayerProvider) GetZoneRecords(domain string) (models.Records, error) { - return nil, fmt.Errorf("not implemented") - // This enables the get-zones subcommand. - // Implement this by extracting the code from GetDomainCorrections into - // a single function. For most providers this should be relatively easy. -} +// // GetZoneRecords gets the records of a zone and returns them in RecordConfig format. +// func (s *softlayerProvider) GetZoneRecords(domain string) (models.Records, error) { +// return nil, fmt.Errorf("not implemented") +// // This enables the get-zones subcommand. +// // Implement this by extracting the code from GetDomainCorrections into +// // a single function. For most providers this should be relatively easy. +// } // GetDomainCorrections returns corrections to update a domain. func (s *softlayerProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) { @@ -85,8 +85,8 @@ func (s *softlayerProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo return s.GetZoneRecordsCorrections(dc, actual) } -func (s *softlayerProvider) GetZoneRecords(domain string) (*models.records, error) { - domain, err := s.getDomain(&dc.Name) +func (s *softlayerProvider) GetZoneRecords(domainName string) (*models.Records, error) { + domain, err := s.getDomain(&domainName) if err != nil { return nil, err } @@ -163,7 +163,7 @@ func (s *softlayerProvider) getDomain(name *string) (*datatypes.Dns_Domain, erro return &domains[0], nil } -func (s *softlayerProvider) getExistingRecords(domain *datatypes.Dns_Domain) ([]*models.RecordConfig, error) { +func (s *softlayerProvider) getExistingRecords(domain *datatypes.Dns_Domain) (models.Records, error) { actual := []*models.RecordConfig{} for _, record := range domain.ResourceRecords {