Adds support to specify image labels and annotations

This adds support to specify labels and annotation for
output image.
There are 2 flags added for the `build create` command
- output-image-labels
- output-image-annotations

Signed-off-by: Shivam Mukhade <[email protected]>

pkg/shp/cmd/build/create.go

@@ -68,6 +68,18 @@ func (c *CreateCommand) Run(params *params.Params, io *genericclioptions.IOStrea
 	}
 	b.Spec.Env = append(b.Spec.Env, util.StringSliceToEnvVarSlice(envs)...)
 
+	labels, err := c.cmd.Flags().GetStringArray(flags.OutputImageLabelsFlag)
+	if err != nil {
+		return err
+	}
+	b.Spec.Output.Labels = util.StringSliceToMap(labels)
+
+	annotations, err := c.cmd.Flags().GetStringArray(flags.OutputImageAnnotationsFlag)
+	if err != nil {
+		return err
+	}
+	b.Spec.Output.Annotations = util.StringSliceToMap(annotations)
+
 	flags.SanitizeBuildSpec(&b.Spec)
 
 	clientset, err := params.ShipwrightClientSet()

pkg/shp/flags/build.go

@@ -39,6 +39,8 @@ func BuildSpecFromFlags(flags *pflag.FlagSet) *buildv1alpha1.BuildSpec {
 	imageFlags(flags, "output", &spec.Output)
 	timeoutFlags(flags, spec.Timeout)
 	envFlags(flags, spec.Env)
+	imageLabelsFlags(flags, spec.Output.Labels)
+	imageAnnotationsFlags(flags, spec.Output.Annotations)
 
 	return spec
 }

pkg/shp/flags/flags.go

@@ -46,6 +46,10 @@ const (
 	ServiceAccountGenerateFlag = "sa-generate"
 	// TimeoutFlag command-line flag.
 	TimeoutFlag = "timeout"
+	// OutputImageLabelsFlag command-line flag.
+	OutputImageLabelsFlag = "output-image-labels"
+	// OutputImageAnnotationsFlag command-line flag.
+	OutputImageAnnotationsFlag = "output-image-annotations"
 )
 
 // sourceFlags flags for ".spec.source"
@@ -176,3 +180,28 @@ func envFlags(flags *pflag.FlagSet, envs []corev1.EnvVar) {
 		"specify a key-value pair for an environment variable to set for the build container",
 	)
 }
+
+// imageLabelsFlags registers flags for output image labels.
+func imageLabelsFlags(flags *pflag.FlagSet, labels map[string]string) {
+	var l []string
+	flags.StringArrayVarP(
+		&l,
+		OutputImageLabelsFlag,
+		"",
+		[]string{},
+		"specify a key-value pair for labels to set for the output image",
+	)
+
+}
+
+// imageLabelsFlags registers flags for output image annotations.
+func imageAnnotationsFlags(flags *pflag.FlagSet, annotations map[string]string) {
+	var a []string
+	flags.StringArrayVarP(
+		&a,
+		OutputImageAnnotationsFlag,
+		"",
+		[]string{},
+		"specify a key-value pair for annotation to set for the output image",
+	)
+}

pkg/shp/util/env.go

@@ -15,3 +15,13 @@ func StringSliceToEnvVarSlice(envs []string) []corev1.EnvVar {
 	}
 	return envVars
 }
+
+func StringSliceToMap(kv []string) map[string]string {
+	m := map[string]string{}
+
+	for _, e := range kv {
+		d := strings.Split(e, "=")
+		m[d[0]] = d[1]
+	}
+	return m
+}

pkg/shp/util/env_test.go

@@ -52,3 +52,49 @@ func TestStringSliceToEnvVar(t *testing.T) {
 		})
 	}
 }
+
+func TestStringSliceToMap(t *testing.T) {
+	type args struct {
+		keyVal []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want map[string]string
+	}{
+		{
+			name: "no envs",
+			args: args{
+				keyVal: []string{},
+			},
+			want: map[string]string{},
+		},
+		{
+			name: "one env",
+			args: args{
+				keyVal: []string{"my-name=my-value"},
+			},
+			want: map[string]string{
+				"my-name": "my-value",
+			},
+		},
+		{
+			name: "multiple envs",
+			args: args{
+				keyVal: []string{"name-one=value-one", "name-two=value-two", "name-three=value-three"},
+			},
+			want: map[string]string{
+				"name-one":   "value-one",
+				"name-two":   "value-two",
+				"name-three": "value-three",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := StringSliceToMap(tt.args.keyVal); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("StringSliceToMap() = %#v, want %#v", got, tt.want)
+			}
+		})
+	}
+}