Fix linter suggestions

Author: florisvdg

internals/secrethub/migrate.go

@@ -52,13 +52,13 @@ func newReferenceMapping(p *plan) referenceMapping {
 }
 
 // addVarPossibilities adds variations to the index for all values in the passed in vars map
-func (m referenceMapping) addVarPossibilities(vars map[string][]string) (nonExistingValues []string, err error) {
+func (m referenceMapping) addVarPossibilities(vars map[string][]string) error {
 	exists := make(map[string]string)
 	for varname, possibleValues := range vars {
 		varname = strings.ToUpper(varname)
 		for _, value := range possibleValues {
 			if otherVarname := exists[value]; otherVarname != "" && otherVarname != varname {
-				return nil, fmt.Errorf("you've ran into a limitation of the migration tool. You can't have multiple variables with the same value: '%s' now occurs in both '%s' and '%s'", value, varname, otherVarname)
+				return fmt.Errorf("you've ran into a limitation of the migration tool. You can't have multiple variables with the same value: '%s' now occurs in both '%s' and '%s'", value, varname, otherVarname)
 			}
 			exists[value] = varname
 		}
@@ -80,14 +80,12 @@ func (m referenceMapping) addVarPossibilities(vars map[string][]string) (nonExis
 					for secretHubVariation, opVariation := range variations {
 						m[strings.ReplaceAll(secrethubRef, value, secretHubVariation)] = strings.ReplaceAll(opRef, value, opVariation)
 					}
-				} else {
-					nonExistingValues = append(nonExistingValues, value)
 				}
 			}
 		}
 	}
 
-	return
+	return nil
 }
 
 // stripSecretHubURIScheme removes the secrethub:// prefix from the index keys so it can be

internals/secrethub/migrate_config_envfile.go

@@ -16,13 +16,9 @@ func (cmd *MigrateConfigEnvfileCommand) Run() error {
 		return err
 	}
 
-	vars, err := parseVarPossibilities(cmd.vars)
-	if err != nil {
-		return err
-	}
-
+	vars := parseVarPossibilities(cmd.vars)
 	refMapping := newReferenceMapping(plan)
-	_, err = refMapping.addVarPossibilities(vars)
+	err = refMapping.addVarPossibilities(vars)
 	if err != nil {
 		return err
 	}

internals/secrethub/migrate_config_templates.go

@@ -20,16 +20,13 @@ func (cmd *MigrateConfigTemplatesCommand) Run() error {
 		return err
 	}
 
-	vars, err := parseVarPossibilities(cmd.vars)
-	if err != nil {
-		return err
-	}
-
+	vars := parseVarPossibilities(cmd.vars)
 	refMapping := newReferenceMapping(plan)
-	_, err = refMapping.addVarPossibilities(vars)
+	err = refMapping.addVarPossibilities(vars)
 	if err != nil {
 		return err
 	}
+
 	refMapping.stripSecretHubURIScheme()
 
 	for _, filepath := range cmd.inFiles {
@@ -123,7 +120,7 @@ func (cmd *MigrateConfigTemplatesCommand) Register(r cli.Registerer) {
 	clause.BindAction(cmd.Run)
 }
 
-func parseVarPossibilities(unparsed map[string]string) (map[string][]string, error) {
+func parseVarPossibilities(unparsed map[string]string) map[string][]string {
 	result := make(map[string][]string)
 	for varname, optionsStr := range unparsed {
 		options := strings.Split(optionsStr, ",")
@@ -134,5 +131,5 @@ func parseVarPossibilities(unparsed map[string]string) (map[string][]string, err
 		result[varname] = options
 	}
 
-	return result, nil
+	return result
 }

internals/secrethub/migrate_config_test.go

@@ -106,9 +106,10 @@ func TestMigrateTemplates(t *testing.T) {
 			var out bytes.Buffer
 			m := referenceMapping(tc.mapping)
 			m.stripSecretHubURIScheme()
-			m.addVarPossibilities(tc.vars)
+			err := m.addVarPossibilities(tc.vars)
+			assert.OK(t, err)
 
-			_, err := migrateTemplateTags(bytes.NewReader([]byte(tc.in)), &out, m, "{{ %s }}")
+			_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), &out, m, "{{ %s }}")
 			if tc.expectedErr {
 				assert.Equal(t, err != nil, true)
 				return
@@ -227,9 +228,10 @@ func TestMigrateEnvfile(t *testing.T) {
 			var out bytes.Buffer
 			m := referenceMapping(tc.mapping)
 			m.stripSecretHubURIScheme()
-			m.addVarPossibilities(tc.vars)
+			err := m.addVarPossibilities(tc.vars)
+			assert.OK(t, err)
 
-			err := func() error {
+			err = func() error {
 				err := checkForCompositeSecrets([]byte(tc.in))
 				if err != nil {
 					return err