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

Don't count diff2.REPORT (informational warnings) as a "correction" (#2361)

Browse Source 
Co-authored-by: Tom Limoncelli <tal@whatexit.org>
This commit is contained in:
Tom Limoncelli
2023-05-16 10:42:08 -04:00
committed by GitHub
parent 84e39b4ae2
commit 66a76c44c1
10 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commands/commands.go
View File

@ -26,8 +26,6 @@ var commands = []*cli.Command{}
// These are set by/for goreleaser
var (
version = "dev"
commit = "none"
date = "unknown"
)
func cmd(cat string, c *cli.Command) bool {

17
commands/previewPush.go
View File

@ -222,13 +222,16 @@ func run(args PreviewArgs, push bool, interactive bool, out printer.CLI) error {
continue
}
corrections, err := zonerecs.CorrectZoneRecords(provider.Driver, domain)
reports, corrections, err := zonerecs.CorrectZoneRecords(provider.Driver, domain)
printReports(domain.Name, provider.Name, reports, out, push, notifier)
out.EndProvider(provider.Name, len(corrections), err)
if err != nil {
anyErrors = true
return
}
totalCorrections += len(corrections)
// When diff1 goes away, the call to printReports() should be moved to HERE.
//printReports(domain.Name, provider.Name, reports, out, push, notifier)
anyErrors = printOrRunCorrections(domain.Name, provider.Name, corrections, out, push, interactive, notifier) || anyErrors
}
@ -543,3 +546,15 @@ func printOrRunCorrections(domain string, provider string, corrections []*models
}
return anyErrors
}
func printReports(domain string, provider string, reports []*models.Correction, out printer.CLI, push bool, notifier notifications.Notifier) (anyErrors bool) {
anyErrors = false
if len(reports) == 0 {
return false
}
for i, report := range reports {
out.PrintReport(i, report)
notifier.Notify(domain, provider, report.Msg, nil, !push)
}
return anyErrors
}