Fixed issues raised by staticcheck

Author: skx

.github/run-tests.sh

@@ -7,7 +7,7 @@ go get -u honnef.co/go/tools/cmd/staticcheck
 
 # Run the static-check tool - we ignore documentation-errors.
 t=$(mktemp)
-staticcheck -checks all ./... | grep -v "package comment"> $t
+staticcheck -checks all ./... | grep -v "package comment" | grep -v context.TODO > $t
 if [ -s $t ]; then
     echo "Found errors via 'staticcheck'"
     cat $t

alerts/alerts.go

@@ -47,7 +47,7 @@ func New() (*Alerts, error) {
 	//
 	dsn := os.Getenv("PURPLE_DSN")
 	if dsn == "" {
-		return m, errors.New("You must specify the environmental variable 'PURPLE_DSN' with your DB details")
+		return m, errors.New("you must specify the environmental variable 'PURPLE_DSN' with your DB details")
 	}
 
 	//
@@ -147,10 +147,10 @@ func (s *Alerts) AddEvent(data alert.Alert) error {
 		// Otherwise update the existing event in-place.
 		//
 		up, err := s.db.Prepare("UPDATE events SET raise_at=?, subject=?, detail=?  WHERE i=?")
-		defer up.Close()
 		if err != nil {
 			return err
 		}
+		defer up.Close()
 
 		_, err = up.Exec(raise, data.Subject, data.Detail, id)
 		if err != nil {

cmd_serve.go

@@ -162,7 +162,6 @@ func AddContext(next http.Handler) http.Handler {
 		// in, and supply no context.
 		//
 		next.ServeHTTP(w, r)
-		return
 	})
 }
 
@@ -352,7 +351,7 @@ func ackEvent(res http.ResponseWriter, req *http.Request) {
 	//
 	username := req.Context().Value(keyUser)
 	if username == nil {
-		http.Redirect(res, req, "/login", 302)
+		http.Redirect(res, req, "/login", http.StatusFound)
 		return
 	}
 
@@ -363,7 +362,7 @@ func ackEvent(res http.ResponseWriter, req *http.Request) {
 	id := vars["id"]
 
 	storage.AckEvent(id)
-	http.Redirect(res, req, "/", 302)
+	http.Redirect(res, req, "/", http.StatusFound)
 
 }
 
@@ -377,7 +376,7 @@ func clearEvent(res http.ResponseWriter, req *http.Request) {
 	//
 	username := req.Context().Value(keyUser)
 	if username == nil {
-		http.Redirect(res, req, "/login", 302)
+		http.Redirect(res, req, "/login", http.StatusFound)
 		return
 	}
 
@@ -388,7 +387,7 @@ func clearEvent(res http.ResponseWriter, req *http.Request) {
 	id := vars["id"]
 
 	storage.ClearEvent(id)
-	http.Redirect(res, req, "/", 302)
+	http.Redirect(res, req, "/", http.StatusFound)
 
 }
 
@@ -401,7 +400,7 @@ func raiseEvent(res http.ResponseWriter, req *http.Request) {
 	//
 	username := req.Context().Value(keyUser)
 	if username == nil {
-		http.Redirect(res, req, "/login", 302)
+		http.Redirect(res, req, "/login", http.StatusFound)
 		return
 	}
 
@@ -412,7 +411,7 @@ func raiseEvent(res http.ResponseWriter, req *http.Request) {
 	id := vars["id"]
 
 	storage.RaiseEvent(id)
-	http.Redirect(res, req, "/", 302)
+	http.Redirect(res, req, "/", http.StatusFound)
 
 }
 
@@ -422,11 +421,11 @@ func raiseEvent(res http.ResponseWriter, req *http.Request) {
 func serveResource(response http.ResponseWriter, request *http.Request, resource string, mime string) {
 	tmpl, err := getResource(resource)
 	if err != nil {
-		fmt.Fprintf(response, err.Error())
+		fmt.Fprint(response, err.Error())
 		return
 	}
 	response.Header().Set("Content-Type", mime)
-	fmt.Fprintf(response, string(tmpl))
+	fmt.Fprint(response, string(tmpl))
 }
 
 //
@@ -473,14 +472,14 @@ func loginHandler(response http.ResponseWriter, request *http.Request) {
 			http.SetCookie(response, cookie)
 		}
 
-		http.Redirect(response, request, "/", 302)
+		http.Redirect(response, request, "/", http.StatusFound)
 		return
 	}
 
 	//
 	// Failure to login, redirect to try again.
 	//
-	http.Redirect(response, request, "/login#failed", 302)
+	http.Redirect(response, request, "/login#failed", http.StatusFound)
 }
 
 //
@@ -494,7 +493,7 @@ func logoutHandler(response http.ResponseWriter, request *http.Request) {
 		MaxAge: -1,
 	}
 	http.SetCookie(response, cookie)
-	http.Redirect(response, request, "/", 302)
+	http.Redirect(response, request, "/", http.StatusFound)
 }
 
 //
@@ -509,7 +508,7 @@ func eventsHandler(response http.ResponseWriter, request *http.Request) {
 	//
 	username := request.Context().Value(keyUser)
 	if username == nil {
-		http.Redirect(response, request, "/login", 302)
+		http.Redirect(response, request, "/login", http.StatusFound)
 		return
 	}
 
@@ -547,7 +546,7 @@ func indexPageHandler(response http.ResponseWriter, request *http.Request) {
 	//
 	username := request.Context().Value(keyUser)
 	if username == nil {
-		http.Redirect(response, request, "/login", 302)
+		http.Redirect(response, request, "/login", http.StatusFound)
 		return
 	}
 

static.go

@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"encoding/hex"
-	"errors"
+	"fmt"
 	"io/ioutil"
 )
 
@@ -96,7 +96,7 @@ func getResource(path string) ([]byte, error) {
 			return raw.Bytes(), nil
 		}
 	}
-	return nil, errors.New("Failed to find resource")
+	return nil, fmt.Errorf("failed to find resource '%s'", path)
 }
 
 //

util/util.go

@@ -24,7 +24,7 @@ func Str2Unix(data string) (int64, error) {
 		return now, nil
 	}
 
-	re := regexp.MustCompile("^\\+?([0-9]+)([hHmMsS])$")
+	re := regexp.MustCompile(`^\\+?([0-9]+)([hHmMsS])$`)
 	out := re.FindStringSubmatch(data)
 
 	res := now