This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 27d4cc48e Fix #2873: migrate the kafka, jira and slack itests from
Pipe to Camel routes (#3044)
27d4cc48e is described below
commit 27d4cc48e825ae0614f273db14956738f40ac898
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Sep 17 10:45:28 2026 +0200
Fix #2873: migrate the kafka, jira and slack itests from Pipe to Camel
routes (#3044)
Third tranche, eight Pipes across kafka, jira and slack. These are one
Citrus
test per integration, so the file, the Citrus file name and the test name
all
move from <name>-pipe to <name>-route, as in #3040.
Salesforce was going to be part of this tranche and is deliberately left
out.
Its three Pipes are driven by salesforce-sink.feature, a Camel K cluster
test
written in Gherkin whose steps are load Pipe, Camel K integration <name>
should
be running and delete Pipe. Those steps take Pipe resources, so converting
the
files would break the feature rather than migrate it, and the feature is
@ignored in any case.
That gives a sharper rule than the shape based one used so far: a Pipe is
convertible exactly when a .citrus.it.yaml references it. Five do not --
salesforce's three and the two Knative ones under aws/s3 -- and all five are
driven by .feature files using the Camel K steps. So the convertible total
is
35, not the 38 stated in #3040 and #3041.
Each conversion is checked by parsing both files and comparing the endpoint
chain and every property.
Locally kafka and slack pass:
kafka-router-route-test kafka-source-route-test kafka-sink-route-test
slack-source-route-test slack-sink-route-test
The three jira tests fail here, but they fail identically on an unmodified
main,
with the same jiraServer.inbound timeout, so it is this environment rather
than
the migration. They pass in CI, which is where they will be checked.
Co-authored-by: Claude Opus 5 <[email protected]>
---
.../resources/jira/jira-add-comment-sink-pipe.yaml | 53 ----------------
... => jira-add-comment-sink-route.citrus.it.yaml} | 6 +-
.../jira-add-comment-sink-route.yaml} | 51 +++++++--------
.../resources/jira/jira-add-issue-sink-pipe.yaml | 74 ----------------------
...ml => jira-add-issue-sink-route.citrus.it.yaml} | 6 +-
.../resources/jira/jira-add-issue-sink-route.yaml | 54 ++++++++++++++++
...us.it.yaml => jira-source-route.citrus.it.yaml} | 6 +-
...ira-source-pipe.yaml => jira-source-route.yaml} | 28 ++++----
.../test/resources/kafka/kafka-router-pipe.yaml | 59 -----------------
...s.it.yaml => kafka-router-route.citrus.it.yaml} | 4 +-
.../kafka-router-route.yaml} | 43 ++++++++-----
...rus.it.yaml => kafka-sink-route.citrus.it.yaml} | 4 +-
...afka-source-pipe.yaml => kafka-sink-route.yaml} | 30 ++++-----
...s.it.yaml => kafka-source-route.citrus.it.yaml} | 6 +-
.../kafka-source-route.yaml} | 31 +++------
...rus.it.yaml => slack-sink-route.citrus.it.yaml} | 6 +-
.../slack-sink-route.yaml} | 39 +++++-------
...s.it.yaml => slack-source-route.citrus.it.yaml} | 6 +-
.../slack-source-route.yaml} | 27 +++-----
19 files changed, 185 insertions(+), 348 deletions(-)
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml
deleted file mode 100644
index 553954eb8..000000000
---
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: jira-add-comment-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: "{{timer.source.period}}"
- message: "{{jira.issue.comment}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: CamelJiraIssueKey
- value: "{{jira.issue.key}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-action
- properties:
- showHeaders: true
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: jira-add-comment-sink
- properties:
- jiraUrl: "{{jira.url}}"
- username: "{{jira.username}}"
- password: "{{jira.password}}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-route.citrus.it.yaml
similarity index 98%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-route.citrus.it.yaml
index 97a6a7e7e..c81b815d8 100644
---
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: jira-add-comment-sink-pipe-test
+name: jira-add-comment-sink-route-test
variables:
- name: "timer.source.period"
value: "10000"
@@ -54,7 +54,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "jira/jira-add-comment-sink-pipe.yaml"
+ file: "jira/jira-add-comment-sink-route.yaml"
systemProperties:
properties:
- name: "timer.source.period"
@@ -215,5 +215,5 @@ actions:
- camel:
cli:
verify:
- integration: "jira-add-comment-sink-pipe"
+ integration: "jira-add-comment-sink-route"
logMessage: "${jira.issue.comment}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-route.yaml
similarity index 58%
rename from
tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-route.yaml
index 7668f1100..2783691dc 100644
--- a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-route.yaml
@@ -15,32 +15,25 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: slack-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: "{{timer.source.period}}"
- message: "{{slack.message}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-action
- properties:
- showHeaders: true
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: slack-sink
- properties:
- webhookUrl: "{{slack.server.url}}"
- channel: "{{slack.channel}}"
- token: "{{slack.token}}"
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: '{{timer.source.period}}'
+ message: '{{jira.issue.comment}}'
+ steps:
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: CamelJiraIssueKey
+ value: '{{jira.issue.key}}'
+ - to:
+ uri: "kamelet:log-action"
+ parameters:
+ showHeaders: true
+ - to:
+ uri: "kamelet:jira-add-comment-sink"
+ parameters:
+ jiraUrl: '{{jira.url}}'
+ username: '{{jira.username}}'
+ password: '{{jira.password}}'
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml
deleted file mode 100644
index c3ac06c18..000000000
---
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: jira-add-issue-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: "{{timer.source.period}}"
- message: "{{jira.issue.description}}"
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: CamelJiraIssueProjectKey
- value: "{{jira.project.key}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: CamelJiraIssueTypeName
- value: "{{jira.issue.type}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: CamelJiraIssueSummary
- value: "{{jira.issue.summary}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: insert-header-action
- properties:
- name: CamelJiraIssueAssignee
- value: "{{jira.issue.assignee}}"
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-action
- properties:
- showHeaders: true
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: jira-add-issue-sink
- properties:
- jiraUrl: "{{jira.url}}"
- username: "{{jira.username}}"
- password: "{{jira.password}}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-route.citrus.it.yaml
similarity index 97%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-route.citrus.it.yaml
index c49598a07..8b2ddeb65 100644
---
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: jira-add-issue-sink-pipe-test
+name: jira-add-issue-sink-route-test
variables:
- name: "timer.source.period"
value: "10000"
@@ -50,7 +50,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "jira/jira-add-issue-sink-pipe.yaml"
+ file: "jira/jira-add-issue-sink-route.yaml"
systemProperties:
properties:
- name: "timer.source.period"
@@ -163,5 +163,5 @@ actions:
- camel:
cli:
verify:
- integration: "jira-add-issue-sink-pipe"
+ integration: "jira-add-issue-sink-route"
logMessage: "${jira.issue.summary}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-route.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-route.yaml
new file mode 100644
index 000000000..07c6b2dbd
--- /dev/null
+++
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-route.yaml
@@ -0,0 +1,54 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: '{{timer.source.period}}'
+ message: '{{jira.issue.description}}'
+ steps:
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: CamelJiraIssueProjectKey
+ value: '{{jira.project.key}}'
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: CamelJiraIssueTypeName
+ value: '{{jira.issue.type}}'
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: CamelJiraIssueSummary
+ value: '{{jira.issue.summary}}'
+ - to:
+ uri: "kamelet:insert-header-action"
+ parameters:
+ name: CamelJiraIssueAssignee
+ value: '{{jira.issue.assignee}}'
+ - to:
+ uri: "kamelet:log-action"
+ parameters:
+ showHeaders: true
+ - to:
+ uri: "kamelet:jira-add-issue-sink"
+ parameters:
+ jiraUrl: '{{jira.url}}'
+ username: '{{jira.username}}'
+ password: '{{jira.password}}'
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-route.citrus.it.yaml
similarity index 98%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-route.citrus.it.yaml
index e5eb078fa..c53220159 100644
---
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: jira-source-pipe-test
+name: jira-source-route-test
variables:
- name: "jira.project.id"
value: "10001"
@@ -42,7 +42,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "jira/jira-source-pipe.yaml"
+ file: "jira/jira-source-route.yaml"
systemProperties:
properties:
- name: "jira.url"
@@ -216,5 +216,5 @@ actions:
- camel:
cli:
verify:
- integration: "jira-source-pipe"
+ integration: "jira-source-route"
logMessage: "${jira.issue.summary}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-route.yaml
similarity index 72%
copy from
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
copy to
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-route.yaml
index a4b3eba57..e1dcbe818 100644
--- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-route.yaml
@@ -15,20 +15,14 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: jira-source-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: jira-source
- properties:
- jiraUrl: "{{jira.url}}"
- username: "{{jira.username}}"
- password: "{{jira.password}}"
- jql: "{{jira.jql}}"
- sink:
- uri: log:info
+- route:
+ from:
+ uri: "kamelet:jira-source"
+ parameters:
+ jiraUrl: '{{jira.url}}'
+ username: '{{jira.username}}'
+ password: '{{jira.password}}'
+ jql: '{{jira.jql}}'
+ steps:
+ - to:
+ uri: "log:info"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml
deleted file mode 100644
index dbc4f17c9..000000000
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: kafka-router-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: webhook-source
- properties:
- subpath: messages
- steps:
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timestamp-router-action
- properties:
- topicFormat: $[topic]_$[timestamp]
- timestampFormat: YYYY-MM-dd
- timestampHeaderName: kafka.TIMESTAMP
- topicHeaderName: kafka.TOPIC
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: set-body-action
- properties:
- value: $simple{header[message]}
- - ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-action
- properties:
- showHeaders: true
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: kafka-sink
- properties:
- bootstrapServers: '{{kafka.bootstrapServers}}'
- topic: dummy
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-route.citrus.it.yaml
similarity index 97%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-route.citrus.it.yaml
index 04ab832e0..aa44051fd 100644
---
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: kafka-router-pipe-test
+name: kafka-router-route-test
variables:
- name: "kafka.deserializeHeaders"
value: "true"
@@ -41,7 +41,7 @@ actions:
- "--port"
- "${kafka.webhook.server.port}"
integration:
- file: "kafka/kafka-router-pipe.yaml"
+ file: "kafka/kafka-router-route.yaml"
systemProperties:
file: "kafka/application.properties"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-route.yaml
similarity index 54%
copy from
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
copy to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-route.yaml
index a4b3eba57..e3ca1f6f6 100644
--- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-route.yaml
@@ -15,20 +15,29 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: jira-source-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: jira-source
- properties:
- jiraUrl: "{{jira.url}}"
- username: "{{jira.username}}"
- password: "{{jira.password}}"
- jql: "{{jira.jql}}"
- sink:
- uri: log:info
+- route:
+ from:
+ uri: "kamelet:webhook-source"
+ parameters:
+ subpath: messages
+ steps:
+ - to:
+ uri: "kamelet:timestamp-router-action"
+ parameters:
+ topicFormat: $[topic]_$[timestamp]
+ timestampFormat: YYYY-MM-dd
+ timestampHeaderName: kafka.TIMESTAMP
+ topicHeaderName: kafka.TOPIC
+ - to:
+ uri: "kamelet:set-body-action"
+ parameters:
+ value: $simple{header[message]}
+ - to:
+ uri: "kamelet:log-action"
+ parameters:
+ showHeaders: true
+ - to:
+ uri: "kamelet:kafka-sink"
+ parameters:
+ bootstrapServers: '{{kafka.bootstrapServers}}'
+ topic: dummy
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-route.citrus.it.yaml
similarity index 96%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-route.citrus.it.yaml
index 5f10ca1af..67938e3f9 100644
---
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: kafka-sink-pipe-test
+name: kafka-sink-route-test
variables:
- name: "kafka.deserializeHeaders"
value: "true"
@@ -36,7 +36,7 @@ actions:
cli:
run:
integration:
- file: "kafka/kafka-sink-pipe.yaml"
+ file: "kafka/kafka-sink-route.yaml"
systemProperties:
file: "kafka/application.properties"
properties:
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-route.yaml
similarity index 71%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-route.yaml
index 7ddae5969..966b380d4 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-route.yaml
@@ -15,20 +15,16 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: kafka-source-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: kafka-source
- properties:
- bootstrapServers: '{{kafka.bootstrapServers}}'
- topic: '{{kafka.topic}}'
- deserializeHeaders: '{{kafka.deserializeHeaders}}'
- sink:
- uri: "{{http.sink.url}}"
-
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: 10000
+ contentType: application/json
+ message: '{{kafka.message}}'
+ steps:
+ - to:
+ uri: "kamelet:kafka-sink"
+ parameters:
+ bootstrapServers: '{{kafka.bootstrapServers}}'
+ topic: '{{kafka.topic}}'
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-route.citrus.it.yaml
similarity index 96%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-route.citrus.it.yaml
index e01ea5e30..8e81659ba 100644
---
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: kafka-source-pipe-test
+name: kafka-source-route-test
variables:
- name: "kafka.deserializeHeaders"
value: "true"
@@ -38,7 +38,7 @@ actions:
cli:
run:
integration:
- file: "kafka/kafka-source-pipe.yaml"
+ file: "kafka/kafka-source-route.yaml"
systemProperties:
file: "kafka/application.properties"
properties:
@@ -49,7 +49,7 @@ actions:
- camel:
cli:
verify:
- integration: "kafka-source-pipe"
+ integration: "kafka-source-route"
logMessage: "Subscribed to topic(s): ${kafka.topic}"
# Kafka producer endpoint
diff --git
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-route.yaml
similarity index 67%
rename from
tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-route.yaml
index 302979165..8019fd425 100644
--- a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-route.yaml
@@ -15,24 +15,13 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: slack-source-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: slack-source
- properties:
- serverUrl: "{{slack.server.url}}"
- channel: "{{slack.channel}}"
- token: "{{slack.token}}"
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: log-sink
- properties:
- showHeaders: true
+- route:
+ from:
+ uri: "kamelet:kafka-source"
+ parameters:
+ bootstrapServers: '{{kafka.bootstrapServers}}'
+ topic: '{{kafka.topic}}'
+ deserializeHeaders: '{{kafka.deserializeHeaders}}'
+ steps:
+ - to:
+ uri: "{{http.sink.url}}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-route.citrus.it.yaml
similarity index 95%
rename from
tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-route.citrus.it.yaml
index 4225edd6e..c0cfa23b2 100644
---
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: slack-sink-pipe-test
+name: slack-sink-route-test
variables:
- name: "slack.token"
value:
"xoxb-citrus:randomNumber(10)-citrus:randomNumber(13)-citrus:randomString(34)"
@@ -41,7 +41,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "slack/slack-sink-pipe.yaml"
+ file: "slack/slack-sink-route.yaml"
systemProperties:
file: "slack/application.properties"
properties:
@@ -76,5 +76,5 @@ actions:
- camel:
cli:
verify:
- integration: "slack-sink-pipe"
+ integration: "slack-sink-route"
logMessage: "${slack.message}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-route.yaml
similarity index 65%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-route.yaml
index 8291e0fbe..90a332abc 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-route.yaml
@@ -15,25 +15,20 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: kafka-sink-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: timer-source
- properties:
- period: 10000
- contentType: application/json
- message: "{{kafka.message}}"
- sink:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: kafka-sink
- properties:
- bootstrapServers: '{{kafka.bootstrapServers}}'
- topic: '{{kafka.topic}}'
+- route:
+ from:
+ uri: "kamelet:timer-source"
+ parameters:
+ period: '{{timer.source.period}}'
+ message: '{{slack.message}}'
+ steps:
+ - to:
+ uri: "kamelet:log-action"
+ parameters:
+ showHeaders: true
+ - to:
+ uri: "kamelet:slack-sink"
+ parameters:
+ webhookUrl: '{{slack.server.url}}'
+ channel: '{{slack.channel}}'
+ token: '{{slack.token}}'
diff --git
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-route.citrus.it.yaml
similarity index 96%
rename from
tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/slack/slack-source-route.citrus.it.yaml
index 3ef6e7ce3..d14b5f3a7 100644
---
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-route.citrus.it.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-name: slack-source-pipe-test
+name: slack-source-route-test
variables:
- name: "slack.token"
value:
"xoxb-citrus:randomNumber(10)-citrus:randomNumber(13)-citrus:randomString(34)"
@@ -39,7 +39,7 @@ actions:
run:
waitForRunningState: false
integration:
- file: "slack/slack-source-pipe.yaml"
+ file: "slack/slack-source-route.yaml"
systemProperties:
file: "slack/application.properties"
properties:
@@ -124,5 +124,5 @@ actions:
- camel:
cli:
verify:
- integration: "slack-source-pipe"
+ integration: "slack-source-route"
logMessage: "${slack.message}"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-route.yaml
similarity index 72%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/slack/slack-source-route.yaml
index a4b3eba57..24438c9c4 100644
--- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.yaml
+++
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-route.yaml
@@ -15,20 +15,13 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
- name: jira-source-pipe
-spec:
- source:
- ref:
- kind: Kamelet
- apiVersion: camel.apache.org/v1
- name: jira-source
- properties:
- jiraUrl: "{{jira.url}}"
- username: "{{jira.username}}"
- password: "{{jira.password}}"
- jql: "{{jira.jql}}"
- sink:
- uri: log:info
+- route:
+ from:
+ uri: "kamelet:slack-source"
+ parameters:
+ serverUrl: '{{slack.server.url}}'
+ channel: '{{slack.channel}}'
+ token: '{{slack.token}}'
+ steps:
+ - to:
+ uri: "kamelet:log-sink"
