Merge pull request #437 from Unpackerr/dn2_linter

davidnewhall · web-flow · commit 6322fc160a0e · 2024-06-30T19:23:01.000-07:00
update linter
diff --git a/.github/workflows/codetests.yml b/.github/workflows/codetests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: 'v1.55'
+          version: 'v1.59'
 
   golangci-linux:
     # description: "Runs golangci-lint on linux against linux and windows."
@@ -60,4 +60,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: 'v1.55'
+          version: 'v1.59'
diff --git a/.golangci.yml b/.golangci.yml
@@ -2,21 +2,8 @@ linters:
   enable-all: true
   disable:
     # deprecated
-    - maligned
-    - scopelint
-    - interfacer
-    - golint
-    - exhaustivestruct
-    - nosnakecase
-    - structcheck
-    - deadcode
-    - varcheck
-    - ifshort
-    # unneeded (broken because of generics)
-    - rowserrcheck
-    - wastedassign
-    - sqlclosecheck
-    - contextcheck
+    - execinquery
+    - gomnd
     # unused
     - exhaustruct
     - exhaustive
diff --git a/pkg/ui/ui_other.go b/pkg/ui/ui_other.go
@@ -3,6 +3,7 @@
 package ui
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os/exec"
@@ -27,7 +28,7 @@ func StartCmd(c string, v ...string) error {
 }
 
 // ErrUnsupported is just an error.
-var ErrUnsupported = fmt.Errorf("unsupported OS")
+var ErrUnsupported = errors.New("unsupported OS")
 
 // OpenCmd opens anything.
 func OpenCmd(_ ...string) error {
diff --git a/pkg/unpackerr/apps.go b/pkg/unpackerr/apps.go
@@ -1,6 +1,7 @@
 package unpackerr
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -32,7 +33,7 @@ const (
 
 // Application validation errors.
 var (
-	ErrInvalidURL = fmt.Errorf("provided application URL is invalid")
+	ErrInvalidURL = errors.New("provided application URL is invalid")
 	ErrInvalidKey = fmt.Errorf("provided application API Key is invalid, must be %d characters", apiKeyLength)
 )
 
@@ -78,7 +79,7 @@ type workThread struct {
 
 func (u *Unpackerr) watchWorkThread() {
 	workers := u.Parallel
-	if workers > 4 { //nolint:gomnd // 4 == the four starr apps.
+	if workers > 4 { //nolint:mnd // 4 == the four starr apps.
 		workers = 4
 	}
 
@@ -122,19 +123,26 @@ func (u *Unpackerr) retrieveAppQueues() {
 // validateApps is broken-out into this file to make adding new apps easier.
 func (u *Unpackerr) validateApps() error {
 	for _, validate := range []func() error{
-		u.validateCmdhook,
 		u.validateLidarr,
 		u.validateRadarr,
 		u.validateReadarr,
 		u.validateSonarr,
 		u.validateWhisparr,
-		u.validateWebhook,
 	} {
 		if err := validate(); err != nil {
 			return err
 		}
 	}
 
+	for _, validate := range []func() error{
+		u.validateCmdhook,
+		u.validateWebhook,
+	} {
+		if err := validate(); err != nil {
+			u.Errorf("Config Warning: %v", err)
+		}
+	}
+
 	return nil
 }
 
diff --git a/pkg/unpackerr/cmdhook.go b/pkg/unpackerr/cmdhook.go
@@ -3,6 +3,7 @@ package unpackerr
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -15,7 +16,7 @@ import (
 
 // Errors produced by this file.
 var (
-	ErrCmdhookNoCmd = fmt.Errorf("cmdhook without a command configured; fix it")
+	ErrCmdhookNoCmd = errors.New("cmdhook without a command configured; fix it")
 )
 
 func (u *Unpackerr) validateCmdhook() error {
@@ -47,13 +48,12 @@ func (u *Unpackerr) runCmdhookWithLog(hook *WebhookConfig, payload *WebhookPaylo
 
 	hook.Lock() // we only lock for the integer increments.
 	defer hook.Unlock()
-
-	hook.posts++
+	hook.posts++ //nolint:wsl
 
 	switch {
 	case err != nil:
 		u.Errorf("Command Hook (%s) %s: %v: %s", payload.Event, hook.Name, err, out.String())
-		hook.fails++
+		hook.fails++ //nolint:wsl
 	case hook.Silent || out == nil:
 		u.Printf("[Cmdhook] Queue: %d/%d. Ran command %s", len(u.hookChan), cap(u.hookChan), hook.Name)
 	default:
@@ -63,6 +63,10 @@ func (u *Unpackerr) runCmdhookWithLog(hook *WebhookConfig, payload *WebhookPaylo
 }
 
 func (u *Unpackerr) runCmdhook(hook *WebhookConfig, payload *WebhookPayload) (*bytes.Buffer, error) {
+	if hook.Command == "" {
+		return nil, ErrCmdhookNoCmd
+	}
+
 	payload.Config = hook
 
 	env, err := cnfg.MarshalENV(payload, "UN")
@@ -122,7 +126,7 @@ func (u *Unpackerr) logCmdhook() {
 		pfx = " => Command Hook Config: 1 cmd"
 	} else {
 		u.Printf(" => Command Hook Configs: %d commands", len(u.Cmdhook))
-		pfx = " =>    Command"
+		pfx = " =>    Command" //nolint:wsl
 	}
 
 	for _, f := range u.Cmdhook {
diff --git a/pkg/unpackerr/folder.go b/pkg/unpackerr/folder.go
@@ -84,6 +84,7 @@ func (u *Unpackerr) logFolders() {
 			if epath = ""; folder.ExtractPath != "" {
 				epath = ", extract to: " + folder.ExtractPath
 			}
+
 			u.Printf(" =>    Path: %s%s (delete after:%v, delete orig:%v, log file: %v, move back:%v, isos:%v)",
 				folder.Path, epath, folder.DeleteAfter, folder.DeleteOrig, !folder.DisableLog, folder.MoveBack, folder.ExtractISOs)
 		}
diff --git a/pkg/unpackerr/webhook.go b/pkg/unpackerr/webhook.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -48,8 +49,8 @@ type hookQueueItem struct {
 
 // Errors produced by this file.
 var (
-	ErrInvalidStatus = fmt.Errorf("invalid HTTP status reply")
-	ErrWebhookNoURL  = fmt.Errorf("webhook without a URL configured; fix it")
+	ErrInvalidStatus = errors.New("invalid HTTP status reply")
+	ErrWebhookNoURL  = errors.New("webhook without a URL configured; fix it")
 )
 
 // ExtractStatuses allows us to create a custom environment variable unmarshaller.
@@ -174,8 +175,13 @@ func (u *Unpackerr) sendWebhookWithLog(hook *WebhookConfig, payload *WebhookPayl
 
 // Send marshals an interface{} into json and POSTs it to a URL.
 func (w *WebhookConfig) Send(body io.Reader) ([]byte, error) {
+	if w.URL == "" {
+		return nil, ErrWebhookNoURL
+	}
+
 	w.Lock()
 	defer w.Unlock()
+
 	w.posts++
 
 	ctx, cancel := context.WithTimeout(context.Background(), w.Timeout.Duration+time.Second)
@@ -195,7 +201,7 @@ func (w *WebhookConfig) send(ctx context.Context, body io.Reader) ([]byte, error
 		return nil, fmt.Errorf("creating request: %w", err)
 	}
 
-	req.Header.Set("content-type", w.CType)
+	req.Header.Set("Content-Type", w.CType)
 
 	res, err := w.client.Do(req)
 	if err != nil {
@@ -266,24 +272,24 @@ func (u *Unpackerr) logWebhook() {
 		pfx = " => Webhook Config: 1 URL"
 	} else {
 		u.Printf(" => Webhook Configs: %d URLs", len(u.Webhook))
-		pfx = " =>    URL"
+		pfx = " =>    URL" //nolint:wsl
 	}
 
 	for _, f := range u.Webhook {
 		if ex = ""; f.TmplPath != "" {
-			ex = fmt.Sprintf(", template: %s, content_type: %s", f.TmplPath, f.CType)
+			ex = ", template: " + f.TmplPath + ", content_type: " + f.CType
 		}
 
 		if f.Channel != "" {
-			ex += fmt.Sprintf(", channel: %s", f.Channel)
+			ex += ", channel: " + f.Channel
 		}
 
 		if f.Nickname != "" {
-			ex += fmt.Sprintf(", nickname: %s", f.Nickname)
+			ex += ", nickname: " + f.Nickname
 		}
 
 		if len(f.Exclude) > 0 {
-			ex += fmt.Sprintf(", exclude: %q", strings.Join(f.Exclude, "; "))
+			ex += ", exclude: \"" + strings.Join(f.Exclude, "; ") + `"`
 		}
 
 		u.Printf("%s: %s, timeout: %v, ignore ssl: %v, silent: %v%s, events: %q",

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ func (u *Unpackerr) logFolders() {`
`84`	`84`	`if epath = ""; folder.ExtractPath != "" {`
`85`	`85`	`epath = ", extract to: " + folder.ExtractPath`
`86`	`86`	`}`
	`87`	`+`
`87`	`88`	`u.Printf(" => Path: %s%s (delete after:%v, delete orig:%v, log file: %v, move back:%v, isos:%v)",`
`88`	`89`	`folder.Path, epath, folder.DeleteAfter, folder.DeleteOrig, !folder.DisableLog, folder.MoveBack, folder.ExtractISOs)`
`89`	`90`	`}`