fix linter issues

.golangci.yaml

@@ -42,7 +42,7 @@ linters:
     # - rowserrcheck
     # style
     - asciicheck
-    - depguard
+    # depguard
     - dogsled
     - dupl
     # - exhaustivestruct
@@ -62,7 +62,6 @@ linters:
     - gomodguard
     - goprintffuncname
     - gosimple
-    - ifshort
     - importas
     # - interfacer
     - lll
@@ -82,13 +81,10 @@ linters:
     - whitespace
     - wrapcheck
     - wsl
-    # unused
-    - deadcode
+    - unused
     - ineffassign
-    - structcheck
     - unparam
     - unused
-    - varcheck
   fast: false
 
 linters-settings:

cmd/backup.go

@@ -68,8 +68,8 @@ value takes precedence over the --persona flag.
 			ui.Infof("Encryption passphrase is: %s", passphrase)
 		},
 	}
+
 	backupCmd.Flags().String("persona", "", "The persona to backup")
 
 	return backupCmd
-
 }

cmd/cmd.go

@@ -1,11 +1,12 @@
 package cmd
 
 import (
-	"github.com/endorama/devid/cmd/ui"
 	"github.com/spf13/cobra"
+
+	"github.com/endorama/devid/cmd/ui"
 )
 
-var cli *cobra.Command
+var cli *cobra.Command //nolint:gochecknoglobals // one cli to rule them all
 
 // Init initialises a cobra CLI with all commands from this package.
 func Init() {

cmd/rehash.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/endorama/devid/cmd/ui"
 	cmdutils "github.com/endorama/devid/cmd/utils"
+	"github.com/endorama/devid/internal/persona"
 	"github.com/endorama/devid/internal/plugin/manager"
 	"github.com/endorama/devid/internal/utils"
 )
@@ -50,103 +51,102 @@ goes bad you can still load a persona's shell environment by running
 
 rehash command is directly inspired by rbenv, a ruby version manager.
 `,
-		Run: func(cmd *cobra.Command, args []string) {
-			if viper.GetString("active_persona") != "" {
-				// NOTE: rehashing when a profile is active is dangerous, as the environment
-				// has been changed with customizations and there is no guarantee about
-				// what those changes have affected.
-				// This may be especially problematic for executable path detection in
-				// plugin.
-				// As such we prevent rehashing while there is an active profile.
-				ui.Fatal(errRehashWithActiveProfile, genericExitCode)
-			}
-
-			var errs []error
-			var err error
-
-			p, err := cmdutils.LoadPersona(cmd)
-			if err != nil {
-				ui.Fatal(fmt.Errorf("cannot instantiate persona: %w", err), noPersonaLoadedExitCode)
-			}
-			// errs, err := manager.LoadPlugins(p.Config)
-			// if err != nil {
-			//   ui.Error(err.Error())
-			//
-			//   for _, e := range errs {
-			//     ui.Error(e.Error())
-			//   }
-			//
-			//   os.Exit(pluginManagerLoadingErrorExitCode)
-			// }
-
-			errs, err = manager.LoadCorePlugins(p.Config)
-			if err != nil {
-				ui.Error(err)
-
-				for _, e := range errs {
-					ui.Error(e)
-				}
-
-				os.Exit(pluginManagerCoreLoadingErrorExitCode)
-			}
-
-			errs, err = manager.LoadOptionalPlugins(p.Config)
-			if err != nil {
-				ui.Error(err)
-
-				for _, e := range errs {
-					ui.Error(e)
-				}
-
-				os.Exit(pluginManagerOptionalLoadingErrorExitCode)
-			}
-
-			log.Printf("persona: %+v\n", p)
-
-			errs, err = manager.SetupPlugins(p)
-			if err != nil {
-				ui.Error(err)
-
-				for _, e := range errs {
-					ui.Error(e)
-				}
-
-				os.Exit(pluginGenerationExitCode)
-			}
-
-			errs, err = manager.Generate(p)
-			if err != nil {
-				ui.Error(err)
-
-				for _, e := range errs {
-					ui.Error(e)
-				}
-
-				os.Exit(pluginGenerationExitCode)
-			}
-
-			content, err := manager.ShellLoader(p)
-			if err != nil {
-				ui.Error(err)
-				os.Exit(1)
-			}
-
-			log.Printf("%+v\n", content)
-
-			shellLoaderFilePath := path.Join(p.Location(), viper.GetString("shell_loader_filename"))
-			err = utils.PersistFile(shellLoaderFilePath, content)
-			if err != nil {
-				ui.Fatal(fmt.Errorf("cannot save shell loader: %w", err), genericExitCode)
-			}
-
-			if err := os.Chmod(shellLoaderFilePath, permUserRWX); err != nil {
-				ui.Fatal(
-					fmt.Errorf("cannot change permissions to %s on %s: %v", permUserRWX, shellLoaderFilePath, err),
-					genericExitCode)
-			}
-		},
+		Run: runRehash,
 	}
 
 	rehashCmd.Flags().String("persona", "", "The persona for which to rebuild the shell configuration")
+
 	return rehashCmd
 }
+
+func runRehash(cmd *cobra.Command, _ []string) {
+	if viper.GetString("active_persona") != "" {
+		// NOTE: rehashing when a profile is active is dangerous, as the environment
+		// has been changed with customizations and there is no guarantee about
+		// what those changes have affected.
+		// This may be especially problematic for executable path detection in
+		// plugin.
+		// As such we prevent rehashing while there is an active profile.
+		ui.Fatal(errRehashWithActiveProfile, genericExitCode)
+	}
+
+	var (
+		errs []error
+		err  error
+	)
+
+	p, err := cmdutils.LoadPersona(cmd)
+	if err != nil {
+		ui.Fatal(fmt.Errorf("cannot instantiate persona: %w", err), noPersonaLoadedExitCode)
+	}
+	// errs, err := manager.LoadPlugins(p.Config)
+	// if err != nil {
+	//   ui.Error(err.Error())
+	//
+	//   for _, e := range errs {
+	//     ui.Error(e.Error())
+	//   }
+	//
+	//   os.Exit(pluginManagerLoadingErrorExitCode)
+	// }
+
+	errs, err = manager.LoadCorePlugins(p.Config)
+	if err != nil {
+		handleAllErrors(errs, err, pluginManagerCoreLoadingErrorExitCode)
+	}
+
+	errs, err = manager.LoadOptionalPlugins(p.Config)
+	if err != nil {
+		handleAllErrors(errs, err, pluginManagerOptionalLoadingErrorExitCode)
+	}
+
+	log.Printf("persona: %+v\n", p)
+
+	errs, err = manager.SetupPlugins(p)
+	if err != nil {
+		handleAllErrors(errs, err, pluginGenerationExitCode)
+	}
+
+	errs, err = manager.Generate(p)
+	if err != nil {
+		handleAllErrors(errs, err, pluginGenerationExitCode)
+	}
+
+	fn := viper.GetString("shell_loader_filename")
+	if err := writeShellLoader(p, fn); err != nil {
+		ui.Fatal(err, genericExitCode)
+	}
+}
+
+func handleAllErrors(errs []error, err error, exitCode int) {
+	ui.Error(err)
+
+	for _, e := range errs {
+		ui.Error(e)
+	}
+
+	os.Exit(exitCode)
+}
+
+func writeShellLoader(p persona.Persona, filename string) error {
+	content, err := manager.ShellLoader(p)
+	if err != nil {
+		ui.Error(err)
+		os.Exit(1)
+	}
+
+	log.Printf("%+v\n", content)
+
+	shellLoaderFilePath := path.Join(p.Location(), filename)
+
+	err = utils.PersistFile(shellLoaderFilePath, content)
+	if err != nil {
+		return fmt.Errorf("cannot save shell loader: %w", err)
+	}
+
+	if err := os.Chmod(shellLoaderFilePath, permUserRWX); err != nil {
+		return fmt.Errorf("cannot change permissions to %s on %s: %w", permUserRWX, shellLoaderFilePath, err)
+	}
+
+	return nil
+}

cmd/root.go

@@ -32,7 +32,6 @@ var cfgFile string //nolint:gochecknoglobals // required for init
 var verbose bool   //nolint:gochecknoglobals // require for init
 
 func RootCmd() *cobra.Command {
-	// rootCmd represents the base command when called without any subcommands.
 	var rootCmd = &cobra.Command{ //nolint:gochecknoglobals // required by cobra
 		Use:   "devid",
 		Short: "Secure manager for your developer personas",
@@ -68,7 +67,6 @@ for persona's folders.
 
 func init() { //nolint:gochecknoinits // required by cobra
 	cobra.OnInitialize(initConfig)
-
 }
 
 // initConfig reads in config file and ENV variables if set.

cmd/shell.go

@@ -41,5 +41,6 @@ value takes precedence over the --persona flag.`,
 	}
 
 	shellCmd.Flags().String("persona", "", "The persona's shell to load")
+
 	return shellCmd
 }

cmd/whoami.go

@@ -81,5 +81,6 @@ value takes precedence over the --persona flag.
 	}
 
 	whoamiCmd.Flags().BoolP("extended", "e", false, "Print extended identity information")
+
 	return whoamiCmd
 }

internal/persona/new.go

@@ -1,8 +1,6 @@
 package persona
 
 import (
-	"errors"
-	"fmt"
 	"path"
 
 	"github.com/spf13/viper"
@@ -35,23 +33,3 @@ func NewWithCustomLocation(name, location string) (Persona, error) {
 		Config:   v,
 	}, nil
 }
-
-var errPersonaDoesNotExists = errors.New("does not exists")
-
-func Load(name string) (Persona, error) {
-	p, err := New(name)
-	if err != nil {
-		return p, fmt.Errorf("init failed: %w", err)
-	}
-
-	if !p.Exists() {
-		return p, fmt.Errorf("%w in %s", errPersonaDoesNotExists, p.Location())
-	}
-
-	err = p.Load()
-	if err != nil {
-		return p, fmt.Errorf("cannot load persona configuration: %w", err)
-	}
-
-	return p, nil
-}

internal/plugin/manager/shellfile.go

@@ -15,8 +15,9 @@ import (
 	"github.com/endorama/devid/internal/plugin"
 )
 
+//
+//nolint:gochecknoglobals // required by embed
 //go:embed load.sh.txt
-// nolint:gochecknoglobals // required by embed
 var shellLoader string
 
 // ShellLoader generate profile shell loader file.

internal/settings/settings.go

@@ -32,7 +32,7 @@ func setDefaults() {
 	viper.SetDefault("shell", os.Getenv("SHELL"))
 }
 
-// nolint:deadcode,unused // will use it
+//nolint:deadcode,unused // will use it
 func readConfigFile() {
 	viper.SetConfigName("config")
 	viper.SetConfigType("yaml")

internal/utils/editor.go

@@ -36,7 +36,7 @@ func OpenWithEditor(path string) error {
 // AllowedEditors is a list of allowed values for the EDITOR environment variable.
 // FIXME: prevent unknown command execution when some of these editor is not available.
 // FIXME: make this a function so is not directly modifiable.
-var AllowedEditors = []string{ // nolint:gochecknoglobals // implementation detail
+var AllowedEditors = []string{ //nolint:gochecknoglobals // implementation detail
 	"/bin/ed",
 	"/bin/nano",
 	"/usr/bin/vim",

plugins/bin/renderable.go

@@ -2,7 +2,7 @@ package bin
 
 import "strings"
 
-func (p Plugin) Render(profileName, profileLocation string) string {
+func (p Plugin) Render(_, profileLocation string) string {
 	sb := strings.Builder{}
 	sb.WriteString("export PATH=\"" + profileLocation + "/bin:$PATH\"\n")
 

plugins/envs/renderable.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-func (p Plugin) Render(profileName, profileLocation string) string {
+func (p Plugin) Render(_, _ string) string {
 	sb := strings.Builder{}
 
 	for name, value := range p.config {

plugins/gcp/plugin.go

@@ -1,7 +1,7 @@
 package gcp
 
-// TODO: add gcp.NewPlugin() to internal/plugin/manager/available.go under Optional
-// TODO: add enabled check in internal/plugin/manager/manager.go LoadOptionalPlugins switch case
+// TODO: add gcp.NewPlugin() to internal/plugin/manager/available.go under Optional.
+// TODO: add enabled check in internal/plugin/manager/manager.go LoadOptionalPlugins switch case.
 const pluginName = "gcp"
 
 type Plugin struct {

plugins/gcp/renderable.go

@@ -4,7 +4,7 @@ import "strings"
 
 // Render returns content rendered by the plugin.
 // Implements `plugin.Renderable` interface.
-func (p Plugin) Render(personaName, personaDirectory string) string {
+func (p Plugin) Render(_, _ string) string {
 	// TODO: implement rendering logic
 	sb := strings.Builder{}
 	// sb.WriteString("plugin rendered content")