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

fix unused params in: pkg/normalize

Browse source
This commit is contained in:
Tom Limoncelli 2024-03-04 10:24:21 -05:00
parent 3057a0b6c4
commit b1477d35e4
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/normalize/validate.go
View file

@ -103,7 +103,7 @@ func errorRepeat(label, domain string) string {
)
}
func checkLabel(label string, rType string, target, domain string, meta map[string]string) error {
func checkLabel(label string, rType string, domain string, meta map[string]string) error {
if label == "@" {
return nil
}
@ -142,7 +142,7 @@ func checkLabel(label string, rType string, target, domain string, meta map[stri
return nil
}
func checkSoa(expire uint32, minttl uint32, refresh uint32, retry uint32, serial uint32, mbox string) error {
func checkSoa(expire uint32, minttl uint32, refresh uint32, retry uint32, mbox string) error {
if expire <= 0 {
return fmt.Errorf("SOA Expire must be > 0")
}
@ -213,7 +213,7 @@ func checkTargets(rec *models.RecordConfig, domain string) (errs []error) {
case "PTR":
check(checkTarget(target))
case "SOA":
check(checkSoa(rec.SoaExpire, rec.SoaMinttl, rec.SoaRefresh, rec.SoaRetry, rec.SoaSerial, rec.SoaMbox))
check(checkSoa(rec.SoaExpire, rec.SoaMinttl, rec.SoaRefresh, rec.SoaRetry, rec.SoaMbox))
check(checkTarget(target))
if label != "@" {
check(fmt.Errorf("SOA record is only valid for bare domain"))
@ -373,7 +373,7 @@ func ValidateAndNormalizeConfig(config *models.DNSConfig) (errs []error) {
if err := validateRecordTypes(rec, domain.Name, pTypes); err != nil {
errs = append(errs, err)
}
if err := checkLabel(rec.GetLabel(), rec.Type, rec.GetTargetField(), domain.Name, rec.Metadata); err != nil {
if err := checkLabel(rec.GetLabel(), rec.Type, domain.Name, rec.Metadata); err != nil {
errs = append(errs, err)
}

35
pkg/normalize/validate_test.go
View file

@ -41,35 +41,34 @@ func TestCheckSoa(t *testing.T) {
minttl uint32
refresh uint32
retry uint32
serial uint32
mbox string
}{
// Expire
{false, 123, 123, 123, 123, 123, "foo.bar.com."},
{true, 0, 123, 123, 123, 123, "foo.bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
{true, 0, 123, 123, 123, "foo.bar.com."},
// MinTTL
{false, 123, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 0, 123, 123, 123, "foo.bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 0, 123, 123, "foo.bar.com."},
// Refresh
{false, 123, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 123, 0, 123, 123, "foo.bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 123, 0, 123, "foo.bar.com."},
// Retry
{false, 123, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 123, 123, 0, 123, "foo.bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 123, 123, 0, "foo.bar.com."},
// Serial
{false, 123, 123, 123, 123, 123, "foo.bar.com."},
{false, 123, 123, 123, 123, 0, "foo.bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
// MBox
{true, 123, 123, 123, 123, 123, ""},
{true, 123, 123, 123, 123, 123, "foo@bar.com."},
{false, 123, 123, 123, 123, 123, "foo.bar.com."},
{true, 123, 123, 123, 123, ""},
{true, 123, 123, 123, 123, "foo@bar.com."},
{false, 123, 123, 123, 123, "foo.bar.com."},
}
for _, test := range tests {
experiment := fmt.Sprintf("%d %d %d %d %d %s", test.expire, test.minttl, test.refresh,
test.retry, test.serial, test.mbox)
experiment := fmt.Sprintf("%d %d %d %d %s", test.expire, test.minttl, test.refresh,
test.retry, test.mbox)
t.Run(experiment, func(t *testing.T) {
err := checkSoa(test.expire, test.minttl, test.refresh, test.retry, test.serial, test.mbox)
err := checkSoa(test.expire, test.minttl, test.refresh, test.retry, test.mbox)
checkError(t, err, test.isError, experiment)
})
}
@ -102,7 +101,7 @@ func TestCheckLabel(t *testing.T) {
if test.hasSkipMeta {
meta["skip_fqdn_check"] = "true"
}
err := checkLabel(test.label, test.rType, test.target, "foo.tld", meta)
err := checkLabel(test.label, test.rType, "foo.tld", meta)
if err != nil && !test.isError {
t.Errorf("%02d: Expected no error but got %s", i, err)
}