fix: lint

Author: aymanbagabas

.golangci.yml

@@ -23,7 +23,6 @@ linters:
     - goimports
     - goprintffuncname
     - gosec
-    - ifshort
     - misspell
     - prealloc
     - revive

client/link.go

@@ -145,13 +145,15 @@ func (cc *Client) SyncEncryptKeys() error {
 	return cc.deleteUserData()
 }
 
-// TODO find a better place for this, or do something more sophisticated than
-// just wiping it out.
 func (cc *Client) deleteUserData() error {
+	// nolint: godox
+	// TODO find a better place for this, or do something more sophisticated than
+	// just wiping it out.
 	dd, err := cc.DataPath()
 	if err != nil {
 		return err
 	}
+	// nolint: godox
 	// TODO add any other directories that need wiping
 	kvd := fmt.Sprintf("%s/kv", dd)
 	return os.RemoveAll(kvd)

cmd/completion.go

@@ -55,13 +55,13 @@ var CompletionCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		switch args[0] {
 		case "bash":
-			cmd.Root().GenBashCompletion(os.Stdout)
+			cmd.Root().GenBashCompletion(os.Stdout) // nolint: errcheck
 		case "zsh":
-			cmd.Root().GenZshCompletion(os.Stdout)
+			cmd.Root().GenZshCompletion(os.Stdout) // nolint: errcheck
 		case "fish":
-			cmd.Root().GenFishCompletion(os.Stdout, true)
+			cmd.Root().GenFishCompletion(os.Stdout, true) // nolint: errcheck
 		case "powershell":
-			cmd.Root().GenPowerShellCompletion(os.Stdout)
+			cmd.Root().GenPowerShellCompletion(os.Stdout) // nolint: errcheck
 		}
 	},
 }

cmd/import_keys.go

@@ -68,7 +68,11 @@ var (
 			}
 			if !empty && !forceImportOverwrite {
 				if common.IsTTY() {
-					return newImportConfirmationTUI(cmd.InOrStdin(), path, dd).Start()
+					p := newImportConfirmationTUI(cmd.InOrStdin(), path, dd)
+					if _, err := p.Run(); err != nil {
+						return err
+					}
+					return nil
 				}
 				return fmt.Errorf("not overwriting the existing keys in %s; to force, use -f", dd)
 			}

cmd/keys.go

@@ -33,7 +33,11 @@ var KeysCmd = &cobra.Command{
 				}
 				defer f.Close() // nolint:errcheck
 			}
-			return keys.NewProgram(cfg).Start()
+			p := keys.NewProgram(cfg)
+			if _, err := p.Run(); err != nil {
+				return err
+			}
+			return nil
 		}
 		cc := initCharmClient()
 

cmd/link.go

@@ -30,16 +30,19 @@ func LinkCmd(parentName string) *cobra.Command {
 				defer f.Close() //nolint:errcheck
 			}
 
+			var p *tea.Program
 			switch len(args) {
 			case 0:
 				// Initialize a linking session
-				p := linkgen.NewProgram(cfg, parentName)
-				return p.Start()
+				p = linkgen.NewProgram(cfg, parentName)
 			default:
 				// Join in on a linking session
-				p := link.NewProgram(cfg, args[0])
-				return p.Start()
+				p = link.NewProgram(cfg, args[0])
 			}
+			if _, err := p.Run(); err != nil {
+				return err
+			}
+			return nil
 		},
 	}
 }

cmd/migrate_account.go

@@ -47,11 +47,11 @@ var (
 			lc := make(chan string)
 			go func() {
 				lh := &linkHandler{desc: "link-gen", linkChan: lc}
-				rsaClient.LinkGen(lh)
+				_ = rsaClient.LinkGen(lh)
 			}()
 			tok := <-lc
 			lh := &linkHandler{desc: "link-request", linkChan: lc}
-			ed25519Client.Link(lh, tok)
+			_ = ed25519Client.Link(lh, tok)
 			if verbose {
 				log.Info("link-gen sync encrypt keys")
 			}

cmd/where.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
+// WhereCmd is a command to find the absolute path to your charm data folder.
 var WhereCmd = &cobra.Command{
 	Use:   "where",
 	Short: "Find where your cloud.charm.sh folder resides on your machine",

kv/client.go

@@ -99,6 +99,7 @@ func (kv *KV) restoreSeq(seq uint64) error {
 		return err
 	}
 	defer r.Close() // nolint:errcheck
+	// nolint: godox
 	// TODO DB.Load() should be called on a database that is not running any
 	// other concurrent transactions while it is running.
 	return kv.DB.Load(r, 1)

main.go

@@ -17,7 +17,9 @@ import (
 )
 
 var (
-	Version   = ""
+	// Version is the version of the charm CLI.
+	Version = ""
+	// CommitSHA is the commit SHA of the charm CLI.
 	CommitSHA = ""
 
 	styles = common.DefaultStyles()
@@ -46,10 +48,13 @@ var (
 					log.SetOutput(f)
 					log.SetPrefix("charm")
 
-					defer f.Close()
+					defer f.Close() // nolint: errcheck
 				}
 
-				return ui.NewProgram(cfg).Start()
+				p := ui.NewProgram(cfg)
+				if _, err := p.Run(); err != nil {
+					return err
+				}
 			}
 
 			return cmd.Help()