apache/camel-k-runtime#326: allow short syntax in knative endpoints

ipolyzos · May 20, 2020 · 818e7c7 · 818e7c7
1 parent 91ebef7
commit 818e7c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
@@ -74,6 +74,8 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
 							"channel-sinks":    "channel-sink-1",
 							"endpoint-sources": "endpoint-source-1",
 							"endpoint-sinks":   "endpoint-sink-1,endpoint-sink-2",
+							"event-sources":    "knative:event",
+							"event-sinks":      "knative:event",
 						},
 					},
 				},
@@ -141,6 +143,12 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
 	eSink2 := ne.FindService("endpoint-sink-2", knativeapi.CamelEndpointKindSink, knativeapi.CamelServiceTypeEndpoint, "serving.knative.dev/v1", "Service")
 	assert.NotNil(t, eSink2)
 	assert.Equal(t, "endpoint-sink-2.host", eSink2.Host)
+
+	eEventSource := ne.FindService("default", knativeapi.CamelEndpointKindSource, knativeapi.CamelServiceTypeEvent, "eventing.knative.dev/v1alpha1", "Broker")
+	assert.NotNil(t, eEventSource)
+	eEventSink := ne.FindService("default", knativeapi.CamelEndpointKindSink, knativeapi.CamelServiceTypeEvent, "eventing.knative.dev/v1alpha1", "Broker")
+	assert.NotNil(t, eEventSink)
+	assert.Equal(t, "broker-default.host", eEventSink.Host)
 }
 
 func TestKnativeEnvConfigurationFromSource(t *testing.T) {

diff --git a/pkg/util/knative/uri.go b/pkg/util/knative/uri.go
@@ -26,7 +26,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 )
 
-var uriRegexp = regexp.MustCompile(`^knative:[/]*(channel|endpoint|event)/([A-Za-z0-9.-]+)(?:[/?].*|$)`)
+var uriRegexp = regexp.MustCompile(`^knative:[/]*(channel|endpoint|event)(?:$|/([A-Za-z0-9.-]+)(?:[/?].*|$))`)
 var plainNameRegexp = regexp.MustCompile(`^[A-Za-z0-9.-]+$`)
 
 const (