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

diff2: Add a "hints" when change is TTL-only (#2249)

Browse source 
Co-authored-by: Tom Limoncelli <tal@whatexit.org>
This commit is contained in:
Tom Limoncelli 2023-03-29 11:34:10 -07:00 • committed by GitHub
parent 6ac1961341
commit f676c4956e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/diff2/analyze.go
View file

@ -170,10 +170,12 @@ func findTTLChanges(existing, desired []targetConfig) ([]targetConfig, []targetC
if ecomp == dcomp && er.TTL != dr.TTL { if ecomp == dcomp && er.TTL != dr.TTL {
m := color.YellowString("± MODIFY-TTL %s %s %s", dr.NameFQDN, dr.Type, humanDiff(existing[ei], desired[di])) m := color.YellowString("± MODIFY-TTL %s %s %s", dr.NameFQDN, dr.Type, humanDiff(existing[ei], desired[di]))
instructions = append(instructions, mkChange(dr.NameFQDN, dr.Type, []string{m}, v := mkChange(dr.NameFQDN, dr.Type, []string{m},
models.Records{er}, models.Records{er},
models.Records{dr}, models.Records{dr},
)) )
v.HintOnlyTTL = true
instructions = append(instructions, v)
ei++ ei++
di++ di++
} else if ecomp < dcomp { } else if ecomp < dcomp {

2
pkg/diff2/analyze_test.go
View file

@ -670,7 +670,7 @@ func Test_splitTTLOnly(t *testing.T) {
}, },
wantExistDiff: nil, wantExistDiff: nil,
wantDesireDiff: nil, wantDesireDiff: nil,
wantChanges: "ChangeList: len=1\n00: Change: verb=CHANGE\n key={laba.f.com A}\n old=[1.2.3.4]\n new=[1.2.3.4]\n msg=[\"± MODIFY-TTL laba.f.com A 1.2.3.4 ttl=(300->700)\"]\n", wantChanges: "ChangeList: len=1\n00: Change: verb=CHANGE\n key={laba.f.com A}\n Hints=OnlyTTL\n{laba.f.com A} old=[1.2.3.4]\n new=[1.2.3.4]\n msg=[\"± MODIFY-TTL laba.f.com A 1.2.3.4 ttl=(300->700)\"]\n",
}, },
{ {

7
pkg/diff2/diff2.go
View file

@ -39,6 +39,10 @@ type Change struct {
Msgs []string // Human-friendly explanation of what changed Msgs []string // Human-friendly explanation of what changed
MsgsJoined string // strings.Join(Msgs, "\n") MsgsJoined string // strings.Join(Msgs, "\n")
MsgsByKey map[models.RecordKey][]string // Messages for a given key MsgsByKey map[models.RecordKey][]string // Messages for a given key
// HintOnlyTTL is true only if (.Type == diff2.CHANGE) && (there is
// exactly 1 record being updated) && (the only change is the TTL)
HintOnlyTTL bool
} }
/* /*
@ -223,6 +227,9 @@ func (c Change) String() string {
fmt.Fprintf(b, "Change: verb=%v\n", c.Type) fmt.Fprintf(b, "Change: verb=%v\n", c.Type)
fmt.Fprintf(b, " key=%v\n", c.Key) fmt.Fprintf(b, " key=%v\n", c.Key)
if c.HintOnlyTTL {
fmt.Fprint(b, " Hints=OnlyTTL\n", c.Key)
}
if len(c.Old) != 0 { if len(c.Old) != 0 {
fmt.Fprintf(b, " old=%v\n", c.Old) fmt.Fprintf(b, " old=%v\n", c.Old)
} }