Fixup golangci-lint errors.

Signed-off-by: SuperQ <[email protected]>

Author: SuperQ

.gitignore

@@ -1,11 +1,11 @@
-.*.sw?
+# Build
+/.build
+/.release
+/.tarballs
 
-# IDEs
-.idea
-
-# artifacts
-target
+# Artifacts
 fortigate_exporter
+*.exe
 
 # coverage
 cover.out

.golangci.yml

@@ -0,0 +1,11 @@
+---
+linters:
+  enable:
+    - misspell
+    - sloglint
+
+issues:
+  exclude-rules:
+    - path: _test.go
+      linters:
+        - errcheck

internal/config/main.go

@@ -15,8 +15,8 @@ package config
 
 import (
 	"flag"
-	"io/ioutil"
 	"log"
+	"os"
 	"strings"
 
 	"gopkg.in/yaml.v2"
@@ -106,7 +106,7 @@ func ReInit() error {
 	}
 
 	// parse AuthKeys
-	af, err := ioutil.ReadFile(*parameter.AuthFile)
+	af, err := os.ReadFile(*parameter.AuthFile)
 	if err != nil {
 		log.Fatalf("Failed to read API authentication map file: %v", err)
 		return err
@@ -125,7 +125,7 @@ func ReInit() error {
 			continue
 		}
 
-		certs, err := ioutil.ReadFile(eca)
+		certs, err := os.ReadFile(eca)
 		if err != nil {
 			log.Fatalf("Failed to read extra CA file %q: %v", eca, err)
 			return err

pkg/http/forti_token_client.go

@@ -34,7 +34,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -80,7 +80,7 @@ func (c *fortiTokenClient) Get(path string, query string, obj interface{}) error
 		return fmt.Errorf("Response code was %d, expected 200 (path: %q)", resp.StatusCode, path)
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

pkg/http/forti_token_client_test.go

@@ -32,7 +32,7 @@ package http
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -47,7 +47,7 @@ type fakeHTTPClient struct {
 
 func (c *fakeHTTPClient) Do(r *http.Request) (*http.Response, error) {
 	return &http.Response{
-		Body:       ioutil.NopCloser(strings.NewReader(c.body)),
+		Body:       io.NopCloser(strings.NewReader(c.body)),
 		StatusCode: c.status,
 	}, nil
 }

pkg/probe/firewall_load_balance.go

@@ -116,23 +116,18 @@ func probeFirewallLoadBalance(c http.FortiHTTP, meta *TargetMetadata) ([]prometh
 				switch realServer.Mode {
 				case "active":
 					realServerModeActive = 1.0
-					break
 				case "standby":
 					realServerModeStandby = 1.0
-					break
 				case "disabled":
 					realServerModeDisabled = 1.0
-					break
 				}
 
 				realServerStatusUp, realServerStatusDown, realServerStatusUnknown := 0.0, 0.0, 0.0
 				switch realServer.Status {
 				case "up":
 					realServerStatusUp = 1.0
-					break
 				case "down":
 					realServerStatusDown = 1.0
-					break
 				default:
 					realServerStatusUnknown = 1.0
 				}

pkg/probe/probe.go

@@ -78,7 +78,7 @@ func (p *ProbeCollector) Probe(ctx context.Context, target map[string]string, hc
 
 	if target["token"] != "" && savedConfig.AuthKeys[config.Target(target["target"])].Token == "" {
 		// Add the target and its apikey to the savedConfig and use, if exists, a target entry as a template for include/exclude
-		// This will only happend the "first" time
+		// This will only happened the "first" time
 		savedConfig.AuthKeys[config.Target(target["target"])] = config.TargetAuth{Token: config.Token(target["token"]),
 			Probes: savedConfig.AuthKeys[config.Target(target["profile"])].Probes}
 	}

pkg/probe/probe_test.go

@@ -35,8 +35,8 @@ import (
 	"log"
 	"net/url"
 
-	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 	"github.com/google/go-jsonnet"
+	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

pkg/probe/system_fortimanager.go

@@ -58,35 +58,28 @@ func probeSystemFortimanagerStatus(c http.FortiHTTP, meta *TargetMetadata) ([]pr
 		case 0:
 			// No management Tunnel
 			StatusDown = 1.0
-			break
 		case 1:
 			// Management tunnel establishment in progress
 			StatusHandshake = 1.0
-			break
 		case 2:
 			// Management tunnel is establised
 			StatusUp = 1.0
-			break
 		}
 
 		RegistrationUnknown, RegistrationInProgress, RegistrationRegistered, RegistrationUnregistered := 0.0, 0.0, 0.0, 0.0
 		switch r.Results.Registration_ID {
 		case 0:
 			// FMG does not know about the device
 			RegistrationUnknown = 1.0
-			break
 		case 1:
 			// FMG does know the device, but it is not yet fully saved in the list of unregistered devices
 			RegistrationInProgress = 1.0
-			break
 		case 2:
 			// FMG does know the device, and device is authorized
 			RegistrationRegistered = 1.0
-			break
 		case 3:
 			// FMG does know the device, but it is not yet authorized
 			RegistrationUnregistered = 1.0
-			break
 		}
 
 		m = append(m, prometheus.MustNewConstMetric(FortimanStat_id, prometheus.GaugeValue, StatusDown, r.VDOM, r.Results.Mode, "down"))

pkg/probe/system_link_monitor.go

@@ -117,13 +117,10 @@ func probeSystemLinkMonitor(c http.FortiHTTP, meta *TargetMetadata) ([]prometheu
 				switch link.Status {
 				case "up":
 					wanStatusUp = 1.0
-					break
 				case "down":
 					wanStatusDown = 1.0
-					break
 				case "error":
 					wanStatusError = 1.0
-					break
 				default:
 					wanStatusUnknown = 1.0
 				}

pkg/probe/virtual_wan_health_check.go

@@ -117,16 +117,12 @@ func probeVirtualWANHealthCheck(c http.FortiHTTP, meta *TargetMetadata) ([]prome
 				switch Member.Status {
 				case "up":
 					MemberStatusUp = 1.0
-					break
 				case "down":
 					MemberStatusDown = 1.0
-					break
 				case "error":
 					MemberStatusError = 1.0
-					break
 				case "disable":
 					MemberStatusDisable = 1.0
-					break
 				default:
 					MemberStatusUnknown = 1.0
 				}