Run gofumpt -l -w .

api_utils.go

@@ -16,7 +16,6 @@ var pongs int = 0
 
 func APIping(appName string, boottime time.Time) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
-
 		tls := ""
 		if r.TLS != nil {
 			tls = "TLS "

apiclient.go

@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"crypto/tls"
 	"encoding/json"
-
 	"fmt"
 	"io"
 	"log"
@@ -46,7 +45,7 @@ func (api *ApiClient) Setup() error {
 	api.Verbose = GlobalCF.Verbose
 	api.Debug = GlobalCF.Debug
 
-	var protocol = "http"
+	protocol := "http"
 
 	if api.BaseUrl == "" {
 		return fmt.Errorf("baseUrl not defined. Abort")
@@ -112,7 +111,7 @@ func (api *ApiClient) SetupTLS(tlsConfig *tls.Config) error {
 	api.Verbose = GlobalCF.Verbose
 	api.Debug = GlobalCF.Debug
 
-	var protocol = "https"
+	protocol := "https"
 
 	if api.BaseUrl == "" {
 		return fmt.Errorf("baseUrl not defined. Abort")
@@ -239,7 +238,6 @@ func (api *ApiClient) RequestNG(method, endpoint string, data interface{}, dieOn
 	}
 	// log.Printf("api.RequestNG: api: %+v req: %+v", api, req)
 	resp, err := api.HttpClient.Do(req)
-
 	if err != nil {
 		if api.Debug {
 			fmt.Printf("api.RequestNG: %s %s dieOnError: %v err: %v\n", method, endpoint, dieOnError, err)

bitmask.go

@@ -26,9 +26,11 @@ const (
 	Frotz
 )
 
-var DefinedTags = []string{"newname", "highvolume", "badip", "cdntracker", "likelymalware", "likelybotnetcc",
+var DefinedTags = []string{
+	"newname", "highvolume", "badip", "cdntracker", "likelymalware", "likelybotnetcc",
 	// "childporn",
-	"foo", "bar", "baz", "gazonk", "frotz"}
+	"foo", "bar", "baz", "gazonk", "frotz",
+}
 
 func SetTag(b, tag TagMask) TagMask    { return b | tag }
 func ClearTag(b, tag TagMask) TagMask  { return b &^ tag }

certs.go

@@ -57,7 +57,6 @@ func NewServerConfig(caFile string, clientAuth tls.ClientAuthType) (*tls.Config,
 }
 
 func NewClientConfig(caFile, keyFile, certFile string) (*tls.Config, error) {
-
 	caCertPool, err := loadCertPool(caFile)
 	if err != nil {
 		return nil, err

cmd/api.go

@@ -7,8 +7,8 @@ package cmd
 import (
 	"log"
 
-	"github.com/spf13/cobra"
 	"github.com/dnstapir/tapir"
+	"github.com/spf13/cobra"
 )
 
 var ApiCmd = &cobra.Command{

cmd/bump.go

@@ -31,5 +31,3 @@ var BumpCmd = &cobra.Command{
 func init() {
 	BumpCmd.Flags().StringVarP(&tapir.GlobalCF.Zone, "zone", "z", "", "Zone name")
 }
-
-

cmd/debug.go

@@ -89,7 +89,7 @@ var debugMqttStatsCmd = &cobra.Command{
 			fmt.Printf("%s\n", resp.Msg)
 		}
 
-		var out = []string{"MQTT Topic|Msgs|Last MQTT Message|Time since last msg"}
+		out := []string{"MQTT Topic|Msgs|Last MQTT Message|Time since last msg"}
 		for topic, count := range resp.MqttStats.MsgCounters {
 			t := resp.MqttStats.MsgTimeStamps[topic]
 			out = append(out, fmt.Sprintf("%s|%d|%s|%v\n", topic, count, t.Format(timelayout), time.Since(t).Round(time.Second)))
@@ -248,7 +248,6 @@ var debugGenerateSchemaCmd = &cobra.Command{
 	Use:   "generate-schema",
 	Short: "Experimental: Generate the JSON schema for the current data structures",
 	Run: func(cmd *cobra.Command, args []string) {
-
 		reflector := &jsonschema.Reflector{
 			DoNotReference: true,
 		}
@@ -274,7 +273,6 @@ var debugImportGreylistCmd = &cobra.Command{
 	Use:   "import-greylist",
 	Short: "Import the current data for the named greylist from the TEM bootstrap server",
 	Run: func(cmd *cobra.Command, args []string) {
-
 		if Listname == "" {
 			fmt.Printf("No greylist name specified, using 'dns-tapir'\n")
 			Listname = "dns-tapir"

cmd/keyupload.go

@@ -6,11 +6,10 @@ package cmd
 import (
 	"crypto/sha256"
 	"encoding/pem"
-	"path/filepath"
-
 	"fmt"
 	"log"
 	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/dnstapir/tapir"
@@ -30,7 +29,7 @@ var KeyUploadCmd = &cobra.Command{
 		//			log.Fatal("keyupload must have exactly one argument: the path to the public key file")
 		//		}
 
-		var statusch = make(chan tapir.ComponentStatusUpdate, 10)
+		statusch := make(chan tapir.ComponentStatusUpdate, 10)
 
 		// If any status updates arrive, print them out
 		go func() {

cmd/mqtt.go

@@ -9,15 +9,14 @@ import (
 	"bytes"
 	"crypto/ecdsa"
 	"encoding/json"
-	"net/http"
-	"path/filepath"
-	"regexp"
-
 	"fmt"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"os/signal"
+	"path/filepath"
+	"regexp"
 	"strings"
 	"sync"
 	"syscall"
@@ -35,8 +34,10 @@ import (
 
 var mqttclientid, mqtttopic, defaulttopic, mqttgreylist, gcfgfile string
 
-var mqttfid string
-var mqttpub, mqttsub, mqttretain, mqttconfigclear bool
+var (
+	mqttfid                                       string
+	mqttpub, mqttsub, mqttretain, mqttconfigclear bool
+)
 
 var MqttCmd = &cobra.Command{
 	Use:   "mqtt",
@@ -52,7 +53,7 @@ The engine can be configured to publish to and subscribe from the tapir config,
 	Run: func(cmd *cobra.Command, args []string) {
 		var wg sync.WaitGroup
 
-		var statusch = make(chan tapir.ComponentStatusUpdate, 10)
+		statusch := make(chan tapir.ComponentStatusUpdate, 10)
 
 		// If any status updates arrive, print them out
 		go func() {
@@ -81,8 +82,8 @@ The engine can be configured to publish to and subscribe from the tapir config,
 			os.Exit(1)
 		}
 
-		var canPub = true
-		var canSub = true
+		canPub := true
+		canSub := true
 		var signkey *ecdsa.PrivateKey
 		var valkey *ecdsa.PublicKey
 
@@ -274,8 +275,7 @@ var mqttTapirConfigCmd = &cobra.Command{
 	If -R is specified, will send a retained message, otherwise will send a normal message.
 	If -C is specified, will clear the retained config message, otherwise will send the new config.`,
 	Run: func(cmd *cobra.Command, args []string) {
-
-		var statusch = make(chan tapir.ComponentStatusUpdate, 10)
+		statusch := make(chan tapir.ComponentStatusUpdate, 10)
 
 		// If any status updates arrive, print them out
 		go func() {
@@ -387,8 +387,7 @@ var mqttTapirObservationsCmd = &cobra.Command{
 	Long: `Will query for operation (add|del|show|send|set-ttl|list-tags|quit), domain name and tags.
 Will end the loop on the operation (or domain name) "QUIT"`,
 	Run: func(cmd *cobra.Command, args []string) {
-
-		var statusch = make(chan tapir.ComponentStatusUpdate, 10)
+		statusch := make(chan tapir.ComponentStatusUpdate, 10)
 
 		// If any status updates arrive, print them out
 		go func() {
@@ -439,7 +438,7 @@ Will end the loop on the operation (or domain name) "QUIT"`,
 		}
 
 		var op, names, tags string
-		var tmsg = tapir.TapirMsg{
+		tmsg := tapir.TapirMsg{
 			SrcName:   srcname,
 			Creator:   "tapir-cli",
 			MsgType:   "observation",
@@ -450,7 +449,7 @@ Will end the loop on the operation (or domain name) "QUIT"`,
 		var snames []string
 		var tagmask tapir.TagMask
 
-		var ops = []string{"add", "del", "show", "send", "set-ttl", "list-tags", "quit"}
+		ops := []string{"add", "del", "show", "send", "set-ttl", "list-tags", "quit"}
 		fmt.Printf("Defined operations are: %v\n", ops)
 
 		var tds []tapir.Domain
@@ -513,7 +512,7 @@ Will end the loop on the operation (or domain name) "QUIT"`,
 				tds = []tapir.Domain{}
 
 			case "show":
-				var out = []string{"Domain|Tags"}
+				out := []string{"Domain|Tags"}
 				for _, td := range tmsg.Added {
 					out = append(out, fmt.Sprintf("ADD: %s|%032b", td.Name, td.TagMask))
 				}
@@ -523,7 +522,7 @@ Will end the loop on the operation (or domain name) "QUIT"`,
 				fmt.Println(columnize.SimpleFormat(out))
 
 			case "list-tags":
-				var out = []string{"Name|Bit"}
+				out := []string{"Name|Bit"}
 				var tagmask tapir.TagMask
 				for _, t := range tapir.DefinedTags {
 					tagmask, _ = tapir.StringsToTagMask([]string{t})
@@ -565,8 +564,7 @@ var mqttTapirStatusCmd = &cobra.Command{
 	Long: `Will query for operation (add|del|show|send|set-ttl|list-tags|quit), component name and status.
 Will end the loop on the operation (or component name) "QUIT"`,
 	Run: func(cmd *cobra.Command, args []string) {
-
-		var statusch = make(chan tapir.ComponentStatusUpdate, 10)
+		statusch := make(chan tapir.ComponentStatusUpdate, 10)
 
 		// If any status updates arrive, print them out
 		go func() {
@@ -618,7 +616,7 @@ Will end the loop on the operation (or component name) "QUIT"`,
 		//			TimeStamp: time.Now(),
 		//		}
 
-		var ops = []string{"add", "del", "show", "send", "set-ttl", "list-tags", "quit"}
+		ops := []string{"add", "del", "show", "send", "set-ttl", "list-tags", "quit"}
 		fmt.Printf("Defined operations are: %v\n", ops)
 
 		tfs := tapir.TapirFunctionStatus{
@@ -700,7 +698,7 @@ Will end the loop on the operation (or component name) "QUIT"`,
 				tfs.ComponentStatus[cname] = comp
 
 			case "show":
-				var out = []string{"Component|Status|ErrorMsg|Msg|NumFailures|LastFailure|LastSuccess"}
+				out := []string{"Component|Status|ErrorMsg|Msg|NumFailures|LastFailure|LastSuccess"}
 				for cname, comp := range tfs.ComponentStatus {
 					out = append(out, fmt.Sprintf("%s|%s|%s|%s|%d|%s|%s", cname, tapir.StatusToString[comp.Status], comp.ErrorMsg, comp.Msg, comp.NumFails,
 						comp.LastFail.Format(tapir.TimeLayout), comp.LastSuccess.Format(tapir.TimeLayout)))
@@ -1035,7 +1033,6 @@ func SetupInterruptHandler(cmnder chan tapir.MqttEngineCmd) {
 	go func() {
 		for {
 			select {
-
 			case <-ic:
 				fmt.Println("SIGTERM interrupt received, sending stop signal to MQTT Engine")
 				cmnder <- tapir.MqttEngineCmd{Cmd: "stop", Resp: respch}

cmd/pop.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-    "time"
+	"time"
 
 	"github.com/dnstapir/tapir"
 	"github.com/ryanuber/columnize"
@@ -69,7 +69,7 @@ var PopStatusCmd = &cobra.Command{
 		if len(resp.TapirFunctionStatus.ComponentStatus) != 0 {
 			tfs := resp.TapirFunctionStatus
 			fmt.Printf("TAPIR-POP Status. Reported components: %d Total errors (since last start): %d\n", len(tfs.ComponentStatus), tfs.NumFailures)
-			var out = []string{"Component|Status|Error msg|# Fails|# Warns|LastFailure|LastSuccess"}
+			out := []string{"Component|Status|Error msg|# Fails|# Warns|LastFailure|LastSuccess"}
 			for k, v := range tfs.ComponentStatus {
 				out = append(out, fmt.Sprintf("%s|%s|%s|%d|%d|%v|%v", k, tapir.StatusToString[v.Status], v.ErrorMsg, v.NumFails, v.NumWarnings, v.LastFail.Format(tapir.TimeLayout), v.LastSuccess.Format(tapir.TimeLayout)))
 			}

cmd/rpz.go

@@ -115,7 +115,6 @@ var RpzListCmd = &cobra.Command{
 	Use:   "list",
 	Short: "Instruct TAPIR-POP to remove a rule from the RPZ zone",
 	Run: func(cmd *cobra.Command, args []string) {
-
 		resp := SendCommandCmd(tapir.CommandPost{
 			Command: "rpz-list-sources",
 		})

cmd/slogger.go

@@ -169,7 +169,7 @@ func SloggerApi() (*tapir.ApiClient, error) {
 		return nil, fmt.Errorf("Error: missing config key: %s", urlkey)
 	}
 
-    api := &tapir.ApiClient{
+	api := &tapir.ApiClient{
 		BaseUrl:    baseurl,
 		ApiKey:     viper.GetString("cli." + servername + ".apikey"),
 		AuthMethod: "X-API-Key",
@@ -200,7 +200,6 @@ func SloggerApi() (*tapir.ApiClient, error) {
 }
 
 func SendSloggerCommand(data tapir.SloggerCmdPost) tapir.SloggerCmdResponse {
-
 	api, err := SloggerApi()
 	if err != nil {
 		log.Fatalf("Error: Could not set up API client to TAPIR-SLOGGER: %v", err)

defaults.go

@@ -3,10 +3,12 @@
  */
 package tapir
 
-const DefaultPopCfgFile = "/etc/dnstapir/tapir-pop.yaml"
-const PopSourcesCfgFile = "/etc/dnstapir/pop-sources.yaml"
-const PopOutputsCfgFile = "/etc/dnstapir/pop-outputs.yaml"
-const PopPolicyCfgFile = "/etc/dnstapir/pop-policy.yaml"
+const (
+	DefaultPopCfgFile = "/etc/dnstapir/tapir-pop.yaml"
+	PopSourcesCfgFile = "/etc/dnstapir/pop-sources.yaml"
+	PopOutputsCfgFile = "/etc/dnstapir/pop-outputs.yaml"
+	PopPolicyCfgFile  = "/etc/dnstapir/pop-policy.yaml"
+)
 
 const DefaultTapirCliCfgFile = "/etc/dnstapir/tapir-cli.yaml"
 

delegation_utils.go

@@ -5,8 +5,9 @@
 package tapir
 
 import (
-	"github.com/miekg/dns"
 	"log"
+
+	"github.com/miekg/dns"
 )
 
 func (zd *ZoneData) FindGlue(nsrrs RRset) *RRset {

dns_utils.go

@@ -26,7 +26,6 @@ const (
 // TODO: Add support for TSIG zone transfers.
 
 func (zd *ZoneData) ZoneTransferIn(upstream string, serial uint32, ttype string) (uint32, error) {
-
 	if upstream == "" {
 		log.Fatalf("ZoneTransfer: upstream not set")
 	}
@@ -110,7 +109,6 @@ func (zd *ZoneData) ReadZoneString(s string) (uint32, error) {
 }
 
 func (zd *ZoneData) ReadZone(r io.Reader) (uint32, error) {
-
 	switch zd.ZoneType {
 	case MapZone, SliceZone, RpzZone:
 		// zd.Data = make(map[string]map[uint16][]dns.RR, 30)

globals.go

@@ -12,11 +12,11 @@ type CliFlags struct {
 	Api       *ApiClient
 	PingCount int
 	Zone      string
-    // TODO cleaner solution:
-    // Moved "certname" from slogger.go here so it can know what cert to look
-    // for. "certname" was previously declared globally in "root.go", but since
-    // the move to the tapir lib, slogger.go no longer sees that variable.
-    Certname  string
+	// TODO cleaner solution:
+	// Moved "certname" from slogger.go here so it can know what cert to look
+	// for. "certname" was previously declared globally in "root.go", but since
+	// the move to the tapir lib, slogger.go no longer sees that variable.
+	Certname string
 }
 
 var GlobalCF CliFlags

logging.go

@@ -11,7 +11,6 @@ import (
 )
 
 func SetupLogging(logfile string) error {
-
 	if logfile != "" {
 		log.SetOutput(&lumberjack.Logger{
 			Filename:   logfile,