Add --ce-override flag for apiserver and ping sources

CHANGELOG.adoc

@@ -16,6 +16,10 @@
 |===
 | | Description | PR
 
+| 🎁
+| Add --ce-override flag for apiserver and ping sources
+| https://github.com/knative/client/pull/865[#865]
+
 | 🎁
 | Add --requests and --limits flags for resource requirements
 | https://github.com/knative/client/pull/859[#859]

docs/cmd/kn_source_apiserver_create.md

@@ -21,15 +21,16 @@ kn source apiserver create NAME --resource RESOURCE --service-account ACCOUNTNAM
 ### Options
 
 ```
-  -h, --help                     help for create
-      --mode string              The mode the receive adapter controller runs under:,
-                                 "Reference" sends only the reference to the resource,
-                                 "Resource" send the full resource. (default "Reference")
-  -n, --namespace string         Specify the namespace to operate in.
-      --resource stringArray     Specification for which events to listen, in the format Kind:APIVersion:LabelSelector, e.g. "Event:v1:key=value".
-                                 "LabelSelector" is a list of comma separated key value pairs. "LabelSelector" can be omitted, e.g. "Event:v1".
-      --service-account string   Name of the service account to use to run this source
-  -s, --sink string              Addressable sink for events
+      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink. Example: '--ce-override key=value' You may be provide this flag multiple times. To unset, append "-" to the key (e.g. --ce-override key-).
+  -h, --help                      help for create
+      --mode string               The mode the receive adapter controller runs under:,
+                                  "Reference" sends only the reference to the resource,
+                                  "Resource" send the full resource. (default "Reference")
+  -n, --namespace string          Specify the namespace to operate in.
+      --resource stringArray      Specification for which events to listen, in the format Kind:APIVersion:LabelSelector, e.g. "Event:v1:key=value".
+                                  "LabelSelector" is a list of comma separated key value pairs. "LabelSelector" can be omitted, e.g. "Event:v1".
+      --service-account string    Name of the service account to use to run this source
+  -s, --sink string               Addressable sink for events
 ```
 
 ### Options inherited from parent commands

docs/cmd/kn_source_apiserver_update.md

@@ -21,15 +21,16 @@ kn source apiserver update NAME --resource RESOURCE --service-account ACCOUNTNAM
 ### Options
 
 ```
-  -h, --help                     help for update
-      --mode string              The mode the receive adapter controller runs under:,
-                                 "Reference" sends only the reference to the resource,
-                                 "Resource" send the full resource. (default "Reference")
-  -n, --namespace string         Specify the namespace to operate in.
-      --resource stringArray     Specification for which events to listen, in the format Kind:APIVersion:LabelSelector, e.g. "Event:v1:key=value".
-                                 "LabelSelector" is a list of comma separated key value pairs. "LabelSelector" can be omitted, e.g. "Event:v1".
-      --service-account string   Name of the service account to use to run this source
-  -s, --sink string              Addressable sink for events
+      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink. Example: '--ce-override key=value' You may be provide this flag multiple times. To unset, append "-" to the key (e.g. --ce-override key-).
+  -h, --help                      help for update
+      --mode string               The mode the receive adapter controller runs under:,
+                                  "Reference" sends only the reference to the resource,
+                                  "Resource" send the full resource. (default "Reference")
+  -n, --namespace string          Specify the namespace to operate in.
+      --resource stringArray      Specification for which events to listen, in the format Kind:APIVersion:LabelSelector, e.g. "Event:v1:key=value".
+                                  "LabelSelector" is a list of comma separated key value pairs. "LabelSelector" can be omitted, e.g. "Event:v1".
+      --service-account string    Name of the service account to use to run this source
+  -s, --sink string               Addressable sink for events
 ```
 
 ### Options inherited from parent commands

docs/cmd/kn_source_binding_create.md

@@ -21,7 +21,7 @@ kn source binding create NAME --subject SUBJECT --sink SINK --ce-override KEY=VA
 ### Options
 
 ```
-      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink in the format '--ce-override key=value'. --ce-override can be provide multiple times
+      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink. Example: '--ce-override key=value' You may be provide this flag multiple times. To unset, append "-" to the key (e.g. --ce-override key-).
   -h, --help                      help for create
   -n, --namespace string          Specify the namespace to operate in.
   -s, --sink string               Addressable sink for events

docs/cmd/kn_source_binding_update.md

@@ -21,7 +21,7 @@ kn source binding update NAME --subject SCHEDULE --sink SINK --ce-override OVERR
 ### Options
 
 ```
-      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink in the format '--ce-override key=value'. --ce-override can be provide multiple times
+      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink. Example: '--ce-override key=value' You may be provide this flag multiple times. To unset, append "-" to the key (e.g. --ce-override key-).
   -h, --help                      help for update
   -n, --namespace string          Specify the namespace to operate in.
   -s, --sink string               Addressable sink for events

docs/cmd/kn_source_ping_create.md

@@ -21,11 +21,12 @@ kn source ping create NAME --schedule SCHEDULE --sink SINK --data DATA [flags]
 ### Options
 
 ```
-  -d, --data string        Json data to send
-  -h, --help               help for create
-  -n, --namespace string   Specify the namespace to operate in.
-      --schedule string    Optional schedule specification in crontab format (e.g. '*/2 * * * *' for every two minutes. By default fire every minute.
-  -s, --sink string        Addressable sink for events
+      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink. Example: '--ce-override key=value' You may be provide this flag multiple times. To unset, append "-" to the key (e.g. --ce-override key-).
+  -d, --data string               Json data to send
+  -h, --help                      help for create
+  -n, --namespace string          Specify the namespace to operate in.
+      --schedule string           Optional schedule specification in crontab format (e.g. '*/2 * * * *' for every two minutes. By default fire every minute.
+  -s, --sink string               Addressable sink for events
 ```
 
 ### Options inherited from parent commands

docs/cmd/kn_source_ping_update.md

@@ -21,11 +21,12 @@ kn source ping update NAME --schedule SCHEDULE --sink SERVICE --data DATA [flags
 ### Options
 
 ```
-  -d, --data string        Json data to send
-  -h, --help               help for update
-  -n, --namespace string   Specify the namespace to operate in.
-      --schedule string    Optional schedule specification in crontab format (e.g. '*/2 * * * *' for every two minutes. By default fire every minute.
-  -s, --sink string        Addressable sink for events
+      --ce-override stringArray   Cloud Event overrides to apply before sending event to sink. Example: '--ce-override key=value' You may be provide this flag multiple times. To unset, append "-" to the key (e.g. --ce-override key-).
+  -d, --data string               Json data to send
+  -h, --help                      help for update
+  -n, --namespace string          Specify the namespace to operate in.
+      --schedule string           Optional schedule specification in crontab format (e.g. '*/2 * * * *' for every two minutes. By default fire every minute.
+  -s, --sink string               Addressable sink for events
 ```
 
 ### Options inherited from parent commands

pkg/kn/commands/source/apiserver/apiserver_test.go

@@ -83,7 +83,7 @@ func cleanupAPIServerMockClient() {
 	apiServerSourceClientFactory = nil
 }
 
-func createAPIServerSource(name, resourceKind, resourceVersion, serviceAccount, mode, service string) *v1alpha2.ApiServerSource {
+func createAPIServerSource(name, resourceKind, resourceVersion, serviceAccount, mode, service string, ceOverrides map[string]string) *v1alpha2.ApiServerSource {
 	resources := []v1alpha2.APIVersionKindSelector{{
 		APIVersion: resourceVersion,
 		Kind:       resourceKind,
@@ -102,5 +102,6 @@ func createAPIServerSource(name, resourceKind, resourceVersion, serviceAccount,
 		ServiceAccount(serviceAccount).
 		EventMode(mode).
 		Sink(sink).
+		CloudEventOverrides(ceOverrides, []string{}).
 		Build()
 }

pkg/kn/commands/source/apiserver/create.go

@@ -23,6 +23,7 @@ import (
 	"knative.dev/client/pkg/kn/commands"
 	"knative.dev/client/pkg/kn/commands/flags"
 	"knative.dev/client/pkg/sources/v1alpha2"
+	"knative.dev/client/pkg/util"
 )
 
 // NewAPIServerCreateCommand for creating source
@@ -62,16 +63,23 @@ func NewAPIServerCreateCommand(p *commands.KnParams) *cobra.Command {
 						"because: %s", name, namespace, err)
 			}
 
-			b := v1alpha2.NewAPIServerSourceBuilder(name).
-				ServiceAccount(updateFlags.ServiceAccountName).
-				EventMode(updateFlags.Mode).
-				Sink(*objectRef)
-
 			resources, err := updateFlags.getAPIServerVersionKindSelector()
 			if err != nil {
 				return err
 			}
-			b.Resources(resources)
+
+			ceOverridesMap, err := util.MapFromArrayAllowingSingles(updateFlags.ceOverrides, "=")
+			if err != nil {
+				return err
+			}
+			ceOverridesToRemove := util.ParseMinusSuffix(ceOverridesMap)
+
+			b := v1alpha2.NewAPIServerSourceBuilder(name).
+				ServiceAccount(updateFlags.ServiceAccountName).
+				EventMode(updateFlags.Mode).
+				Sink(*objectRef).
+				Resources(resources).
+				CloudEventOverrides(ceOverridesMap, ceOverridesToRemove)
 
 			err = apiSourceClient.CreateAPIServerSource(b.Build())
 

pkg/kn/commands/source/apiserver/create_test.go

@@ -35,9 +35,9 @@ func TestCreateApiServerSource(t *testing.T) {
 	apiServerClient := v1alpha2.NewMockKnAPIServerSourceClient(t)
 
 	apiServerRecorder := apiServerClient.Recorder()
-	apiServerRecorder.CreateAPIServerSource(createAPIServerSource("testsource", "Event", "v1", "testsa", "Reference", "testsvc"), nil)
+	apiServerRecorder.CreateAPIServerSource(createAPIServerSource("testsource", "Event", "v1", "testsa", "Reference", "testsvc", map[string]string{"bla": "blub", "foo": "bar"}), nil)
 
-	out, err := executeAPIServerSourceCommand(apiServerClient, dynamicClient, "create", "testsource", "--resource", "Event:v1", "--service-account", "testsa", "--sink", "svc:testsvc", "--mode", "Reference")
+	out, err := executeAPIServerSourceCommand(apiServerClient, dynamicClient, "create", "testsource", "--resource", "Event:v1", "--service-account", "testsa", "--sink", "svc:testsvc", "--mode", "Reference", "--ce-override", "bla=blub", "--ce-override", "foo=bar")
 	assert.NilError(t, err, "ApiServer source should be created")
 	util.ContainsAll(out, "created", "default", "testsource")
 

pkg/kn/commands/source/apiserver/describe.go

@@ -17,6 +17,7 @@ package apiserver
 import (
 	"errors"
 	"fmt"
+	"sort"
 
 	"github.com/spf13/cobra"
 	v1alpha2 "knative.dev/eventing/pkg/apis/sources/v1alpha2"
@@ -71,6 +72,10 @@ func NewAPIServerDescribeCommand(p *commands.KnParams) *cobra.Command {
 				return err
 			}
 
+			if apiSource.Spec.CloudEventOverrides != nil && apiSource.Spec.CloudEventOverrides.Extensions != nil {
+				writeCeOverrides(dw, apiSource.Spec.CloudEventOverrides.Extensions)
+			}
+
 			writeResources(dw, apiSource.Spec.Resources)
 			dw.WriteLine()
 			if err := dw.Flush(); err != nil {
@@ -122,3 +127,15 @@ func writeAPIServerSource(dw printers.PrefixWriter, source *v1alpha2.ApiServerSo
 	dw.WriteAttribute("ServiceAccountName", source.Spec.ServiceAccountName)
 	dw.WriteAttribute("EventMode", source.Spec.EventMode)
 }
+
+func writeCeOverrides(dw printers.PrefixWriter, ceOverrides map[string]string) {
+	subDw := dw.WriteAttribute("CloudEvent Overrides", "")
+	var keys []string
+	for k := range ceOverrides {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		subDw.WriteAttribute(k, ceOverrides[k])
+	}
+}

pkg/kn/commands/source/apiserver/describe_test.go

@@ -28,12 +28,12 @@ func TestSimpleDescribe(t *testing.T) {
 	apiServerClient := v1alpha2.NewMockKnAPIServerSourceClient(t, "mynamespace")
 
 	apiServerRecorder := apiServerClient.Recorder()
-	sampleSource := createAPIServerSource("testsource", "Event", "v1", "testsa", "Reference", "testsvc")
+	sampleSource := createAPIServerSource("testsource", "Event", "v1", "testsa", "Reference", "testsvc", map[string]string{"foo": "bar"})
 	apiServerRecorder.GetAPIServerSource("testsource", sampleSource, nil)
 
 	out, err := executeAPIServerSourceCommand(apiServerClient, nil, "describe", "testsource")
 	assert.NilError(t, err)
-	util.ContainsAll(out, "testsource", "testsa", "Reference", "testsvc", "Service", "Resources", "Event", "v1", "false", "Conditions")
+	util.ContainsAll(out, "testsource", "testsa", "Reference", "testsvc", "Service", "Resources", "Event", "v1", "false", "Conditions", "foo", "bar")
 
 	apiServerRecorder.Validate()
 }

pkg/kn/commands/source/apiserver/flags.go

@@ -45,6 +45,7 @@ type APIServerSourceUpdateFlags struct {
 	ServiceAccountName string
 	Mode               string
 	Resources          []string
+	ceOverrides        []string
 }
 
 // getAPIServerVersionKindSelector is to construct an array of resources.
@@ -161,6 +162,13 @@ func (f *APIServerSourceUpdateFlags) Add(cmd *cobra.Command) {
 		[]string{},
 		`Specification for which events to listen, in the format Kind:APIVersion:LabelSelector, e.g. "Event:v1:key=value".
 "LabelSelector" is a list of comma separated key value pairs. "LabelSelector" can be omitted, e.g. "Event:v1".`)
+	cmd.Flags().StringArrayVar(&f.ceOverrides,
+		"ce-override",
+		[]string{},
+		"Cloud Event overrides to apply before sending event to sink. "+
+			"Example: '--ce-override key=value' "+
+			"You may be provide this flag multiple times. "+
+			"To unset, append \"-\" to the key (e.g. --ce-override key-).")
 }
 
 // APIServerSourceListHandlers handles printing human readable table for `kn source apiserver list` command's output

pkg/kn/commands/source/apiserver/list_test.go

@@ -29,7 +29,7 @@ func TestListAPIServerSource(t *testing.T) {
 	apiServerClient := v1alpha22.NewMockKnAPIServerSourceClient(t)
 
 	apiServerRecorder := apiServerClient.Recorder()
-	sampleSource := createAPIServerSource("testsource", "Event", "v1", "testsa", "Reference", "testsvc")
+	sampleSource := createAPIServerSource("testsource", "Event", "v1", "testsa", "Reference", "testsvc", nil)
 	sampleSourceList := v1alpha2.ApiServerSourceList{}
 	sampleSourceList.Items = []v1alpha2.ApiServerSource{*sampleSource}
 

pkg/kn/commands/source/apiserver/update.go

@@ -23,11 +23,12 @@ import (
 	"knative.dev/client/pkg/kn/commands"
 	"knative.dev/client/pkg/kn/commands/flags"
 	"knative.dev/client/pkg/sources/v1alpha2"
+	"knative.dev/client/pkg/util"
 )
 
 // NewAPIServerUpdateCommand for managing source update
 func NewAPIServerUpdateCommand(p *commands.KnParams) *cobra.Command {
-	var apiServerUpdateFlags APIServerSourceUpdateFlags
+	var updateFlags APIServerSourceUpdateFlags
 	var sinkFlags flags.SinkFlags
 
 	cmd := &cobra.Command{
@@ -69,15 +70,15 @@ func NewAPIServerUpdateCommand(p *commands.KnParams) *cobra.Command {
 
 			b := v1alpha2.NewAPIServerSourceBuilderFromExisting(source)
 			if cmd.Flags().Changed("service-account") {
-				b.ServiceAccount(apiServerUpdateFlags.ServiceAccountName)
+				b.ServiceAccount(updateFlags.ServiceAccountName)
 			}
 
 			if cmd.Flags().Changed("mode") {
-				b.EventMode(apiServerUpdateFlags.Mode)
+				b.EventMode(updateFlags.Mode)
 			}
 
 			if cmd.Flags().Changed("resource") {
-				updateExisting, err := apiServerUpdateFlags.updateExistingAPIVersionKindSelectorArray(source.Spec.Resources)
+				updateExisting, err := updateFlags.updateExistingAPIVersionKindSelectorArray(source.Spec.Resources)
 				if err != nil {
 					return err
 				}
@@ -92,6 +93,15 @@ func NewAPIServerUpdateCommand(p *commands.KnParams) *cobra.Command {
 				b.Sink(*objectRef)
 			}
 
+			if cmd.Flags().Changed("ce-override") {
+				ceOverridesMap, err := util.MapFromArrayAllowingSingles(updateFlags.ceOverrides, "=")
+				if err != nil {
+					return err
+				}
+				ceOverridesToRemove := util.ParseMinusSuffix(ceOverridesMap)
+				b.CloudEventOverrides(ceOverridesMap, ceOverridesToRemove)
+			}
+
 			err = sourcesClient.UpdateAPIServerSource(b.Build())
 			if err == nil {
 				fmt.Fprintf(cmd.OutOrStdout(), "ApiServer source '%s' updated in namespace '%s'.\n", args[0], namespace)
@@ -101,7 +111,7 @@ func NewAPIServerUpdateCommand(p *commands.KnParams) *cobra.Command {
 		},
 	}
 	commands.AddNamespaceFlags(cmd.Flags(), false)
-	apiServerUpdateFlags.Add(cmd)
+	updateFlags.Add(cmd)
 	sinkFlags.Add(cmd)
 	return cmd
 }

pkg/kn/commands/source/apiserver/update_test.go

@@ -37,13 +37,13 @@ func TestApiServerSourceUpdate(t *testing.T) {
 
 	apiServerRecorder := apiServerClient.Recorder()
 
-	present := createAPIServerSource("testsource", "Event", "v1", "testsa1", "Reference", "svc1")
+	present := createAPIServerSource("testsource", "Event", "v1", "testsa1", "Reference", "svc1", map[string]string{"bla": "blub", "foo": "bar"})
 	apiServerRecorder.GetAPIServerSource("testsource", present, nil)
 
-	updated := createAPIServerSource("testsource", "Event", "v1", "testsa2", "Reference", "svc2")
+	updated := createAPIServerSource("testsource", "Event", "v1", "testsa2", "Reference", "svc2", map[string]string{"foo": "baz"})
 	apiServerRecorder.UpdateAPIServerSource(updated, nil)
 
-	output, err := executeAPIServerSourceCommand(apiServerClient, dynamicClient, "update", "testsource", "--service-account", "testsa2", "--sink", "svc:svc2")
+	output, err := executeAPIServerSourceCommand(apiServerClient, dynamicClient, "update", "testsource", "--service-account", "testsa2", "--sink", "svc:svc2", "--ce-override", "bla-", "--ce-override", "foo=baz")
 	assert.NilError(t, err)
 	assert.Assert(t, util.ContainsAll(output, "testsource", "updated", "default"))
 
@@ -54,7 +54,7 @@ func TestApiServerSourceUpdateDeletionTimestampNotNil(t *testing.T) {
 	apiServerClient := v1alpha2.NewMockKnAPIServerSourceClient(t)
 	apiServerRecorder := apiServerClient.Recorder()
 
-	present := createAPIServerSource("testsource", "Event", "v1", "testsa1", "Ref", "svc1")
+	present := createAPIServerSource("testsource", "Event", "v1", "testsa1", "Ref", "svc1", nil)
 	present.DeletionTimestamp = &metav1.Time{Time: time.Now()}
 	apiServerRecorder.GetAPIServerSource("testsource", present, nil)
 

pkg/kn/commands/source/binding/binding.go

@@ -27,7 +27,6 @@ import (
 
 	"knative.dev/client/pkg/kn/commands"
 	clientsourcesv1alpha1 "knative.dev/client/pkg/sources/v1alpha2"
-	"knative.dev/client/pkg/util"
 )
 
 // NewBindingCommand is the root command for all binding related commands
@@ -131,15 +130,3 @@ func subjectToString(ref tracker.Reference) string {
 	}
 	return ret
 }
-
-// updateCeOverrides updates the values of the --ce-override flags if given
-func updateCeOverrides(bindingFlags bindingUpdateFlags, bindingBuilder *clientsourcesv1alpha1.SinkBindingBuilder) error {
-	if bindingFlags.ceOverrides != nil {
-		ceOverrideMap, err := util.MapFromArray(bindingFlags.ceOverrides, "=")
-		if err != nil {
-			return err
-		}
-		bindingBuilder.AddCloudEventOverrides(ceOverrideMap)
-	}
-	return nil
-}

pkg/kn/commands/source/binding/binding_test.go

@@ -92,10 +92,9 @@ func createSinkBinding(name, service string, subjectGvk schema.GroupVersionKind,
 		Sink(&sink).
 		SubjectGVK(&subjectGvk).
 		SubjectName(subjectName).
-		SubjectNamespace("default")
-	if ceOverrides != nil {
-		builder.AddCloudEventOverrides(ceOverrides)
-	}
+		SubjectNamespace("default").
+		CloudEventOverrides(ceOverrides, []string{})
+
 	binding, _ := builder.Build()
 	return binding
 }