refactor: cleanup

main.go

@@ -416,8 +416,7 @@ All long form (--) flags can be toggled with the dig-standard +[no]flag notation
 			rrTypes[dns.StringToType["NS"]] = true
 		} else {
 			for _, defaultRRType := range opts.DefaultRRTypes {
-				rrType, _ := dns.StringToType[defaultRRType]
-				rrTypes[rrType] = true
+				rrTypes[dns.StringToType[defaultRRType]] = true
 			}
 		}
 	}

output.go

@@ -66,7 +66,7 @@ func printPrettyRR(a dns.RR, doWhois bool, out io.Writer) {
 
 	ttl := fmt.Sprintf("%d", a.Header().Ttl)
 	if opts.PrettyTTLs {
-		ttl = fmt.Sprintf("%s", time.Duration(a.Header().Ttl)*time.Second)
+		ttl = (time.Duration(a.Header().Ttl) * time.Second).String()
 	}
 
 	if doWhois && (a.Header().Rrtype == dns.TypeA || a.Header().Rrtype == dns.TypeAAAA) {
@@ -115,11 +115,8 @@ func prettyPrintNSID(opt []*dns.Msg, out io.Writer) {
 }
 
 func display(replies []*dns.Msg, server string, queryTime time.Duration, out io.Writer) error {
-	switch opts.Format {
-	case "pretty":
-		if opts.NSID {
-			prettyPrintNSID(replies, out)
-		}
+	if opts.NSID && opts.Format == "pretty" {
+		prettyPrintNSID(replies, out)
 	}
 
 	for i, reply := range replies {
@@ -198,7 +195,7 @@ func display(replies []*dns.Msg, server string, queryTime time.Duration, out io.
 
 				mustWritef(out, "Opcode: %s Status: %s ID %s: Flags: %s (%s Query %s Ans %s Auth %s Add)\n",
 					color("magenta", dns.OpcodeToString[reply.MsgHdr.Opcode]),
-					color("teal", fmt.Sprintf("%s", dns.RcodeToString[reply.MsgHdr.Rcode])),
+					color("teal", dns.RcodeToString[reply.MsgHdr.Rcode]),
 					color("green", fmt.Sprintf("%d", reply.MsgHdr.Id)),
 					color("purple", flags),
 					color("purple", fmt.Sprintf("%d", len(reply.Question))),

transport/http_test.go

@@ -42,9 +42,11 @@ func TestTransportHTTPInvalidResolver(t *testing.T) {
 func TestTransportHTTPServerError(t *testing.T) {
 	listen := ":5380"
 	go func() {
-		http.ListenAndServe(listen, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if err := http.ListenAndServe(listen, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "Server Error", http.StatusInternalServerError)
-		}))
+		})); err != nil {
+			t.Errorf("error starting HTTP server: %s", err)
+		}
 	}()
 
 	tp := httpTransport()
@@ -57,16 +59,20 @@ func TestTransportHTTPServerError(t *testing.T) {
 func TestTransportHTTPIDMismatch(t *testing.T) {
 	listen := ":5381"
 	go func() {
-		http.ListenAndServe(listen, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if err := http.ListenAndServe(listen, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			msg := dns.Msg{}
 			msg.Id = 1
 			buf, err := msg.Pack()
 			if err != nil {
 				t.Errorf("error packing DNS message: %s", err)
 				return
 			}
-			w.Write(buf)
-		}))
+			if _, err := w.Write(buf); err != nil {
+				t.Errorf("error writing DNS message: %s", err)
+			}
+		})); err != nil {
+			t.Errorf("error starting HTTP server: %s", err)
+		}
 	}()
 
 	tp := httpTransport()

transport/odoh.go

@@ -104,7 +104,7 @@ func (o *ODoH) Exchange(m *dns.Msg) (*dns.Msg, error) {
 	if len(odohConfigs.Configs) == 0 {
 		return nil, errors.New("target provided no valid ODoH configs")
 	}
-	log.Debugf("[odoh] retreived %d ODoH configs", len(odohConfigs.Configs))
+	log.Debugf("[odoh] retrieved %d ODoH configs", len(odohConfigs.Configs))
 
 	packedDnsQuery, err := m.Pack()
 	if err != nil {

xfr.go

@@ -32,9 +32,7 @@ func axfr(label, server string) []dns.RR {
 			log.Warnf("AXFR section error (%s): %s", label, env.Error)
 			continue
 		}
-		for _, rr := range env.RR {
-			rrs = append(rrs, rr)
-		}
+		rrs = append(rrs, env.RR...)
 	}
 
 	return rrs