chore: linter fixes

.golangci.yaml

@@ -1,13 +1,5 @@
 run:
   modules-download-mode: readonly
-  skip-dirs:
-    - .git
-    - .github
-    - .vscode
-    - bin
-    - dist
-    - man
-    - testdata
 
 linters:
   disable-all: true
@@ -42,14 +34,22 @@ linters-settings:
   goimports:
     local-prefixes: github.com/axiomhq/cli
   govet:
-    check-shadowing: true
+    shadow: true
   nolintlint:
     allow-unused: false
     allow-leading-space: false
     require-explanation: true
     require-specific: true
 
 issues:
+  exclude-dirs:
+    - .git
+    - .github
+    - .vscode
+    - bin
+    - dist
+    - man
+    - testdata
   exclude-rules:
     - linters:
         - staticcheck

internal/client/auth/auth_test.go

@@ -105,7 +105,7 @@ func TestLogin_AuthorizationError(t *testing.T) {
 
 	r := http.NewServeMux()
 	r.Handle("/oauth/authorize", http.HandlerFunc(authHf))
-	r.Handle("/oauth/token", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	r.Handle("/oauth/token", http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
 		t.Error("should not be called")
 	}))
 
@@ -140,7 +140,7 @@ func TestLogin_ExchangeError(t *testing.T) {
 		http.Redirect(w, r, redirectURI.String(), http.StatusFound)
 	}
 
-	tokenHf := func(w http.ResponseWriter, r *http.Request) {
+	tokenHf := func(w http.ResponseWriter, _ *http.Request) {
 		code := http.StatusInternalServerError
 		http.Error(w, http.StatusText(code), code)
 	}

internal/cmd/auth/auth_status.go

@@ -50,7 +50,7 @@ func newStatusCmd(f *cmdutil.Factory) *cobra.Command {
 			cmdutil.NeedsValidDeployment(f, &opts.Alias),
 		),
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return runStatus(cmd.Context(), opts)
 		},
 	}

internal/cmd/auth/auth_update_token.go

@@ -55,7 +55,7 @@ func newUpdateTokenCmd(f *cmdutil.Factory) *cobra.Command {
 			return completeUpdateToken(opts)
 		},
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return runUpdateToken(cmd.Context(), opts)
 		},
 	}

internal/cmd/completion/completion_zsh.go

@@ -25,7 +25,7 @@ func newZshCmd(f *cmdutil.Factory) *cobra.Command {
 			$ axiom completion zsh > "${fpath[1]}/_axiom"
 		`),
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			if completionNoDesc {
 				return cmd.Root().GenZshCompletionNoDesc(f.IO.Out())
 			}

internal/cmd/config/config_export.go

@@ -53,7 +53,7 @@ func newExportCommand(f *cmdutil.Factory) *cobra.Command {
 			$ eval $(axiom config export --force)
 		`),
 
-		RunE: func(_ *cobra.Command, args []string) error {
+		RunE: func(*cobra.Command, []string) error {
 			// check that the force flag was used
 			if !opts.Force {
 				fmt.Fprintf(opts.IO.ErrOut(), "%s %s\n", opts.IO.ColorScheme().ErrorIcon(), forceMessage)

internal/cmd/dataset/dataset_list.go

@@ -39,7 +39,7 @@ func newListCmd(f *cmdutil.Factory) *cobra.Command {
 
 		PreRunE: cmdutil.NeedsDatasets(f),
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return runList(cmd.Context(), opts)
 		},
 	}
@@ -81,7 +81,7 @@ func runList(ctx context.Context, opts *listOptions) error {
 
 	var header iofmt.HeaderBuilderFunc
 	if opts.IO.IsStdoutTTY() {
-		header = func(w io.Writer, trb iofmt.TableRowBuilder) {
+		header = func(_ io.Writer, trb iofmt.TableRowBuilder) {
 			fmt.Fprintf(opts.IO.Out(), "Showing %s:\n\n", utils.Pluralize(cs, "dataset", len(datasets)))
 			trb.AddField("Name", cs.Bold)
 			trb.AddField("Description", cs.Bold)

internal/cmd/ingest/ingest.go

@@ -147,7 +147,7 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			cmdutil.NeedsDatasets(f),
 		),
 
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
+		RunE: func(cmd *cobra.Command, _ []string) (err error) {
 			// When no files are specified, stdin is the file to use.
 			if len(opts.Filenames) == 0 {
 				opts.Filenames = []string{"-"}

internal/cmd/query/query.go

@@ -84,7 +84,7 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			cmdutil.NeedsDatasets(f),
 		),
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			if err := complete(opts); err != nil {
 				return err
 			}
@@ -236,7 +236,7 @@ func run(ctx context.Context, opts *options) error {
 		columnNames = res.GroupBy
 	)
 	if opts.IO.IsStdoutTTY() {
-		header = func(w io.Writer, trb iofmt.TableRowBuilder) {
+		header = func(_ io.Writer, trb iofmt.TableRowBuilder) {
 			fmt.Fprint(opts.IO.Out(), headerText)
 			for _, name := range columnNames {
 				trb.AddField(name, cs.Bold)

internal/cmd/root/root.go

@@ -52,7 +52,7 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			`),
 		},
 
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) (err error) {
+		PersistentPreRunE: func(cmd *cobra.Command, _ []string) (err error) {
 			if fl := cmd.Flag("config"); fl.Changed {
 				if f.Config, err = config.Load(fl.Value.String()); err != nil {
 					return err
@@ -95,7 +95,7 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 		PreRunE: cmdutil.AsksForSetup(f, authCmd.NewLoginCmd(f)),
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return cmd.Help()
 		},
 	}

internal/cmd/stream/stream.go

@@ -63,7 +63,7 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			cmdutil.NeedsDatasets(f),
 		),
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			if err := complete(cmd.Context(), opts); err != nil {
 				return err
 			}

internal/cmdutil/args.go

@@ -10,7 +10,7 @@ import (
 // It applies cobra.MaximumNArgs() with n being the amount of values to
 // populate.
 func PopulateFromArgs(f *Factory, ss ...*string) cobra.PositionalArgs {
-	populate := func(cmd *cobra.Command, args []string) error {
+	populate := func(_ *cobra.Command, args []string) error {
 		if !f.IO.IsStdinTTY() && len(args) < len(ss) {
 			return ErrNoPromptArgRequired
 		}

internal/cmdutil/chain.go

@@ -158,7 +158,7 @@ func NeedsActiveDeployment(f *Factory) RunFunc {
 // NeedsDeployments prints an error message and errors silently if no
 // deployments are configured.
 func NeedsDeployments(f *Factory) RunFunc {
-	return func(cmd *cobra.Command, _ []string) error {
+	return func(_ *cobra.Command, _ []string) error {
 		if len(f.Config.Deployments) == 0 {
 			return execTemplateSilent(f.IO, noDeploymentsMsgTmpl, nil)
 		}
@@ -169,7 +169,7 @@ func NeedsDeployments(f *Factory) RunFunc {
 // NeedsValidDeployment prints an error message and errors silently if the given
 // deployment is not configured. An empty alias is not evaluated.
 func NeedsValidDeployment(f *Factory, alias *string) RunFunc {
-	return func(cmd *cobra.Command, _ []string) error {
+	return func(_ *cobra.Command, _ []string) error {
 		if _, ok := f.Config.Deployments[*alias]; !ok && *alias != "" {
 			return execTemplateSilent(f.IO, badDeploymentMsgTmpl, map[string]string{
 				"Deployment": *alias,