kie-kogito-serverless-operator-335: Operator driven service discovery…

… API Phase4 - Augment the service uri query parameters
apache · Jan 15, 2024 · 0dd922d · 0dd922d
1 parent e61e0e4
commit 0dd922d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/controllers/discovery/uri_parser.go b/controllers/discovery/uri_parser.go
@@ -29,10 +29,13 @@ import (
 
 const (
 	// valid namespace, name, or label name.
-	dns1123LabelFmt         string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
-	namespaceAndNamePattern        = "^/((" + dns1123LabelFmt + ")+)(/(" + dns1123LabelFmt + ")+)?"
-	queryStringPattern             = "^(\\?((" + dns1123LabelFmt + ")+\\=(" + dns1123LabelFmt + ")+)" +
-		"(&(" + dns1123LabelFmt + ")+\\=(" + dns1123LabelFmt + ")+)*)?$"
+	dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
+	queryParamName         = "[a-zA-Z0-9][-a-zAz0-9]*"
+	queryParamValue        = "[/a-zA-Z0-9][/-a-zAz0-9]*"
+
+	namespaceAndNamePattern = "^/((" + dns1123LabelFmt + ")+)(/(" + dns1123LabelFmt + ")+)?"
+	queryStringPattern      = "^(\\?((" + queryParamName + ")+\\=(" + queryParamValue + ")+)" +
+		"(&(" + queryParamName + ")+\\=(" + queryParamValue + ")+)*)?$"
 
 	kubernetesGroupsPattern = "^(" + kubernetesServices +
 		"|" + kubernetesPods +

diff --git a/controllers/discovery/uri_parser_test.go b/controllers/discovery/uri_parser_test.go
@@ -194,6 +194,14 @@ var KnativeServicesTestValues = map[string]*ResourceUri{
 		WithQueryParam("label-a", "value-a").
 		WithQueryParam("label-b", "value-b").
 		WithPort("custom-port-value").Build(),
+
+	"knative:services.v1.serving.knative.dev/my-namespace/my-function?path=/myKnativeFunction": NewResourceUriBuilder(KnativeScheme).
+		Kind("services").
+		Version("v1").
+		Group("serving.knative.dev").
+		Namespace("my-namespace").
+		Name("my-function").
+		WithQueryParam("path", "/myKnativeFunction").Build(),
 }
 
 var KnativeBrokersTestValues = map[string]*ResourceUri{

diff --git a/controllers/profiles/common/properties/discovery_test.go b/controllers/profiles/common/properties/discovery_test.go
@@ -47,11 +47,11 @@ func Test_generateDiscoveryProperties(t *testing.T) {
 		Functions: []model.Function{
 			{
 				Name:      "knServiceInvocation1",
-				Operation: "knative:services.v1.serving.knative.dev/namespace1/my-kn-service1?path=knative-function1",
+				Operation: "knative:services.v1.serving.knative.dev/namespace1/my-kn-service1?path=/knative-function1",
 			},
 			{
 				Name:      "knServiceInvocation2",
-				Operation: "knative:services.v1.serving.knative.dev/my-kn-service3?path=knative-function3",
+				Operation: "knative:services.v1.serving.knative.dev/my-kn-service3?path=/knative-function3",
 			},
 		},
 	}