This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 57395514b fix(#5048): Support component scheme prefix in data type
references
57395514b is described below
commit 57395514bd6b054838f4149720761ca3dbf5ed6f
Author: Christoph Deppisch <cdeppi...@redhat.com>
AuthorDate: Thu Jan 11 10:40:32 2024 +0100
fix(#5048): Support component scheme prefix in data type references
- Allows data type references in Pipes to use component scheme as a prefix
in the transformer name (e.g. format=aws2-s3:application-cloudevents)
- This is in addition to specifying "scheme" and "format" properties on the
data type reference
---
pkg/util/bindings/kamelet.go | 14 +++-
pkg/util/bindings/kamelet_test.go | 161 +++++++++++++++++++++++---------------
2 files changed, 106 insertions(+), 69 deletions(-)
diff --git a/pkg/util/bindings/kamelet.go b/pkg/util/bindings/kamelet.go
index af12afaa6..cb05d9646 100644
--- a/pkg/util/bindings/kamelet.go
+++ b/pkg/util/bindings/kamelet.go
@@ -20,6 +20,7 @@ package bindings
import (
"fmt"
"net/url"
+ "strings"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
@@ -140,15 +141,20 @@ func (k BindingConverter) DataTypeStep(e v1.Endpoint, id
string, typeSlot v1.Typ
return nil, nil
}
- if inDataType, ok := e.DataTypes[typeSlot]; ok {
+ if dataType, ok := e.DataTypes[typeSlot]; ok {
scheme := "camel"
- if inDataType.Scheme != "" {
- scheme = inDataType.Scheme
+ format := dataType.Format
+ if dataType.Scheme != "" {
+ scheme = dataType.Scheme
+ } else if strings.Contains(format, ":") {
+ tuple := strings.SplitN(format, ":", 2)
+ scheme = tuple[0]
+ format = tuple[1]
}
props := make(map[string]string, 2)
props[fmt.Sprintf("camel.kamelet.%s.%s-%s.scheme",
datTypeActionKamelet, id, typeSlot)] = scheme
- props[fmt.Sprintf("camel.kamelet.%s.%s-%s.format",
datTypeActionKamelet, id, typeSlot)] = inDataType.Format
+ props[fmt.Sprintf("camel.kamelet.%s.%s-%s.format",
datTypeActionKamelet, id, typeSlot)] = format
stepDsl := map[string]interface{}{
"kamelet": map[string]interface{}{
diff --git a/pkg/util/bindings/kamelet_test.go
b/pkg/util/bindings/kamelet_test.go
index 6c1aa14fe..3721c3392 100644
--- a/pkg/util/bindings/kamelet_test.go
+++ b/pkg/util/bindings/kamelet_test.go
@@ -139,23 +139,7 @@ func TestBindingConverterWithDataTypes(t *testing.T) {
name: "action-input",
endpointType: v1.EndpointTypeAction,
uri: "",
- step: map[string]interface{}{
- "pipeline": map[string]interface{}{
- "id": "action-0-pipeline",
- "steps": []map[string]interface{}{
- {
- "kamelet":
map[string]interface{}{
- "name":
"data-type-action/action-0-in",
- },
- },
- {
- "kamelet":
map[string]interface{}{
- "name":
"mykamelet/action-0",
- },
- },
- },
- },
- },
+ step: getExpectedStep(true, false),
endpointProperties: map[string]string{
"foo": "bar",
},
@@ -167,77 +151,90 @@ func TestBindingConverterWithDataTypes(t *testing.T) {
inputFormat: "string",
},
{
- name: "action-output",
+ name: "action-input-scheme-prefix",
endpointType: v1.EndpointTypeAction,
uri: "",
- step: map[string]interface{}{
- "pipeline": map[string]interface{}{
- "id": "action-1-pipeline",
- "steps": []map[string]interface{}{
- {
- "kamelet":
map[string]interface{}{
- "name":
"mykamelet/action-1",
- },
- },
- {
- "kamelet":
map[string]interface{}{
- "name":
"data-type-action/action-1-out",
- },
- },
- },
- },
+ step: getExpectedStep(true, false),
+ endpointProperties: map[string]string{
+ "foo": "bar",
},
+ applicationProperties: map[string]string{
+ "camel.kamelet.mykamelet.action-0.foo":
"bar",
+
"camel.kamelet.data-type-action.action-0-in.scheme": "foo",
+
"camel.kamelet.data-type-action.action-0-in.format": "string",
+ },
+ inputFormat: "foo:string",
+ },
+ {
+ name: "action-output",
+ endpointType: v1.EndpointTypeAction,
+ uri: "",
+ step: getExpectedStep(false, true),
endpointProperties: map[string]string{
"foo": "bar",
},
applicationProperties: map[string]string{
- "camel.kamelet.mykamelet.action-1.foo":
"bar",
-
"camel.kamelet.data-type-action.action-1-out.scheme": "camel",
-
"camel.kamelet.data-type-action.action-1-out.format": "string",
+ "camel.kamelet.mykamelet.action-0.foo":
"bar",
+
"camel.kamelet.data-type-action.action-0-out.scheme": "camel",
+
"camel.kamelet.data-type-action.action-0-out.format": "string",
},
outputFormat: "string",
},
{
- name: "action-input-output",
+ name: "action-output-scheme-prefix",
endpointType: v1.EndpointTypeAction,
uri: "",
- step: map[string]interface{}{
- "pipeline": map[string]interface{}{
- "id": "action-2-pipeline",
- "steps": []map[string]interface{}{
- {
- "kamelet":
map[string]interface{}{
- "name":
"data-type-action/action-2-in",
- },
- },
- {
- "kamelet":
map[string]interface{}{
- "name":
"mykamelet/action-2",
- },
- },
- {
- "kamelet":
map[string]interface{}{
- "name":
"data-type-action/action-2-out",
- },
- },
- },
- },
+ step: getExpectedStep(false, true),
+ endpointProperties: map[string]string{
+ "foo": "bar",
+ },
+ applicationProperties: map[string]string{
+ "camel.kamelet.mykamelet.action-0.foo":
"bar",
+
"camel.kamelet.data-type-action.action-0-out.scheme": "foo",
+
"camel.kamelet.data-type-action.action-0-out.format": "string",
},
+ outputFormat: "foo:string",
+ },
+ {
+ name: "action-input-output",
+ endpointType: v1.EndpointTypeAction,
+ uri: "",
+ step: getExpectedStep(true, true),
endpointProperties: map[string]string{
"foo": "bar",
},
applicationProperties: map[string]string{
- "camel.kamelet.mykamelet.action-2.foo":
"bar",
-
"camel.kamelet.data-type-action.action-2-in.scheme": "foo",
-
"camel.kamelet.data-type-action.action-2-in.format": "string",
-
"camel.kamelet.data-type-action.action-2-out.scheme": "foo",
-
"camel.kamelet.data-type-action.action-2-out.format": "binary",
+ "camel.kamelet.mykamelet.action-0.foo":
"bar",
+
"camel.kamelet.data-type-action.action-0-in.scheme": "foo",
+
"camel.kamelet.data-type-action.action-0-in.format": "string",
+
"camel.kamelet.data-type-action.action-0-out.scheme": "foo",
+
"camel.kamelet.data-type-action.action-0-out.format": "binary",
},
inputScheme: "foo",
inputFormat: "string",
outputScheme: "foo",
outputFormat: "binary",
},
+ {
+ name: "action-input-output-schema-and-prefix",
+ endpointType: v1.EndpointTypeAction,
+ uri: "",
+ step: getExpectedStep(true, true),
+ endpointProperties: map[string]string{
+ "foo": "bar",
+ },
+ applicationProperties: map[string]string{
+ "camel.kamelet.mykamelet.action-0.foo":
"bar",
+
"camel.kamelet.data-type-action.action-0-in.scheme": "camel",
+
"camel.kamelet.data-type-action.action-0-in.format": "foo:string",
+
"camel.kamelet.data-type-action.action-0-out.scheme": "camel",
+
"camel.kamelet.data-type-action.action-0-out.format": "foo:binary",
+ },
+ inputScheme: "camel",
+ inputFormat: "foo:string",
+ outputScheme: "camel",
+ outputFormat: "foo:binary",
+ },
}
for i, tc := range testcases {
@@ -275,6 +272,7 @@ func TestBindingConverterWithDataTypes(t *testing.T) {
}
}
+ pos := 0
binding, err := BindingConverter{}.Translate(
BindingContext{
Ctx: ctx,
@@ -284,7 +282,7 @@ func TestBindingConverterWithDataTypes(t *testing.T) {
},
EndpointContext{
Type: tc.endpointType,
- Position: &i,
+ Position: &pos,
},
endpoint)
@@ -301,3 +299,36 @@ func TestBindingConverterWithDataTypes(t *testing.T) {
})
}
}
+
+func getExpectedStep(withIn bool, withOut bool) map[string]interface{} {
+ var steps []map[string]interface{}
+
+ if withIn {
+ steps = append(steps, map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": "data-type-action/action-0-in",
+ },
+ })
+ }
+
+ steps = append(steps, map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": "mykamelet/action-0",
+ },
+ })
+
+ if withOut {
+ steps = append(steps, map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": "data-type-action/action-0-out",
+ },
+ })
+ }
+
+ return map[string]interface{}{
+ "pipeline": map[string]interface{}{
+ "id": "action-0-pipeline",
+ "steps": steps,
+ },
+ }
+}
