Adding encoding flag and support for base64 data

docs/cmd/kn_source_ping_create.md

@@ -19,6 +19,7 @@ kn source ping create NAME --sink SINK
 ```
       --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
+  -e, --encoding string           Preferred encoding format. Valid values: text/base64
   -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.

docs/cmd/kn_source_ping_update.md

@@ -19,6 +19,7 @@ kn source ping update NAME
 ```
       --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
+  -e, --encoding string           Preferred encoding format. Valid values: text/base64
   -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.

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

@@ -15,6 +15,7 @@
 package ping
 
 import (
+	"encoding/base64"
 	"errors"
 	"fmt"
 
@@ -26,6 +27,11 @@ import (
 	"knative.dev/client/pkg/util"
 )
 
+const (
+	base64Encoding = "base64"
+	textEncoding   = "text"
+)
+
 // NewPingCreateCommand is for creating Ping source COs
 func NewPingCreateCommand(p *commands.KnParams) *cobra.Command {
 	var updateFlags pingUpdateFlags
@@ -70,9 +76,29 @@ func NewPingCreateCommand(p *commands.KnParams) *cobra.Command {
 			}
 			ceOverridesToRemove := util.ParseMinusSuffix(ceOverridesMap)
 
+			var data, dataBase64 string
+
+			switch updateFlags.encoding {
+			case "":
+				if _, err := base64.StdEncoding.DecodeString(updateFlags.data); err == nil {
+					dataBase64 = updateFlags.data
+				} else {
+					data = updateFlags.data
+				}
+			case base64Encoding:
+				dataBase64 = updateFlags.data
+			case textEncoding:
+				data = updateFlags.data
+			default:
+				err := fmt.Errorf("invalid value: %v", updateFlags.encoding)
+				fmt.Fprintf(cmd.OutOrStderr(), "Ping source creation failed with error: %v", err)
+				return err
+			}
+
 			err = pingSourceClient.CreatePingSource(cmd.Context(), clientsourcesv1beta2.NewPingSourceBuilder(name).
 				Schedule(updateFlags.schedule).
-				Data(updateFlags.data).
+				Data(data).
+				DataBase64(dataBase64).
 				Sink(*destination).
 				CloudEventOverrides(ceOverridesMap, ceOverridesToRemove).
 				Build())

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

@@ -37,7 +37,7 @@ func TestSimpleCreatePingSource(t *testing.T) {
 	pingClient := clientsourcesv1beta2.NewMockKnPingSourceClient(t)
 
 	pingRecorder := pingClient.Recorder()
-	pingRecorder.CreatePingSource(createPingSource("testsource", "* * * * */2", "maxwell", "mysvc", map[string]string{"bla": "blub", "foo": "bar"}), nil)
+	pingRecorder.CreatePingSource(createPingSource("testsource", "* * * * */2", "maxwell", "", "mysvc", map[string]string{"bla": "blub", "foo": "bar"}), nil)
 
 	out, err := executePingSourceCommand(pingClient, dynamicClient, "create", "--sink", "ksvc:mysvc", "--schedule", "* * * * */2", "--data", "maxwell", "testsource", "--ce-override", "bla=blub", "--ce-override", "foo=bar")
 	assert.NilError(t, err, "Source should have been created")
@@ -69,3 +69,35 @@ func TestNoNameGivenError(t *testing.T) {
 	assert.ErrorContains(t, err, "require")
 	assert.Assert(t, util.ContainsAll(out, "Usage", "require", "name"))
 }
+
+func TestDataEncoding(t *testing.T) {
+	base64Val := "ZGF0YQ=="
+	mysvc := &servingv1.Service{
+		TypeMeta:   metav1.TypeMeta{Kind: "Service", APIVersion: "serving.knative.dev/v1"},
+		ObjectMeta: metav1.ObjectMeta{Name: "mysvc", Namespace: "default"},
+	}
+	dynamicClient := dynamicfake.CreateFakeKnDynamicClient("default", mysvc)
+
+	pingClient := clientsourcesv1beta2.NewMockKnPingSourceClient(t)
+
+	pingRecorder := pingClient.Recorder()
+
+	pingRecorder.CreatePingSource(createPingSource("testsource", "* * * * */2", "", base64Val, "mysvc", nil), nil)
+	out, err := executePingSourceCommand(pingClient, dynamicClient, "create", "--sink", "ksvc:mysvc", "--schedule", "* * * * */2", "--data", base64Val, "testsource")
+	assert.NilError(t, err, "Source should have been created")
+	assert.Assert(t, util.ContainsAll(out, "created", "default", "testsource"))
+
+	pingRecorder.CreatePingSource(createPingSource("testsource", "* * * * */2", "", base64Val, "mysvc", nil), nil)
+	out, err = executePingSourceCommand(pingClient, dynamicClient, "create", "--sink", "ksvc:mysvc", "--schedule", "* * * * */2", "--data", base64Val, "--encoding", "base64", "testsource")
+	assert.NilError(t, err, "Source should have been created")
+	assert.Assert(t, util.ContainsAll(out, "created", "default", "testsource"))
+
+	pingRecorder.CreatePingSource(createPingSource("testsource", "* * * * */2", base64Val, "", "mysvc", nil), nil)
+	out, err = executePingSourceCommand(pingClient, dynamicClient, "create", "--sink", "ksvc:mysvc", "--schedule", "* * * * */2", "--data", base64Val, "--encoding", "text", "testsource")
+	assert.NilError(t, err, "Source should have been created")
+	assert.Assert(t, util.ContainsAll(out, "created", "default", "testsource"))
+
+	out, err = executePingSourceCommand(pingClient, dynamicClient, "create", "--sink", "ksvc:mysvc", "--schedule", "* * * * */2", "--data", base64Val, "--encoding", "baseMock", "testsource")
+	assert.ErrorContains(t, err, "invalid")
+	assert.Assert(t, util.ContainsAll(out, "Usage", "text", "base64"))
+}

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

@@ -33,7 +33,7 @@ func TestDescribeRef(t *testing.T) {
 
 	pingRecorder := pingClient.Recorder()
 	pingRecorder.GetPingSource("testping",
-		createPingSource("testping", "*/2 * * * *", "test", "testsvc", map[string]string{"foo": "bar"}), nil)
+		createPingSource("testping", "*/2 * * * *", "test", "", "testsvc", map[string]string{"foo": "bar"}), nil)
 
 	out, err := executePingSourceCommand(pingClient, nil, "describe", "testping")
 	assert.NilError(t, err)

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

@@ -31,6 +31,7 @@ import (
 type pingUpdateFlags struct {
 	schedule    string
 	data        string
+	encoding    string
 	ceOverrides []string
 }
 
@@ -42,6 +43,8 @@ func (c *pingUpdateFlags) addFlags(cmd *cobra.Command) {
 
 	cmd.Flags().StringVarP(&c.data, "data", "d", "", "Json data to send")
 
+	cmd.Flags().StringVarP(&c.encoding, "encoding", "e", "", "Preferred encoding format. Valid values: text/base64")
+
 	cmd.Flags().StringArrayVar(&c.ceOverrides,
 		"ce-override",
 		[]string{},

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

@@ -31,7 +31,7 @@ func TestListPingSource(t *testing.T) {
 	pingClient := clientv1beta2.NewMockKnPingSourceClient(t)
 
 	pingRecorder := pingClient.Recorder()
-	cJSource := createPingSource("testsource", "* * * * */2", "maxwell", "mysvc", nil)
+	cJSource := createPingSource("testsource", "* * * * */2", "maxwell", "", "mysvc", nil)
 	cJSourceList := sourcesv1beta2.PingSourceList{}
 	cJSourceList.Items = []sourcesv1beta2.PingSource{*cJSource}
 

pkg/kn/commands/source/ping/ping_test.go

@@ -81,13 +81,14 @@ func cleanupPingMockClient() {
 	pingSourceClientFactory = nil
 }
 
-func createPingSource(name, schedule, data, service string, ceOverridesMap map[string]string) *sourcesv1beta2.PingSource {
+func createPingSource(name, schedule, data, dataBase64, service string, ceOverridesMap map[string]string) *sourcesv1beta2.PingSource {
 	sink := &duckv1.Destination{
 		Ref: &duckv1.KReference{Name: service, Kind: "Service", APIVersion: "serving.knative.dev/v1", Namespace: "default"},
 	}
 	return clientv1beta2.NewPingSourceBuilder(name).
 		Schedule(schedule).
 		Data(data).
+		DataBase64(dataBase64).
 		Sink(*sink).
 		CloudEventOverrides(ceOverridesMap, []string{}).
 		Build()

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

@@ -36,8 +36,8 @@ func TestSimplePingUpdate(t *testing.T) {
 	dynamicClient := dynamicfake.CreateFakeKnDynamicClient("default", mysvc1)
 	pingSourceClient := sourcesv1beta2.NewMockKnPingSourceClient(t)
 	pingRecorder := pingSourceClient.Recorder()
-	pingRecorder.GetPingSource("testsource", createPingSource("testsource", "* * * * */1", "maxwell", "mysvc", nil), nil)
-	pingRecorder.UpdatePingSource(createPingSource("testsource", "* * * * */3", "maxwell", "mysvc1", nil), nil)
+	pingRecorder.GetPingSource("testsource", createPingSource("testsource", "* * * * */1", "maxwell", "", "mysvc", nil), nil)
+	pingRecorder.UpdatePingSource(createPingSource("testsource", "* * * * */3", "maxwell", "", "mysvc1", nil), nil)
 
 	out, err := executePingSourceCommand(pingSourceClient, dynamicClient, "update", "--schedule", "* * * * */3", "testsource", "--sink", "mysvc1")
 	assert.NilError(t, err)
@@ -52,8 +52,8 @@ func TestSimplePingUpdateCEOverrides(t *testing.T) {
 	pingRecorder := pingSourceClient.Recorder()
 	ceOverrideMap := map[string]string{"bla": "blub", "foo": "bar"}
 	ceOverrideMapUpdated := map[string]string{"foo": "baz", "new": "ceoverride"}
-	pingRecorder.GetPingSource("testsource", createPingSource("testsource", "* * * * */1", "maxwell", "mysvc", ceOverrideMap), nil)
-	pingRecorder.UpdatePingSource(createPingSource("testsource", "* * * * */3", "updated-data", "mysvc", ceOverrideMapUpdated), nil)
+	pingRecorder.GetPingSource("testsource", createPingSource("testsource", "* * * * */1", "maxwell", "", "mysvc", ceOverrideMap), nil)
+	pingRecorder.UpdatePingSource(createPingSource("testsource", "* * * * */3", "updated-data", "", "mysvc", ceOverrideMapUpdated), nil)
 
 	out, err := executePingSourceCommand(pingSourceClient, nil, "update", "--schedule", "* * * * */3", "testsource", "--data", "updated-data", "--ce-override", "bla-", "--ce-override", "foo=baz", "--ce-override", "new=ceoverride")
 	assert.NilError(t, err)
@@ -77,7 +77,7 @@ func TestUpdateError(t *testing.T) {
 
 func TestPingUpdateDeletionTimestampNotNil(t *testing.T) {
 	pingSourceClient := sourcesv1beta2.NewMockKnPingSourceClient(t)
-	present := createPingSource("test", "", "", "", nil)
+	present := createPingSource("test", "", "", "", "", nil)
 	present.DeletionTimestamp = &metav1.Time{Time: time.Now()}
 	pingRecorder := pingSourceClient.Recorder()
 	pingRecorder.GetPingSource("test", present, nil)
@@ -100,7 +100,7 @@ func TestPingUpdateNoSinkError(t *testing.T) {
 	pingClient := sourcesv1beta2.NewMockKnPingSourceClient(t)
 	pingRecorder := pingClient.Recorder()
 
-	pingRecorder.GetPingSource("testsource", createPingSource("testsource", "* * * * */1", "maxwell", "mysvc", nil), nil)
+	pingRecorder.GetPingSource("testsource", createPingSource("testsource", "* * * * */1", "maxwell", "", "mysvc", nil), nil)
 
 	out, err := executePingSourceCommand(pingClient, dynamicClient, "update", "testsource", "--sink", "ksvc1")
 	assert.ErrorContains(t, err, "not found")

pkg/sources/v1beta2/ping_client.go

@@ -175,6 +175,11 @@ func (b *PingSourceBuilder) Data(data string) *PingSourceBuilder {
 	return b
 }
 
+func (b *PingSourceBuilder) DataBase64(data string) *PingSourceBuilder {
+	b.pingSource.Spec.DataBase64 = data
+	return b
+}
+
 func (b *PingSourceBuilder) Sink(sink duckv1.Destination) *PingSourceBuilder {
 	b.pingSource.Spec.Sink = sink
 	return b