Fix lint, add word test

encoredev · Aug 9, 2023 · 7a4a45e · 7a4a45e
1 parent 74c33ff
commit 7a4a45e
Show file tree

Hide file tree

Showing 7 changed files with 1,355 additions and 1,306 deletions.
diff --git a/cli/cmd/encore/cmdutil/output.go b/cli/cmd/encore/cmdutil/output.go
@@ -21,7 +21,7 @@ type Oneof struct {
 func (o *Oneof) AddFlag(cmd *cobra.Command) {
 	name, short := o.FlagName()
 	cmd.Flags().VarP(o, name, short, o.Usage())
-	cmd.RegisterFlagCompletionFunc(name, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	_ = cmd.RegisterFlagCompletionFunc(name, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		return o.Allowed, cobra.ShellCompDirectiveNoFileComp
 	})
 }

diff --git a/cli/cmd/encore/namespace/namespace.go b/cli/cmd/encore/namespace/namespace.go
@@ -73,7 +73,7 @@ func init() {
 				if err := json.Indent(&dst, buf.Bytes(), "", "  "); err != nil {
 					cmdutil.Fatal(err)
 				}
-				fmt.Fprintln(os.Stdout, dst.String())
+				_, _ = fmt.Fprintln(os.Stdout, dst.String())
 				return
 			}
 
@@ -114,7 +114,7 @@ var createCmd = &cobra.Command{
 		if err != nil {
 			cmdutil.Fatal(err)
 		}
-		fmt.Fprintf(os.Stdout, "created namespace %s\n", ns.Name)
+		_, _ = fmt.Fprintf(os.Stdout, "created namespace %s\n", ns.Name)
 	},
 }
 
@@ -139,7 +139,7 @@ var deleteCmd = &cobra.Command{
 		if err != nil {
 			cmdutil.Fatal(err)
 		}
-		fmt.Fprintf(os.Stdout, "deleted namespace %s\n", name)
+		_, _ = fmt.Fprintf(os.Stdout, "deleted namespace %s\n", name)
 	},
 }
 
@@ -171,7 +171,7 @@ You can use '-' as the namespace name to switch back to the previously active na
 			if err != nil {
 				cmdutil.Fatal(err)
 			}
-			fmt.Fprintf(os.Stdout, "switched to namespace %s\n", ns.Name)
+			_, _ = fmt.Fprintf(os.Stdout, "switched to namespace %s\n", ns.Name)
 		},
 	}
 

diff --git a/cli/cmd/encore/rand.go b/cli/cmd/encore/rand.go
@@ -153,7 +153,7 @@ func init() {
 
 // Words command
 func init() {
-	sep := " "
+	var sep string
 	wordsCmd := &cobra.Command{
 		Use:   "words [--sep=SEPARATOR] NUM",
 		Short: "Generates random 4-5 letter words for memorable passphrases",
@@ -181,6 +181,6 @@ func init() {
 		},
 	}
 
-	wordsCmd.Flags().StringVarP(&sep, "sep", "s", "-", "separator between words")
+	wordsCmd.Flags().StringVarP(&sep, "sep", "s", " ", "separator between words")
 	randCmd.AddCommand(wordsCmd)
 }
diff --git a/pkg/words/funcs.go b/pkg/words/funcs.go
@@ -6,15 +6,17 @@ import (
 	"math/big"
 )
 
+// Select selects n random words from the short word list.
 func Select(n int) ([]string, error) {
 	selected := make([]string, n)
-	max := big.NewInt(int64(len(Words)))
+	words := shortWords.Get()
+	max := big.NewInt(int64(len(words)))
 	for i := 0; i < n; i++ {
 		j, err := rand.Int(rand.Reader, max)
 		if err != nil {
 			return nil, fmt.Errorf("wordlist.Select %d: %v", n, err)
 		}
-		selected[i] = Words[j.Int64()]
+		selected[i] = words[j.Int64()]
 	}
 	return selected, nil
 }