fix some linting failures and configure golangci-lint

.golangci.yaml

@@ -0,0 +1,16 @@
+linters:
+  # Disable all linters.
+  # Default: false
+  disable-all: true
+  # Enable specific linter
+  # https://golangci-lint.run/usage/linters/#enabled-by-default
+  enable:
+    # default linter
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    # custom linter
+    - gofmt

Makefile

@@ -35,6 +35,11 @@ htmlcov:
 	go test -v -coverpkg=./... -coverprofile=c.out ./...
 	go tool cover -html ./c.out
 
+.PHONY: golangci-lint
+golangci-lint:
+	$(info INFO: Starting build $@)
+	go install github.com/golangci/golangci-lint/cmd/[email protected]
+	golangci-lint run --timeout 5m $(pkgs)
 
 lint:
 	$(info INFO: Starting build $@)

cmd/goss/goss.go

@@ -423,14 +423,6 @@ func addAlphaFlagIfNeeded(app *cli.App) {
 	}
 }
 
-const msgFormat string = `WARNING: goss for this platform (%q) is alpha-quality, work-in-progress and community-supported.
-
-You should not expect everything to work. Treat linux as the canonical behaviour to expect.
-
-Please see https://github.com/goss-org/goss/tree/master/docs/platform-feature-parity.md to set your expectations and see progress.
-Please file issues via https://github.com/goss-org/goss/issues/new/choose
-Pull requests and bug reports very welcome.`
-
 func fatalAlphaIfNeeded(c *cli.Context) {
 	if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
 		if c.GlobalString("use-alpha") != "1" {

matchers/have_patterns.go

@@ -146,14 +146,6 @@ func (m *HavePatternsMatcher) NegatedFailureResult(actual interface{}) MatcherRe
 	}
 }
 
-func appendMissingStrings(message string, missingElements []string) string {
-	if len(missingElements) == 0 {
-		return message
-	}
-	return fmt.Sprintf("%s\nthe missing elements were\n%s", message,
-		format.Object(missingElements, 1))
-}
-
 type patternMatcher interface {
 	Match(string) bool
 	Pattern() string

outputs/rspecish.go

@@ -43,15 +43,15 @@ func (r Rspecish) Output(w io.Writer, results <-chan []resource.TestResult,
 			switch testResult.Result {
 			case resource.SUCCESS:
 				logTrace("TRACE", "SUCCESS", testResult, false)
-				fmt.Fprintf(w, green("."))
+				fmt.Fprint(w, green("."))
 			case resource.SKIP:
 				logTrace("TRACE", "SKIP", testResult, false)
-				fmt.Fprintf(w, yellow("S"))
+				fmt.Fprint(w, yellow("S"))
 				failedOrSkippedGroup = append(failedOrSkippedGroup, testResult)
 				skipped++
 			case resource.FAIL:
 				logTrace("TRACE", "FAIL", testResult, false)
-				fmt.Fprintf(w, red("F"))
+				fmt.Fprint(w, red("F"))
 				failedOrSkippedGroup = append(failedOrSkippedGroup, testResult)
 				failed++
 			}

resource/resource.go

@@ -5,11 +5,9 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
 	"sync"
 
 	"github.com/goss-org/goss/system"
-	"github.com/oleiade/reflections"
 )
 
 type Resource interface {
@@ -66,18 +64,6 @@ func deprecateAtoI(depr any, desc string) any {
 	return float64(i)
 }
 
-func validAttrs(i any, t string) (map[string]bool, error) {
-	validAttrs := make(map[string]bool)
-	tags, err := reflections.Tags(i, t)
-	if err != nil {
-		return nil, err
-	}
-	for _, v := range tags {
-		validAttrs[strings.Split(v, ",")[0]] = true
-	}
-	return validAttrs, nil
-}
-
 func shouldSkip(results []TestResult) bool {
 	if len(results) < 1 {
 		return false

resource/resource_list.go

@@ -39,7 +39,7 @@ func (r AddrMap) AppendSysResourceIfExists(sr string, sys *system.System) (*Addr
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -140,7 +140,7 @@ func (r CommandMap) AppendSysResourceIfExists(sr string, sys *system.System) (*C
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -241,7 +241,7 @@ func (r DNSMap) AppendSysResourceIfExists(sr string, sys *system.System) (*DNS,
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -342,7 +342,7 @@ func (r FileMap) AppendSysResourceIfExists(sr string, sys *system.System) (*File
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -443,7 +443,7 @@ func (r GossfileMap) AppendSysResourceIfExists(sr string, sys *system.System) (*
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -544,7 +544,7 @@ func (r GroupMap) AppendSysResourceIfExists(sr string, sys *system.System) (*Gro
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -645,7 +645,7 @@ func (r PackageMap) AppendSysResourceIfExists(sr string, sys *system.System) (*P
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -746,7 +746,7 @@ func (r PortMap) AppendSysResourceIfExists(sr string, sys *system.System) (*Port
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -847,7 +847,7 @@ func (r ProcessMap) AppendSysResourceIfExists(sr string, sys *system.System) (*P
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -948,7 +948,7 @@ func (r ServiceMap) AppendSysResourceIfExists(sr string, sys *system.System) (*S
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -1049,7 +1049,7 @@ func (r UserMap) AppendSysResourceIfExists(sr string, sys *system.System) (*User
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -1150,7 +1150,7 @@ func (r KernelParamMap) AppendSysResourceIfExists(sr string, sys *system.System)
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -1251,7 +1251,7 @@ func (r MountMap) AppendSysResourceIfExists(sr string, sys *system.System) (*Mou
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -1352,7 +1352,7 @@ func (r InterfaceMap) AppendSysResourceIfExists(sr string, sys *system.System) (
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {
@@ -1453,7 +1453,7 @@ func (r HTTPMap) AppendSysResourceIfExists(sr string, sys *system.System) (*HTTP
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {

resource/resource_list_genny.go

@@ -47,7 +47,7 @@ func (r ResourceTypeMap) AppendSysResourceIfExists(sr string, sys *system.System
 	if err != nil {
 		return nil, nil, false, err
 	}
-	if e, _ := sysres.Exists(); e != true {
+	if e, _ := sysres.Exists(); !e {
 		return res, sysres, false, nil
 	}
 	if old_res, ok := r[res.ID()]; ok {

resource/validate.go

@@ -41,10 +41,6 @@ func HumanOutcomes() map[int]string {
 	return humanOutcomes
 }
 
-const (
-	maxScanTokenSize = 10 * 1024 * 1024
-)
-
 type ValidateError string
 
 func (g ValidateError) Error() string { return string(g) }

system/file.go

@@ -45,7 +45,6 @@ const (
 type DefFile struct {
 	path     string
 	realPath string
-	fi       os.FileInfo
 	loaded   bool
 	err      error
 }

system/kernel_param.go

@@ -14,8 +14,7 @@ type KernelParam interface {
 }
 
 type DefKernelParam struct {
-	key   string
-	value string
+	key string
 }
 
 func NewDefKernelParam(_ context.Context, key string, system *System, config util.Config) KernelParam {

system/service.go

@@ -11,8 +11,5 @@ type Service interface {
 }
 
 func invalidService(s string) bool {
-	if strings.ContainsRune(s, '/') {
-		return true
-	}
-	return false
+	return strings.ContainsRune(s, '/')
 }

system/service_systemd.go

@@ -35,7 +35,9 @@ func (s *ServiceSystemd) Exists() (bool, error) {
 		return false, nil
 	}
 	cmd := util.NewCommand("systemctl", "-q", "list-unit-files", "--type=service")
-	cmd.Run()
+	if err := cmd.Run(); err != nil {
+		return false, err
+	}
 	if strings.Contains(cmd.Stdout.String(), fmt.Sprintf("%s.service", s.service)) {
 		return true, cmd.Err
 	}
@@ -54,7 +56,9 @@ func (s *ServiceSystemd) Enabled() (bool, error) {
 		return false, nil
 	}
 	cmd := util.NewCommand("systemctl", "-q", "is-enabled", s.service)
-	cmd.Run()
+	if err := cmd.Run(); err != nil {
+		return false, err
+	}
 	if cmd.Status == 0 {
 		return true, cmd.Err
 	}
@@ -73,7 +77,9 @@ func (s *ServiceSystemd) Running() (bool, error) {
 		return false, nil
 	}
 	cmd := util.NewCommand("systemctl", "-q", "is-active", s.service)
-	cmd.Run()
+	if err := cmd.Run(); err != nil {
+		return false, err
+	}
 	if cmd.Status == 0 {
 		return true, cmd.Err
 	}