Add test coverage for build-arg parsing

Allows seperator to appear in the value i.e. "k=val=10"

Signed-off-by: Alex Ellis (VMware) <[email protected]>

Author: alexellis

commands/build.go

@@ -79,26 +79,40 @@ via flags.`,
 func preRunBuild(cmd *cobra.Command, args []string) error {
 	language, _ = validateLanguageFlag(language)
 
-	buildArgMap = make(map[string]string)
+	mapped, err := parseBuildArgs(buildArgs)
 
-	for _, kvp := range buildArgs {
-		values := strings.Split(kvp, "=")
-		if len(values) != 2 {
-			return fmt.Errorf("each build-arg must take the form key=value")
+	if err == nil {
+		buildArgMap = mapped
+	}
+
+	return err
+}
+
+func parseBuildArgs(args []string) (map[string]string, error) {
+	mapped := make(map[string]string)
+
+	for _, kvp := range args {
+		index := strings.Index(kvp, "=")
+		if index == -1 {
+			return nil, fmt.Errorf("each build-arg must take the form key=value")
 		}
+
+		values := []string{kvp[0:index], kvp[index+1:]}
+
 		k := strings.TrimSpace(values[0])
 		v := strings.TrimSpace(values[1])
+
 		if len(k) == 0 {
-			return fmt.Errorf("build-arg must have a non-empty key")
+			return nil, fmt.Errorf("build-arg must have a non-empty key")
 		}
 		if len(v) == 0 {
-			return fmt.Errorf("build-arg must have a non-empty value")
+			return nil, fmt.Errorf("build-arg must have a non-empty value")
 		}
 
-		buildArgMap[k] = v
+		mapped[k] = v
 	}
 
-	return nil
+	return mapped, nil
 }
 
 func runBuild(cmd *cobra.Command, args []string) error {

commands/build_test.go

@@ -23,3 +23,54 @@ func Test_build(t *testing.T) {
 		}
 	}
 }
+
+func Test_parseBuildArgs_ValidParts(t *testing.T) {
+	mapped, err := parseBuildArgs([]string{"k=v"})
+
+	if err != nil {
+		t.Errorf("err was supposed to be nil but was: %s", err.Error())
+		t.Fail()
+	}
+
+	if mapped["k"] != "v" {
+		t.Errorf("value for 'k', want: %s got: %s", "v", mapped["k"])
+		t.Fail()
+	}
+}
+
+func Test_parseBuildArgs_NoSeparator(t *testing.T) {
+	_, err := parseBuildArgs([]string{"kv"})
+
+	want := "each build-arg must take the form key=value"
+	if err != nil && err.Error() != want {
+		t.Errorf("Expected an error due to missing seperator")
+		t.Fail()
+	}
+}
+
+func Test_parseBuildArgs_EmptyKey(t *testing.T) {
+	_, err := parseBuildArgs([]string{"=v"})
+
+	want := "build-arg must have a non-empty key"
+	if err == nil {
+		t.Errorf("Expected an error due to missing key")
+		t.Fail()
+	} else if err.Error() != want {
+		t.Errorf("missing key error want: %s, got: %s", want, err.Error())
+		t.Fail()
+	}
+}
+
+func Test_parseBuildArgs_MultipleSeparators(t *testing.T) {
+	mapped, err := parseBuildArgs([]string{"k=v=z"})
+
+	if err != nil {
+		t.Errorf("Expected second separator to be included in value")
+		t.Fail()
+	}
+
+	if mapped["k"] != "v=z" {
+		t.Errorf("value for 'k', want: %s got: %s", "v=z", mapped["k"])
+		t.Fail()
+	}
+}