Fix more linting warnings and errors

Author: MDrakos

.golangci.yaml

@@ -1,6 +1,10 @@
-run:
-  skip-dirs:
+issues:
+  exclude-dirs:
     - vendor
+  exclude-rules:
+    - linters:
+        - staticcheck
+      text: "SA9004"
 
 linters-settings:
   errcheck:
@@ -31,12 +35,10 @@ linters-settings:
       - (*github.com/ActiveState/cli/pkg/platform/runtime/artifactcache.testArtifactCache).Store
       - github.com/ActiveState/cli/internal/testhelpers/osutil.RemoveConfigFile
       - (*github.com/ActiveState/cli/internal/logging.standardHandler).Emit
+      - (*github.com/ActiveState/cli/internal/logging.fileHandler).Emit
   govet:
     disable:
       - composites
-linters:
-  disable:
-    - errcheck
 
 # When issues occur with linting us the snippet below to help with debugging
 # linters:

cmd/state-installer/cmd.go

@@ -34,7 +34,7 @@ import (
 	"github.com/ActiveState/cli/internal/subshell/bash"
 	"github.com/ActiveState/cli/pkg/project"
 	"github.com/ActiveState/cli/pkg/sysinfo"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 type Params struct {
@@ -424,7 +424,7 @@ func postInstallEvents(out output.Outputer, cfg *config.Instance, an analytics.D
 			an.EventWithLabel(anaConst.CatInstallerFunnel, "forward-activate-default-err", err.Error())
 			return errs.Silence(errs.Wrap(err, "Could not activate %s, error returned: %s", params.activateDefault.String(), errs.JoinMessage(err)))
 		}
-	case !params.isUpdate && terminal.IsTerminal(int(os.Stdin.Fd())) && os.Getenv(constants.InstallerNoSubshell) != "true" && os.Getenv("TERM") != "dumb":
+	case !params.isUpdate && term.IsTerminal(int(os.Stdin.Fd())) && os.Getenv(constants.InstallerNoSubshell) != "true" && os.Getenv("TERM") != "dumb":
 		if err := ss.SetEnv(osutils.InheritEnv(envMap(binPath))); err != nil {
 			return locale.WrapError(err, "err_subshell_setenv")
 		}
@@ -489,37 +489,3 @@ func assertCompatibility() error {
 
 	return nil
 }
-
-func noArgs() bool {
-	return len(os.Args[1:]) == 0
-}
-
-func shouldUpdateInstalledStateTool(stateExePath string) bool {
-	logging.Debug("Checking if installed state tool is an older version.")
-
-	stdout, _, err := osutils.ExecSimple(stateExePath, []string{"--version", "--output", "json"}, os.Environ())
-	if err != nil {
-		logging.Debug("Could not determine state tool version.")
-		return true // probably corrupted install
-	}
-	stdout = strings.Split(stdout, "\x00")[0] // TODO: DX-328
-
-	versionData := installation.VersionData{}
-	err = json.Unmarshal([]byte(stdout), &versionData)
-	if err != nil {
-		logging.Debug("Could not read state tool version output")
-		return true
-	}
-
-	if versionData.Channel != constants.ChannelName {
-		logging.Debug("State tool channel is different from installer.")
-		return false // do not update, require --force
-	}
-
-	if versionData.Version != constants.Version {
-		logging.Debug("State tool version is different from installer.")
-		return true
-	}
-
-	return false
-}

cmd/state-installer/installer.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -194,7 +193,7 @@ func detectCorruptedInstallDir(path string) error {
 	}
 
 	// Detect if the install dir has files in it
-	files, err := ioutil.ReadDir(path)
+	files, err := os.ReadDir(path)
 	if err != nil {
 		return errs.Wrap(err, "Could not read directory: %s", path)
 	}

cmd/state-installer/installer_lin_mac.go

@@ -4,7 +4,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -18,7 +17,7 @@ func (i *Installer) sanitizeInstallPath() error {
 		return nil
 	}
 
-	files, err := ioutil.ReadDir(i.path)
+	files, err := os.ReadDir(i.path)
 	if err != nil {
 		return errs.Wrap(err, "Could not installation directory: %s", i.path)
 	}

cmd/state-installer/test/integration/installer_int_test.go

@@ -262,7 +262,10 @@ func (suite *InstallerIntegrationTestSuite) TestInstallWhileInUse() {
 	cp2.ExpectExit() // the return code can vary depending on shell (e.g. zsh vs. bash); just assert the installer shell exited
 
 	oldStateExeFound := false
-	for _, file := range fileutils.ListDirSimple(filepath.Join(installationDir(ts), "bin"), false) {
+	files, err := fileutils.ListDirSimple(filepath.Join(installationDir(ts), "bin"), false)
+	suite.Require().NoError(err)
+
+	for _, file := range files {
 		if strings.Contains(file, "state.exe") && strings.HasSuffix(file, ".old") {
 			oldStateExeFound = true
 			break

cmd/state-svc/autostart/autostart.go

@@ -25,10 +25,14 @@ func RegisterConfigListener(cfg *config.Instance) error {
 	configMediator.AddListener(constants.AutostartSvcConfigKey, func() {
 		if cfg.GetBool(constants.AutostartSvcConfigKey) {
 			logging.Debug("Enabling autostart")
-			autostart.Enable(app.Path(), Options)
+			if err := autostart.Enable(app.Path(), Options); err != nil {
+				logging.Error("Failed to enable autostart: %s", err)
+			}
 		} else {
 			logging.Debug("Disabling autostart")
-			autostart.Disable(app.Path(), Options)
+			if err := autostart.Disable(app.Path(), Options); err != nil {
+				logging.Error("Failed to disable autostart: %s", err)
+			}
 		}
 	})
 

cmd/state-svc/internal/messages/messages.go

@@ -76,7 +76,8 @@ func (m *Messages) Check(command string, flags []string) ([]*graph.MessageInfo,
 	}
 	allMessages := cacheValue.([]*graph.MessageInfo)
 
-	conditionParams := &(*m.baseParams) // copy
+	// copy the base params
+	conditionParams := &(*m.baseParams) //nolint:staticcheck
 	conditionParams.UserEmail = m.auth.Email()
 	conditionParams.UserName = m.auth.WhoAmI()
 	conditionParams.Command = command

cmd/state-svc/test/integration/svc_int_test.go

@@ -2,7 +2,6 @@ package integration
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -53,15 +52,15 @@ func (suite *SvcIntegrationTestSuite) TestStartStop() {
 	cp.Expect("Checking")
 
 	// Verify the server is running on its reported port.
-	cp.ExpectRe("Port:\\s+:\\d+\\s")
-	portRe := regexp.MustCompile("Port:\\s+:(\\d+)")
+	cp.ExpectRe(`Port:\s+:\d+\s`)
+	portRe := regexp.MustCompile(`Port:\s+:(\d+)`)
 	port := portRe.FindStringSubmatch(cp.Output())[1]
 	_, err := net.Listen("tcp", "localhost:"+port)
 	suite.Error(err)
 
 	// Verify it created and wrote to its reported log file.
-	cp.ExpectRe("Log:\\s+.+?\\.log")
-	logRe := regexp.MustCompile("Log:\\s+(.+?\\.log)")
+	cp.ExpectRe(`Log:\s+(.+?\.log)`)
+	logRe := regexp.MustCompile(`Log:\s+(.+?\.log)`)
 	logFile := logRe.FindStringSubmatch(cp.Output())[1]
 	suite.True(fileutils.FileExists(logFile), "log file '"+logFile+"' does not exist")
 	suite.True(len(fileutils.ReadFileUnsafe(logFile)) > 0, "log file is empty")
@@ -99,7 +98,8 @@ func (suite *SvcIntegrationTestSuite) TestSignals() {
 	cp := ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("foreground"))
 	cp.Expect("Starting")
 	time.Sleep(1 * time.Second) // wait for the service to start up
-	cp.Cmd().Process.Signal(syscall.SIGINT)
+	err := cp.Cmd().Process.Signal(syscall.SIGINT)
+	suite.NoError(err)
 	cp.Expect("caught a signal: interrupt")
 	cp.ExpectNotExitCode(0)
 
@@ -114,7 +114,8 @@ func (suite *SvcIntegrationTestSuite) TestSignals() {
 	cp = ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("foreground"))
 	cp.Expect("Starting")
 	time.Sleep(1 * time.Second) // wait for the service to start up
-	cp.Cmd().Process.Signal(syscall.SIGTERM)
+	err = cp.Cmd().Process.Signal(syscall.SIGTERM)
+	suite.NoError(err)
 	suite.NotContains(cp.Output(), "caught a signal")
 	cp.ExpectExitCode(0) // should exit gracefully
 
@@ -257,7 +258,7 @@ func (suite *SvcIntegrationTestSuite) TestLogRotation() {
 	time.Sleep(initialWait) // wait for state-svc to perform initial log rotation
 
 	// Verify the log rotation pruned the dummy log files.
-	files, err := ioutil.ReadDir(logDir)
+	files, err := os.ReadDir(logDir)
 	suite.Require().NoError(err)
 	remainingFooFiles := 0
 	for _, file := range files {
@@ -281,7 +282,7 @@ func (suite *SvcIntegrationTestSuite) TestLogRotation() {
 	time.Sleep(logRotateInterval - initialWait) // wait for another log rotation
 
 	// Verify that another log rotation pruned the dummy log files.
-	files, err = ioutil.ReadDir(logDir)
+	files, err = os.ReadDir(logDir)
 	suite.Require().NoError(err)
 	remainingFooFiles = 0
 	for _, file := range files {

cmd/state/autoupdate.go

@@ -192,6 +192,6 @@ func isFreshInstall() bool {
 		multilog.Error("Could not stat file: %s, error: %v", exe, err)
 		return true
 	}
-	diff := time.Now().Sub(stat.ModTime())
+	diff := time.Since(stat.ModTime())
 	return diff < 24*time.Hour
 }

cmd/state/internal/cmdtree/branch.go

@@ -23,30 +23,6 @@ func newBranchCommand(prime *primer.Values) *captain.Command {
 		}).SetGroup(PlatformGroup).SetSupportsStructuredOutput().SetUnstable(true)
 }
 
-func newBranchAddCommand(prime *primer.Values) *captain.Command {
-	runner := branch.NewAdd(prime)
-
-	params := branch.AddParams{}
-
-	return captain.NewCommand(
-		"add",
-		locale.Tl("add_title", "Adding branch"),
-		locale.Tl("add_description", "Add a branch to your project"),
-		prime,
-		[]*captain.Flag{},
-		[]*captain.Argument{
-			{
-				Name:        locale.Tl("branch_arg_name", "name"),
-				Description: locale.Tl("branch_arg_name_description", "Branch to be created"),
-				Value:       &params.Label,
-				Required:    true,
-			},
-		},
-		func(_ *captain.Command, _ []string) error {
-			return runner.Run(params)
-		}).SetSupportsStructuredOutput()
-}
-
 func newBranchSwitchCommand(prime *primer.Values) *captain.Command {
 	runner := swtch.New(prime)
 

cmd/state/main.go

@@ -207,8 +207,13 @@ func run(args []string, isInteractive bool, cfg *config.Instance, out output.Out
 
 	conditional := constraints.NewPrimeConditional(auth, pj, sshell.Shell())
 	project.RegisterConditional(conditional)
-	project.RegisterExpander("mixin", project.NewMixin(auth).Expander)
-	project.RegisterExpander("secrets", project.NewSecretPromptingExpander(secretsapi.Get(auth), prompter, cfg, auth))
+	if err := project.RegisterExpander("mixin", project.NewMixin(auth).Expander); err != nil {
+		logging.Debug("Could not register mixin expander: %v", err)
+	}
+
+	if err := project.RegisterExpander("secrets", project.NewSecretPromptingExpander(secretsapi.Get(auth), prompter, cfg, auth)); err != nil {
+		logging.Debug("Could not register secrets expander: %v", err)
+	}
 
 	// Run the actual command
 	cmds := cmdtree.New(primer.New(pj, out, auth, prompter, sshell, conditional, cfg, ipcClient, svcmodel, an), args...)

go.mod

@@ -65,7 +65,7 @@ require (
 	golang.org/x/net v0.8.0
 	golang.org/x/sys v0.12.0
 	golang.org/x/term v0.6.0
-	golang.org/x/text v0.8.0
+	golang.org/x/text v0.14.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2

go.sum

@@ -1322,6 +1322,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
 golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

internal/analytics/client/sync/reporters/ga-state.go

@@ -53,7 +53,9 @@ func (r *GaCLIReporter) Event(category, action, source, label string, d *dimensi
 	r.ga.CustomDimensionMap(legacyDimensionMap(d))
 
 	if category == anaConsts.CatRunCmd {
-		r.ga.Send(ga.NewPageview())
+		if err := r.ga.Send(ga.NewPageview()); err != nil {
+			return errs.Wrap(err, "Could not send GA Pageview")
+		}
 	}
 	event := ga.NewEvent(category, action)
 	if label != "" {

internal/captain/command.go

@@ -226,7 +226,9 @@ func NewHiddenShimCommand(name string, prime primer, flags []*Flag, args []*Argu
 	}
 
 	cmd.cobra.SetHelpFunc(func(_ *cobra.Command, args []string) {
-		cmd.execute(cmd, args)
+		if err := cmd.execute(cmd, args); err != nil {
+			panic(err)
+		}
 	})
 
 	if err := cmd.setFlags(flags); err != nil {
@@ -284,7 +286,7 @@ func (c *Command) ShortDescription() string {
 }
 
 func (c *Command) Execute(args []string) error {
-	defer profile.Measure(fmt.Sprintf("cobra:Execute"), time.Now())
+	defer profile.Measure("cobra:Execute", time.Now())
 	c.cobra.SetArgs(args)
 	err := c.cobra.Execute()
 	c.cobra.SetArgs(nil)
@@ -772,9 +774,6 @@ func (c *Command) outputTitleIfAny() {
 // setupSensibleErrors inspects an error value for certain errors and returns a
 // wrapped error that can be checked and that is localized.
 func setupSensibleErrors(err error, args []string) error {
-	if err, ok := err.(error); ok && err == nil {
-		return nil
-	}
 	if err == nil {
 		return nil
 	}

internal/captain/values.go

@@ -151,7 +151,7 @@ func (p *PackageValue) Set(s string) error {
 		p.Version = strings.TrimSpace(v[1])
 		s = v[0]
 	}
-	if strings.Index(s, "/") == -1 {
+	if !strings.Contains(s, "/") {
 		p.Name = strings.TrimSpace(s)
 		return nil
 	}

internal/colorize/color_test.go

@@ -1,4 +1,6 @@
+//go:build !windows
 // +build !windows
+
 // Can't test this on Windows since on Windows it sends process instructions to change colors
 
 package colorize
@@ -57,7 +59,8 @@ func Test_writeColorized(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			writer := &bytes.Buffer{}
-			Colorize(tt.value, writer, tt.strip)
+			_, err := Colorize(tt.value, writer, tt.strip)
+			assert.NoError(t, err, "Colorize failed")
 			assert.Equal(t, tt.expected, writer.String(), "Output did not match")
 		})
 	}

internal/config/instance.go

@@ -3,7 +3,6 @@ package config
 import (
 	"database/sql"
 	"encoding/json"
-	"fmt"
 	"os"
 	"path/filepath"
 	"sync"
@@ -64,7 +63,7 @@ func NewCustom(localPath string, thread *singlethread.Thread, closeThread bool)
 	isNew := err != nil
 
 	t := time.Now()
-	i.db, err = sql.Open("sqlite", fmt.Sprintf(`%s`, path))
+	i.db, err = sql.Open("sqlite", path)
 	if err != nil {
 		return nil, errs.Wrap(err, "Could not create sqlite connection to %s", path)
 	}
@@ -211,7 +210,10 @@ func (i *Instance) AllKeys() []string {
 	defer rows.Close()
 	for rows.Next() {
 		var key string
-		rows.Scan(&key)
+		if err = rows.Scan(&key); err != nil {
+			multilog.Error("config:AllKeys scan failed: %s", errs.JoinMessage(err))
+			return nil
+		}
 		keys = append(keys, key)
 	}
 	return keys