Refactor a bit

Author: drpaneas

cmd/post.go

@@ -19,13 +19,13 @@ import (
 )
 
 var (
-	template                                  string
-	isURL                                     bool
-	HTMLBody                                  []byte
-	Message                                   servicelog.Message
-	GoodReply                                 servicelog.GoodReply
-	BadReply                                  servicelog.BadReply
-	templateParams, sliceVariable, sliceValue []string
+	template                                                string
+	isURL                                                   bool
+	HTMLBody                                                []byte
+	Message                                                 servicelog.Message
+	GoodReply                                               servicelog.GoodReply
+	BadReply                                                servicelog.BadReply
+	templateParams, userParameterNames, userParameterValues []string
 )
 
 const (
@@ -40,40 +40,17 @@ var postCmd = &cobra.Command{
 	Short: "Send a servicelog message to a given cluster",
 	Run: func(cmd *cobra.Command, args []string) {
 
-		// Parse all the '-p' parameters from the command line
-		for k, v := range templateParams {
-			if !strings.Contains(v, "=") {
-				log.Fatalf("Wrong syntax of '-p' flag. Please use it like this: '-p FOO=BAR'")
-			}
-			sliceVariable = append(sliceVariable, fmt.Sprintf("${%v}", strings.Split(v, "=")[0]))
-			sliceValue = append(sliceValue, strings.Split(v, "=")[1])
-
-			if sliceValue[k] == "" {
-				log.Fatalf("Wrong syntax of '-p' flag. Please use it like this: '-p FOO=BAR'")
-			}
-		}
+		parseUserParameters() // parse all the '-p' user flags
 
-		readTemplate() // verify and parse
+		readTemplate() // parse the given JSON template provided via '-t' flag
 
-		// Replace the custom parameters given by the user
+		// For every '-p' flag, replace its related placeholder in the template
 		for k, v := range templateParams {
-			replaceFlags(sliceValue[k], "", sliceVariable[k], sliceVariable[k], "p", v)
+			replaceFlags(userParameterValues[k], "", userParameterNames[k], userParameterNames[k], "p", v)
 		}
 
-		// Check if there are any remaining parameters (aka ${...}) in the template that was not replaces
-		// checkLeftoverParameters()
-		unusedParameters, found := Message.FindLeftovers()
-		if found {
-			for _, v := range unusedParameters {
-				regex := strings.NewReplacer("${", "", "}", "")
-				log.Errorf("The selected template is using '%s' parameter, but '--%s' flag is not set for this one. Use '-%s %v=\"FOOBAR\"' to fix this.", v, "param", "p", regex.Replace(v))
-			}
-			if numberOfMissingParameters := len(unusedParameters); numberOfMissingParameters == 1 {
-				log.Fatal("Please define this missing parameter properly.")
-			} else {
-				log.Fatalf("Please define all %v missing parameters properly.", numberOfMissingParameters)
-			}
-		}
+		// Check if there are any remaining placeholders in the template that are not replaced by a parameter
+		checkLeftovers()
 
 		dir := tempDir()
 		defer cleanup(dir)
@@ -103,6 +80,22 @@ func init() {
 	postCmd.Flags().StringArrayVarP(&templateParams, "param", "p", templateParams, "Specify a key-value pair (eg. -p FOO=BAR) to set/override a parameter value in the template.")
 }
 
+// parseUserParameters parse all the '-p FOO=BAR' parameters and checks for syntax errors
+func parseUserParameters() {
+	for k, v := range templateParams {
+		if !strings.Contains(v, "=") {
+			log.Fatalf("Wrong syntax of '-p' flag. Please use it like this: '-p FOO=BAR'")
+		}
+
+		userParameterNames = append(userParameterNames, fmt.Sprintf("${%v}", strings.Split(v, "=")[0]))
+		userParameterValues = append(userParameterValues, strings.Split(v, "=")[1])
+
+		if userParameterValues[k] == "" {
+			log.Fatalf("Wrong syntax of '-p' flag. Please use it like this: '-p FOO=BAR'")
+		}
+	}
+}
+
 // accessTemplate checks if the provided template is currently accessible and returns an error
 func accessTemplate(template string) (err error) {
 
@@ -170,6 +163,21 @@ func readTemplate() {
 	}
 }
 
+func checkLeftovers() {
+	unusedParameters, found := Message.FindLeftovers()
+	if found {
+		for _, v := range unusedParameters {
+			regex := strings.NewReplacer("${", "", "}", "")
+			log.Errorf("The selected template is using '%s' parameter, but '--%s' flag is not set for this one. Use '-%s %v=\"FOOBAR\"' to fix this.", v, "param", "p", regex.Replace(v))
+		}
+		if numberOfMissingParameters := len(unusedParameters); numberOfMissingParameters == 1 {
+			log.Fatal("Please define this missing parameter properly.")
+		} else {
+			log.Fatalf("Please define all %v missing parameters properly.", numberOfMissingParameters)
+		}
+	}
+}
+
 func replaceFlags(flagName, flagDefaultValue, flagParameter, flagLongName, flagShorthand, parameter string) {
 	if err := strings.Compare(flagName, flagDefaultValue); err == 0 {
 		// The user didn't set the flag. Check if the template is using the flag.