parameters + tidy

go-vela · Nov 20, 2024 · 7796ac7 · 7796ac7
1 parent 90a6a81
commit 7796ac7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/cmd/vela-kaniko/main.go b/cmd/vela-kaniko/main.go
@@ -329,8 +329,8 @@ func main() {
 			Name:    "label.host",
 			Usage:   "host that the image is built on",
 		},
-		&cli.StringSliceFlag{
-			EnvVars: []string{"VELA_BUILD_CUSTOM_LABELS"},
+		&cli.StringFlag{
+			EnvVars: []string{"VELA_BUILD_CUSTOM_LABELS", "PARAMETER_CUSTOM_LABELS"},
 			Name:    "label.custom",
 			Usage:   "custom labels to add to the image in the form LABEL_NAME=ENV_KEY",
 		},
@@ -396,6 +396,27 @@ func run(c *cli.Context) error {
 		}
 	}
 
+	// target type for custom labels
+	var customLabels []string
+
+	labelsStr := c.String("label.custom")
+	if len(labelsStr) > 0 {
+		customLabelsMap := make(map[string]string)
+
+		// attempt to unmarshal to map
+		err := json.Unmarshal([]byte(labelsStr), &customLabelsMap)
+		if err != nil {
+			// fall back on splitting the string
+			customLabels = strings.Split(labelsStr, ",")
+		} else {
+			// iterate through the custom labels map
+			for key, value := range customLabelsMap {
+				// add the custom label to the custom labels
+				customLabels = append(customLabels, fmt.Sprintf("%s=%s", key, value))
+			}
+		}
+	}
+
 	// create the plugin
 	p := &Plugin{
 		// build configuration

diff --git a/go.mod b/go.mod
@@ -13,7 +13,6 @@ require (
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
-	github.com/google/go-cmp v0.6.0
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	golang.org/x/sys v0.15.0 // indirect

diff --git a/go.sum b/go.sum
@@ -7,8 +7,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-vela/types v0.24.0 h1:KkkiXxw3uHckh/foyadmLY1YnLw6vhZbz9XwqONCj6o=
 github.com/go-vela/types v0.24.0/go.mod h1:YWj6BIapl9Kbj4yHq/fp8jltXdGiwD/gTy1ez32Rzag=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=