mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

Make IGNORE work with all providers (#313)

Browse Source 
the `differ.matchIgnored` function was comparing only with the `Name`
field of `RecordConfig`.

Most providers don't set `RecordConfig.Name`, only `RecordConfig.NameFQDN`
and for those `IGNORE` doesn't work at all.

This patch converts `IGNORE` to use `NameFQDN` instead since it seems
all providers provides it.
This commit is contained in:
Brice Figureau
2018-02-01 16:32:38 +01:00
committed by Tom Limoncelli
parent 4c80526860
commit b7c6efaa53
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
providers/diff/diff.go
View File

@@ -6,6 +6,7 @@ import (
"sort"
"github.com/StackExchange/dnscontrol/models"
"github.com/miekg/dns/dnsutil"
)
// Correlation stores a difference between two domains.
@@ -74,16 +75,16 @@ func (d *differ) IncrementalDiff(existing []*models.RecordConfig) (unchanged, cr
existingByNameAndType := map[key][]*models.RecordConfig{}
desiredByNameAndType := map[key][]*models.RecordConfig{}
for _, e := range existing {
if d.matchIgnored(e.Name) {
log.Printf("Ignoring record %s %s due to IGNORE", e.Name, e.Type)
if d.matchIgnored(e.NameFQDN, d.dc.Name) {
log.Printf("Ignoring record %s %s due to IGNORE", e.NameFQDN, e.Type)
} else {
k := key{e.NameFQDN, e.Type}
existingByNameAndType[k] = append(existingByNameAndType[k], e)
}
}
for _, dr := range desired {
if d.matchIgnored(dr.Name) {
panic(fmt.Sprintf("Trying to update/add IGNOREd record: %s %s", dr.Name, dr.Type))
if d.matchIgnored(dr.NameFQDN, d.dc.Name) {
panic(fmt.Sprintf("Trying to update/add IGNOREd record: %s %s", dr.NameFQDN, dr.Type))
} else {
k := key{dr.NameFQDN, dr.Type}
desiredByNameAndType[k] = append(desiredByNameAndType[k], dr)
@@ -214,9 +215,11 @@ func sortedKeys(m map[string]*models.RecordConfig) []string {
return s
}
func (d *differ) matchIgnored(name string) bool {
func (d *differ) matchIgnored(nameFQDN, domain string) bool {
// ignored labels are not fqdn
name := dnsutil.TrimDomainName(nameFQDN, domain)
for _, tst := range d.dc.IgnoredLabels {
if name == tst {
if name == tst || nameFQDN == tst {
return true
}
}