Skip to content

Commit 4356ea6

Browse files
committed
fix kn trigger list command to show correct v1/service sink output
1 parent 2e71451 commit 4356ea6

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

pkg/kn/commands/flags/sink.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func parseSink(sink string) (string, string, string) {
149149
// SinkToString prepares a sink for list output
150150
func SinkToString(sink duckv1.Destination) string {
151151
if sink.Ref != nil {
152-
if sink.Ref.Kind == "Service" {
152+
if sink.Ref.Kind == "Service" && strings.Contains(sink.Ref.APIVersion, sinkMappings["ksvc"].Group) {
153153
return fmt.Sprintf("ksvc:%s", sink.Ref.Name)
154154
} else {
155155
return fmt.Sprintf("%s:%s", strings.ToLower(sink.Ref.Kind), sink.Ref.Name)

pkg/kn/commands/flags/sink_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,13 @@ func TestSinkToString(t *testing.T) {
194194
Name: "default"}}
195195
expected = "broker:default"
196196
assert.Equal(t, expected, SinkToString(sink))
197+
sink = duckv1.Destination{
198+
Ref: &duckv1.KReference{Kind: "Service",
199+
APIVersion: "v1",
200+
Namespace: "my-namespace",
201+
Name: "mysvc"}}
202+
expected = "service:mysvc"
203+
assert.Equal(t, expected, SinkToString(sink))
197204

198205
uri := "http://target.example.com"
199206
targetExampleCom, err := apis.ParseURL(uri)

pkg/kn/commands/source/duck/multisourcelist_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ func newSourceUnstructuredObjWithSink(name, apiVersion, kind string) *unstructur
8383
"spec": map[string]interface{}{
8484
"sink": map[string]interface{}{
8585
"ref": map[string]interface{}{
86-
"kind": "Service",
87-
"name": "foo",
86+
"apiVersion": "serving.knative.dev/v1",
87+
"kind": "Service",
88+
"name": "foo",
8889
},
8990
},
9091
},

pkg/kn/commands/source/list_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,9 @@ func newSourceUnstructuredObj(name, apiVersion, kind string) *unstructured.Unstr
188188
"spec": map[string]interface{}{
189189
"sink": map[string]interface{}{
190190
"ref": map[string]interface{}{
191-
"kind": "Service",
192-
"name": "foo",
191+
"apiVersion": "serving.knative.dev/v1",
192+
"kind": "Service",
193+
"name": "foo",
193194
},
194195
},
195196
},

0 commit comments

Comments
 (0)