StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-09-12 16:14:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

DNSMADEEASY: populate zone cache after creating zone (#3333)

Browse source
This commit is contained in:
Jakob Ackermann 2025-02-12 20:00:42 +00:00 • committed by GitHub
parent 0d92d7a33f
commit ea645bfde2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
providers/dnsmadeeasy/api.go
View file

@ -11,7 +11,7 @@ import (
type dnsMadeEasyProvider struct { type dnsMadeEasyProvider struct {
restAPI *dnsMadeEasyRestAPI restAPI *dnsMadeEasyRestAPI
domains map[string]multiDomainResponseDataEntry domains map[string]int
} }
func newProvider(apiKey string, secretKey string, sandbox bool, debug bool) *dnsMadeEasyProvider { func newProvider(apiKey string, secretKey string, sandbox bool, debug bool) *dnsMadeEasyProvider {
@ -41,7 +41,7 @@ func (api *dnsMadeEasyProvider) loadDomains() error {
return nil return nil
} }
domains := map[string]multiDomainResponseDataEntry{} domains := map[string]int{}
res, err := api.restAPI.multiDomainGet() res, err := api.restAPI.multiDomainGet()
if err != nil { if err != nil {
@ -53,7 +53,7 @@ func (api *dnsMadeEasyProvider) loadDomains() error {
return errors.New("fetching domains from DNSMADEEASY failed: domains with GTD enabled are not supported") return errors.New("fetching domains from DNSMADEEASY failed: domains with GTD enabled are not supported")
} }
domains[domain.Name] = domain domains[domain.Name] = domain.ID
} }
api.domains = domains api.domains = domains
@ -71,26 +71,26 @@ func (api *dnsMadeEasyProvider) domainExists(name string) (bool, error) {
return ok, nil return ok, nil
} }
func (api *dnsMadeEasyProvider) findDomain(name string) (*multiDomainResponseDataEntry, error) { func (api *dnsMadeEasyProvider) findDomainId(name string) (int, error) {
if err := api.loadDomains(); err != nil { if err := api.loadDomains(); err != nil {
return nil, err return 0, err
} }
domain, ok := api.domains[name] domain, ok := api.domains[name]
if !ok { if !ok {
return nil, fmt.Errorf("domain not found on this DNSMADEEASY account: %q", name) return 0, fmt.Errorf("domain not found on this DNSMADEEASY account: %q", name)
} }
return &domain, nil return domain, nil
} }
func (api *dnsMadeEasyProvider) fetchDomainRecords(domainName string) ([]recordResponseDataEntry, error) { func (api *dnsMadeEasyProvider) fetchDomainRecords(domainName string) ([]recordResponseDataEntry, error) {
domain, err := api.findDomain(domainName) domainId, err := api.findDomainId(domainName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
res, err := api.restAPI.recordGet(domain.ID) res, err := api.restAPI.recordGet(domainId)
if err != nil { if err != nil {
return nil, fmt.Errorf("fetching records failed: %w", err) return nil, fmt.Errorf("fetching records failed: %w", err)
} }
@ -108,12 +108,12 @@ func (api *dnsMadeEasyProvider) fetchDomainRecords(domainName string) ([]recordR
} }
func (api *dnsMadeEasyProvider) fetchDomainNameServers(domainName string) ([]string, error) { func (api *dnsMadeEasyProvider) fetchDomainNameServers(domainName string) ([]string, error) {
domain, err := api.findDomain(domainName) domainId, err := api.findDomainId(domainName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
res, err := api.restAPI.singleDomainGet(domain.ID) res, err := api.restAPI.singleDomainGet(domainId)
if err != nil { if err != nil {
return nil, fmt.Errorf("fetching domain from DNSMADEEASY failed: %w", err) return nil, fmt.Errorf("fetching domain from DNSMADEEASY failed: %w", err)
} }
@ -127,13 +127,12 @@ func (api *dnsMadeEasyProvider) fetchDomainNameServers(domainName string) ([]str
} }
func (api *dnsMadeEasyProvider) createDomain(domain string) error { func (api *dnsMadeEasyProvider) createDomain(domain string) error {
_, err := api.restAPI.singleDomainCreate(singleDomainRequestData{Name: domain}) res, err := api.restAPI.singleDomainCreate(singleDomainRequestData{Name: domain})
if err != nil { if err != nil {
return err return err
} }
// reset cached domains after adding a new one, they will be refetched when needed api.domains[domain] = res.ID
api.domains = nil
return nil return nil
} }

8
providers/dnsmadeeasy/dnsMadeEasyProvider.go
View file

@ -105,7 +105,7 @@ func New(settings map[string]string, _ json.RawMessage) (providers.DNSServicePro
func (api *dnsMadeEasyProvider) GetZoneRecordsCorrections(dc *models.DomainConfig, existingRecords models.Records) ([]*models.Correction, int, error) { func (api *dnsMadeEasyProvider) GetZoneRecordsCorrections(dc *models.DomainConfig, existingRecords models.Records) ([]*models.Correction, int, error) {
domainName := dc.Name domainName := dc.Name
domain, err := api.findDomain(domainName) domainId, err := api.findDomainId(domainName)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
@ -139,7 +139,7 @@ func (api *dnsMadeEasyProvider) GetZoneRecordsCorrections(dc *models.DomainConfi
corr := &models.Correction{ corr := &models.Correction{
Msg: strings.Join(deleteDescription, "\n\t"), Msg: strings.Join(deleteDescription, "\n\t"),
F: func() error { F: func() error {
return api.deleteRecords(domain.ID, deleteRecordIds) return api.deleteRecords(domainId, deleteRecordIds)
}, },
} }
corrections = append(corrections, corr) corrections = append(corrections, corr)
@ -157,7 +157,7 @@ func (api *dnsMadeEasyProvider) GetZoneRecordsCorrections(dc *models.DomainConfi
corr := &models.Correction{ corr := &models.Correction{
Msg: strings.Join(createDescription, "\n\t"), Msg: strings.Join(createDescription, "\n\t"),
F: func() error { F: func() error {
return api.createRecords(domain.ID, createRecords) return api.createRecords(domainId, createRecords)
}, },
} }
corrections = append(corrections, corr) corrections = append(corrections, corr)
@ -180,7 +180,7 @@ func (api *dnsMadeEasyProvider) GetZoneRecordsCorrections(dc *models.DomainConfi
corr := &models.Correction{ corr := &models.Correction{
Msg: strings.Join(modifyDescription, "\n\t"), Msg: strings.Join(modifyDescription, "\n\t"),
F: func() error { F: func() error {
return api.updateRecords(domain.ID, modifyRecords) return api.updateRecords(domainId, modifyRecords)
}, },
} }
corrections = append(corrections, corr) corrections = append(corrections, corr)

12
providers/dnsmadeeasy/restApi.go
View file

@ -51,7 +51,7 @@ func (restApi *dnsMadeEasyRestAPI) singleDomainGet(domainID int) (*singleDomainR
} }
res := &singleDomainResponse{} res := &singleDomainResponse{}
_, err := restApi.sendRequest(req, &res) _, err := restApi.sendRequest(req, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -66,7 +66,7 @@ func (restApi *dnsMadeEasyRestAPI) multiDomainGet() (*multiDomainResponse, error
} }
res := &multiDomainResponse{} res := &multiDomainResponse{}
_, err := restApi.sendRequest(req, &res) _, err := restApi.sendRequest(req, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -81,7 +81,7 @@ func (restApi *dnsMadeEasyRestAPI) recordGet(domainID int) (*recordResponse, err
} }
res := &recordResponse{} res := &recordResponse{}
_, err := restApi.sendRequest(req, &res) _, err := restApi.sendRequest(req, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -102,7 +102,7 @@ func (restApi *dnsMadeEasyRestAPI) singleDomainCreate(data singleDomainRequestDa
} }
res := &singleDomainResponse{} res := &singleDomainResponse{}
_, err = restApi.sendRequest(req, &res) _, err = restApi.sendRequest(req, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -123,7 +123,7 @@ func (restApi *dnsMadeEasyRestAPI) multiRecordCreate(domainID int, data []record
} }
res := &[]recordResponseDataEntry{} res := &[]recordResponseDataEntry{}
_, err = restApi.sendRequest(req, &res) _, err = restApi.sendRequest(req, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -264,7 +264,7 @@ retry:
backoff = initialBackoff backoff = initialBackoff
if response != nil { if response != nil {
err = json.NewDecoder(res.Body).Decode(&response) err = json.NewDecoder(res.Body).Decode(response)
if err != nil { if err != nil {
return res.StatusCode, err return res.StatusCode, err
} }