You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cd...@apache.org on 2025/01/16 20:07:53 UTC
(camel-kamelets) 01/02: chore: Update to Citrus 4.5.0
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-kamelets.git
commit a509a5a650036c528771a0eae41d9bac160519c3
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Jan 14 08:34:54 2025 +0100
chore: Update to Citrus 4.5.0
---
docs/modules/ROOT/pages/development.adoc | 4 +--
pom.xml | 6 ++--
.../delete-secret.sh => jbang.properties} | 11 +++----
.../resources/avro/avro-binary-source-pipe.yaml | 3 --
.../resources/avro/avro-x-struct-sink-pipe.yaml | 3 --
.../src/test/resources/avro/yaks-config.yaml | 6 ++--
.../test/resources/aws/ddb/amazonDDBClient.groovy | 8 ++---
.../test/resources/aws/ddb/aws-ddb-sink-pipe.yaml | 8 ++---
.../test/resources/aws/ddb/aws-ddb-sink.feature | 10 +++----
.../resources/aws/ddb/aws-ddb-source-pipe.yaml | 8 ++---
.../resources/aws/ddb/waitForLocalStack.groovy | 2 +-
.../src/test/resources/aws/ddb/yaks-config.yaml | 10 +++----
.../aws/kinesis/amazonKinesisClient.groovy | 8 ++---
.../aws/kinesis/aws-kinesis-sink-pipe.yaml | 8 ++---
.../resources/aws/kinesis/aws-kinesis-sink.feature | 6 ++--
.../aws/kinesis/aws-kinesis-source-pipe.yaml | 8 ++---
.../resources/aws/kinesis/waitForLocalStack.groovy | 2 +-
.../test/resources/aws/kinesis/yaks-config.yaml | 10 +++----
.../test/resources/aws/s3/amazonS3Client.groovy | 8 ++---
.../resources/aws/s3/aws-s3-credentials.properties | 8 ++---
.../aws/s3/aws-s3-source-property-conf.feature | 10 +++++--
.../aws/s3/aws-s3-source-secret-conf.feature | 2 +-
.../aws/s3/aws-s3-source-uri-conf.feature | 2 +-
.../src/test/resources/aws/s3/aws-s3-to-http.yaml | 8 ++---
.../resources/aws/s3/aws-s3-to-knative-broker.yaml | 8 ++---
.../aws/s3/aws-s3-to-knative-channel.yaml | 8 ++---
.../aws/s3/aws-s3-to-log-secret-based.groovy | 24 ---------------
.../s3/aws-s3-to-log-secret-based.yaml} | 14 +++++----
.../aws/s3/aws-s3-to-log-uri-based.groovy | 33 --------------------
.../s3/aws-s3-to-log-uri-based.yaml} | 35 ++++++++++------------
.../src/test/resources/aws/s3/aws-s3-uri-pipe.yaml | 8 ++---
.../test/resources/aws/s3/waitForLocalStack.groovy | 2 +-
.../src/test/resources/aws/s3/yaks-config.yaml | 18 +++++------
.../test/resources/aws/sqs/amazonSQSClient.groovy | 8 ++---
.../aws/sqs/aws-sqs-credentials.properties | 8 ++---
.../aws/sqs/aws-sqs-source-property-conf.feature | 10 +++++--
.../aws/sqs/aws-sqs-source-secret-conf.feature | 2 +-
.../aws/sqs/aws-sqs-source-uri-conf.feature | 2 +-
.../aws/sqs/aws-sqs-to-knative-channel.yaml | 8 ++---
.../aws/sqs/aws-sqs-to-log-secret-based.groovy | 24 ---------------
.../sqs/aws-sqs-to-log-secret-based.yaml} | 14 +++++----
.../aws/sqs/aws-sqs-to-log-uri-based.groovy | 32 --------------------
.../sqs/aws-sqs-to-log-uri-based.yaml} | 35 ++++++++++------------
.../test/resources/aws/sqs/aws-sqs-uri-pipe.yaml | 8 ++---
.../resources/aws/sqs/waitForLocalStack.groovy | 2 +-
.../src/test/resources/aws/sqs/yaks-config.yaml | 18 +++++------
.../test/resources/citrus-application.properties | 23 +++++++-------
.../src/test/resources/earthquake/yaks-config.yaml | 6 ++--
.../src/test/resources/jira/README.md | 2 +-
.../src/test/resources/jira/yaks-config.yaml | 14 ++++-----
.../src/test/resources/kafka/install.sh | 8 ++---
.../src/test/resources/kafka/kafka-sink-pipe.yaml | 2 +-
.../src/test/resources/kafka/kafka-sink.feature | 2 +-
.../test/resources/kafka/kafka-source-pipe.yaml | 2 +-
.../src/test/resources/kafka/kafka-source.feature | 2 +-
.../resources/kafka/timestamp-router-pipe.yaml | 2 +-
.../test/resources/kafka/timestamp-router.feature | 2 +-
.../src/test/resources/kafka/uninstall.sh | 4 +--
.../src/test/resources/kafka/yaks-config.yaml | 8 ++---
.../src/test/resources/mail/yaks-config.yaml | 6 ++--
.../src/test/resources/openapi/yaks-config.yaml | 6 ++--
.../protobuf/protobuf-binary-source-pipe.yaml | 3 --
.../protobuf/protobuf-x-struct-sink-pipe.yaml | 3 --
.../src/test/resources/protobuf/yaks-config.yaml | 6 ++--
.../src/test/resources/salesforce/delete-secret.sh | 2 +-
.../test/resources/salesforce/prepare-secret.sh | 4 +--
.../src/test/resources/salesforce/yaks-config.yaml | 6 ++--
.../src/test/resources/slack/yaks-config.yaml | 14 ++++-----
.../src/test/resources/timer/timer-to-http.feature | 2 +-
.../src/test/resources/timer/timer-to-http.groovy | 26 ----------------
.../src/test/resources/timer/timer-to-http.yaml | 19 ++++++++++++
.../src/test/resources/timer/yaks-config.yaml | 8 ++---
.../test/resources/transformation/yaks-config.yaml | 6 ++--
73 files changed, 272 insertions(+), 396 deletions(-)
diff --git a/docs/modules/ROOT/pages/development.adoc b/docs/modules/ROOT/pages/development.adoc
index 965d504f..58547fa7 100644
--- a/docs/modules/ROOT/pages/development.adoc
+++ b/docs/modules/ROOT/pages/development.adoc
@@ -1445,7 +1445,7 @@ Feature: Kamelet earthquake-source works
Scenario: Bind Kamelet to service
Given create Kubernetes service test-service with target port 8080
- And bind Kamelet earthquake-source to uri http://test-service.${YAKS_NAMESPACE}.svc.cluster.local/test
+ And bind Kamelet earthquake-source to uri http://test-service.${CITRUS_NAMESPACE}.svc.cluster.local/test
When create Pipe earthquake-source-uri
Then Pipe earthquake-source-uri should be available
And Camel K integration earthquake-source-uri should be running
@@ -1543,7 +1543,7 @@ Feature: Kamelet telegram-sink works
Scenario: Send a message to the Telegram Chat
- Given URL: http://webhook-to-telegram.${YAKS_NAMESPACE}.svc.cluster.local
+ Given URL: http://webhook-to-telegram.${CITRUS_NAMESPACE}.svc.cluster.local
And HTTP request timeout is 60000 milliseconds
And wait for GET on path / to return 404
Given HTTP request headers
diff --git a/pom.xml b/pom.xml
index b5bf7484..6b6b36cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,9 @@
<camel.version>4.9.0</camel.version>
- <citrus.version>4.3.2</citrus.version>
- <cucumber.version>7.18.1</cucumber.version>
- <yaks.version>0.20.0</yaks.version>
+ <citrus.version>4.5.0</citrus.version>
+ <cucumber.version>7.20.1</cucumber.version>
+ <yaks.version>0.21.0-SNAPSHOT</yaks.version>
<!-- Versions used inside Kamelets (add them also to the dependencyManagement section and the groovy script below) -->
<!-- These properties must keep this same format "version.<groupId>.<artifactId>" -->
diff --git a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh b/tests/camel-kamelets-itest/jbang.properties
similarity index 78%
copy from tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
copy to tests/camel-kamelets-itest/jbang.properties
index 6661b959..b3016ea8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
+++ b/tests/camel-kamelets-itest/jbang.properties
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#
# 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.
@@ -7,13 +6,15 @@
# (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
+# 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.
+#
-# delete secret
-oc delete secret salesforce-credentials -n ${YAKS_NAMESPACE}
+# Declare required additional dependencies
+run.deps=org.apache.camel:camel-jackson-avro:4.9.0,\
+org.apache.camel:camel-jackson-protobuf:4.9.0
diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/avro-binary-source-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/avro-binary-source-pipe.yaml
index 376a3be8..c1b54643 100644
--- a/tests/camel-kamelets-itest/src/test/resources/avro/avro-binary-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/avro/avro-binary-source-pipe.yaml
@@ -20,9 +20,6 @@ kind: Pipe
metadata:
name: avro-binary-source-pipe
spec:
- integration:
- dependencies:
- - "camel:jackson-avro"
source:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/avro-x-struct-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/avro-x-struct-sink-pipe.yaml
index 613cd3bd..a3202228 100644
--- a/tests/camel-kamelets-itest/src/test/resources/avro/avro-x-struct-sink-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/avro/avro-x-struct-sink-pipe.yaml
@@ -20,9 +20,6 @@ kind: Pipe
metadata:
name: avro-x-struct-sink-pipe
spec:
- integration:
- dependencies:
- - "camel:jackson-avro"
source:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/yaks-config.yaml
index 38c11c7f..4a6fe849 100644
--- a/tests/camel-kamelets-itest/src/test/resources/avro/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/avro/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers:
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy
index e471a9e8..a9a94402 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy
@@ -31,13 +31,13 @@ import software.amazon.awssdk.services.dynamodb.model.StreamViewType
DynamoDbClient amazonDDBClient = DynamoDbClient
.builder()
- .endpointOverride(URI.create("${YAKS_TESTCONTAINERS_LOCALSTACK_DYNAMODB_LOCAL_URL}"))
+ .endpointOverride(URI.create("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
.credentialsProvider(StaticCredentialsProvider.create(
AwsBasicCredentials.create(
- "${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
- "${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
))
- .region(Region.of("${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}"))
+ .region(Region.of("${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}"))
.build()
amazonDDBClient.createTable(b -> {
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-pipe.yaml
index 71136f54..0b3d8d88 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-pipe.yaml
@@ -44,7 +44,7 @@ spec:
table: ${aws.ddb.tableName}
operation: ${aws.ddb.operation}
overrideEndpoint: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_DYNAMODB_LOCAL_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink.feature b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink.feature
index 50df8a53..3b30b6b2 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink.feature
@@ -47,7 +47,7 @@ Feature: AWS DDB Sink
| aws.ddb.json.data | {"id": ${aws.ddb.item.id}} |
Given run script putItem.groovy
Given variables
- | aws.ddb.items | [[year:AttributeValue(N=${aws.ddb.item.year}), id:AttributeValue(N=${aws.ddb.item.id}), title:AttributeValue(S=${aws.ddb.item.title})]] |
+ | aws.ddb.items | [[title:AttributeValue(S=${aws.ddb.item.title}), year:AttributeValue(N=${aws.ddb.item.year}), id:AttributeValue(N=${aws.ddb.item.id})]] |
# Create item on AWS-DDB
Then apply actions verifyItems.groovy
# Create binding
@@ -75,7 +75,7 @@ Feature: AWS DDB Sink
And Camel K integration aws-ddb-sink-pipe should print Started aws-ddb-sink-pipe
# Verify Kamelet sink
Given variables
- | aws.ddb.item | [year:AttributeValue(N=${aws.ddb.item.year}), id:AttributeValue(N=${aws.ddb.item.id}), title:AttributeValue(S=${aws.ddb.item.title})] |
+ | aws.ddb.item | [title:AttributeValue(S=${aws.ddb.item.title}), year:AttributeValue(N=${aws.ddb.item.year}), id:AttributeValue(N=${aws.ddb.item.id})] |
Then apply actions getItem.groovy
# Remove Camel K binding
Given delete Pipe aws-ddb-sink-pipe
@@ -91,7 +91,7 @@ Feature: AWS DDB Sink
| aws.ddb.json.data | { "key": {"id": ${aws.ddb.item.id}}, "item": {"title": "${aws.ddb.item.title.new}", "year": ${aws.ddb.item.year}, "directors": ${aws.ddb.item.directors}} } |
Given run script putItem.groovy
Given variables
- | aws.ddb.item | [year:AttributeValue(N=${aws.ddb.item.year}), id:AttributeValue(N=${aws.ddb.item.id}), title:AttributeValue(S=${aws.ddb.item.title})] |
+ | aws.ddb.item | [title:AttributeValue(S=${aws.ddb.item.title}), year:AttributeValue(N=${aws.ddb.item.year}), id:AttributeValue(N=${aws.ddb.item.id})] |
Then apply actions getItem.groovy
# Create binding
When load Pipe aws-ddb-sink-pipe.yaml
@@ -100,9 +100,9 @@ Feature: AWS DDB Sink
And Camel K integration aws-ddb-sink-pipe should print Started aws-ddb-sink-pipe
# Verify Kamelet sink
Given variables
- | maxRetryAttempts | 200 |
+ | maxRetryAttempts | 20 |
| aws.ddb.item.directors | [Ernest B. Schoedsack, Merian C. Cooper] |
- | aws.ddb.item | [year:AttributeValue(N=${aws.ddb.item.year}), directors:AttributeValue(SS=${aws.ddb.item.directors}), id:AttributeValue(N=${aws.ddb.item.id}), title:AttributeValue(S=${aws.ddb.item.title.new})] |
+ | aws.ddb.item | [id:AttributeValue(N=${aws.ddb.item.id}), title:AttributeValue(S=${aws.ddb.item.title.new}), year:AttributeValue(N=${aws.ddb.item.year}), directors:AttributeValue(SS=${aws.ddb.item.directors})] |
Then apply actions getItem.groovy
# Remove Camel K resources
Given delete Pipe aws-ddb-sink-pipe
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source-pipe.yaml
index 3414147d..9359c65d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source-pipe.yaml
@@ -29,10 +29,10 @@ spec:
table: ${aws.ddb.tableName}
streamIteratorType: FROM_START
overrideEndpoint: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_DYNAMODB_LOCAL_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
sink:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/waitForLocalStack.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/waitForLocalStack.groovy
index 0fbee966..358a50f8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/waitForLocalStack.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/waitForLocalStack.groovy
@@ -17,4 +17,4 @@
package aws.ddb
-$(waitFor().seconds(15.0).http().url("${YAKS_TESTCONTAINERS_LOCALSTACK_DYNAMODB_LOCAL_URL}"))
+$(waitFor().seconds(15.0).http().url("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/yaks-config.yaml
index c4893679..0a99fe52 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/yaks-config.yaml
@@ -22,15 +22,15 @@ config:
testcontainers:
enabled: true
env:
- - name: YAKS_CAMEL_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMEL_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KAMELETS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KAMELETS_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/amazonKinesisClient.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/amazonKinesisClient.groovy
index 17013bff..611acbd4 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/amazonKinesisClient.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/amazonKinesisClient.groovy
@@ -24,13 +24,13 @@ import software.amazon.awssdk.services.kinesis.KinesisClient
KinesisClient kinesisClient = KinesisClient
.builder()
- .endpointOverride(URI.create("${YAKS_TESTCONTAINERS_LOCALSTACK_KINESIS_LOCAL_URL}"))
+ .endpointOverride(URI.create("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
.credentialsProvider(StaticCredentialsProvider.create(
AwsBasicCredentials.create(
- "${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
- "${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
))
- .region(Region.of("${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}"))
+ .region(Region.of("${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}"))
.build()
kinesisClient.createStream(s -> s.streamName("${aws.kinesis.streamName}").shardCount(1))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink-pipe.yaml
index 7b2584c4..e93d50f7 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink-pipe.yaml
@@ -50,7 +50,7 @@ spec:
properties:
stream: '${aws.kinesis.streamName}'
overrideEndpoint: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_KINESIS_LOCAL_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.feature b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.feature
index e563b26b..9216d257 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.feature
@@ -40,7 +40,7 @@ Feature: AWS Kinesis - Sink
And Camel K integration aws-kinesis-sink-pipe is running
And Camel K integration aws-kinesis-sink-pipe should print Started aws-kinesis-sink-pipe
# Create vent listener
- Given Camel route eventListener.groovy
+ Given Camel route kinesisEventListener.groovy
"""
from("aws2-kinesis://${aws.kinesis.streamName}?amazonKinesisClient=#amazonKinesisClient")
.convertBodyTo(String.class)
@@ -49,11 +49,11 @@ Feature: AWS Kinesis - Sink
# Verify event
Given Camel exchange message header CamelAwsKinesisPartitionKey="${aws.kinesis.partitionKey}"
Then receive Camel exchange from("seda:result") with body: ${aws.kinesis.json.data}
+ # Stop event listener
+ Then stop Camel route kinesisEventListener
Scenario: Remove resources
# Remove Camel K binding
Given delete Pipe aws-kinesis-sink-pipe
- # Stop event listener
- Given stop Camel route kinesisEventListener
# Stop LocalStack container
Given stop LocalStack container
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source-pipe.yaml
index 5ed67cf4..8bb9453c 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source-pipe.yaml
@@ -28,10 +28,10 @@ spec:
properties:
stream: ${aws.kinesis.streamName}
overrideEndpoint: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_KINESIS_LOCAL_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
sink:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/waitForLocalStack.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/waitForLocalStack.groovy
index 92883aed..358a50f8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/waitForLocalStack.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/waitForLocalStack.groovy
@@ -17,4 +17,4 @@
package aws.ddb
-$(waitFor().seconds(15.0).http().url("${YAKS_TESTCONTAINERS_LOCALSTACK_KINESIS_LOCAL_URL}"))
+$(waitFor().seconds(15.0).http().url("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/yaks-config.yaml
index f7b6da94..9ba755f3 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/yaks-config.yaml
@@ -22,15 +22,15 @@ config:
testcontainers:
enabled: true
env:
- - name: YAKS_CAMEL_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMEL_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KAMELETS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KAMELETS_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy
index ff5be571..fcdd2e1f 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy
@@ -24,14 +24,14 @@ import software.amazon.awssdk.services.s3.S3Client
S3Client s3 = S3Client
.builder()
- .endpointOverride(URI.create("${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}"))
+ .endpointOverride(URI.create("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
.credentialsProvider(StaticCredentialsProvider.create(
AwsBasicCredentials.create(
- "${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
- "${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
))
.forcePathStyle(true)
- .region(Region.of("${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}"))
+ .region(Region.of("${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}"))
.build()
s3.createBucket(b -> b.bucket("${aws.s3.bucketNameOrArn}"))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-credentials.properties b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-credentials.properties
index aa0e29a3..47b20945 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-credentials.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-credentials.properties
@@ -2,7 +2,7 @@
camel.kamelet.aws-s3-source.aws-s3-credentials.bucketNameOrArn=${aws.s3.bucketNameOrArn}
camel.kamelet.aws-s3-source.aws-s3-credentials.overrideEndpoint=true
camel.kamelet.aws-s3-source.aws-s3-credentials.forcePathStyle=true
-camel.kamelet.aws-s3-source.aws-s3-credentials.uriEndpointOverride=${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}
-camel.kamelet.aws-s3-source.aws-s3-credentials.secretKey=${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
-camel.kamelet.aws-s3-source.aws-s3-credentials.accessKey=${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
-camel.kamelet.aws-s3-source.aws-s3-credentials.region=${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+camel.kamelet.aws-s3-source.aws-s3-credentials.uriEndpointOverride=${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+camel.kamelet.aws-s3-source.aws-s3-credentials.secretKey=${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+camel.kamelet.aws-s3-source.aws-s3-credentials.accessKey=${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+camel.kamelet.aws-s3-source.aws-s3-credentials.region=${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-property-conf.feature b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-property-conf.feature
index 928d85d2..d77ae060 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-property-conf.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-property-conf.feature
@@ -18,10 +18,14 @@ Feature: AWS S3 Source - property based config
Given load to Camel registry amazonS3Client.groovy
# Create binding
Given Camel K integration property file aws-s3-credentials.properties
- Given create Camel K integration aws-s3-to-log-prop-based.groovy
+ Given create Camel K integration aws-s3-to-log-prop-based.yaml
"""
- from("kamelet:aws-s3-source/aws-s3-credentials")
- .to("log:info")
+ - route:
+ from:
+ uri: "kamelet:aws-s3-source/aws-s3-credentials"
+ steps:
+ - to:
+ uri: "log:info"
"""
Then Camel K integration aws-s3-to-log-prop-based should be running
# Verify Kamelet source
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-secret-conf.feature b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-secret-conf.feature
index 334b2402..4383f7b0 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-secret-conf.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-secret-conf.feature
@@ -24,7 +24,7 @@ Feature: AWS S3 Source - secret based config
Given New Camel context
Given load to Camel registry amazonS3Client.groovy
# Create binding
- Given load Camel K integration aws-s3-to-log-secret-based.groovy
+ Given load Camel K integration aws-s3-to-log-secret-based.yaml
Then Camel K integration aws-s3-to-log-secret-based should be running
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-uri-conf.feature b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-uri-conf.feature
index fa7bf156..3cc8ec4d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-uri-conf.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-source-uri-conf.feature
@@ -17,7 +17,7 @@ Feature: AWS S3 Source - URI based config
Given New Camel context
Given load to Camel registry amazonS3Client.groovy
# Create binding
- Given load Camel K integration aws-s3-to-log-uri-based.groovy
+ Given load Camel K integration aws-s3-to-log-uri-based.yaml
Then Camel K integration aws-s3-to-log-uri-based should be running
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.yaml
index 5135f448..a7cbf691 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.yaml
@@ -32,10 +32,10 @@ spec:
bucketNameOrArn: ${aws.s3.bucketNameOrArn}
overrideEndpoint: true
forcePathStyle: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
steps:
- ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-broker.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-broker.yaml
index 7ecacdfb..c1522c92 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-broker.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-broker.yaml
@@ -29,10 +29,10 @@ spec:
bucketNameOrArn: ${aws.s3.bucketNameOrArn}
overrideEndpoint: true
forcePathStyle: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
steps:
- ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-channel.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-channel.yaml
index 2e62ad46..4d6bb3d7 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-channel.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-channel.yaml
@@ -29,10 +29,10 @@ spec:
bucketNameOrArn: ${aws.s3.bucketNameOrArn}
overrideEndpoint: true
forcePathStyle: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
steps:
- ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.groovy
deleted file mode 100644
index f82c9cbd..00000000
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.groovy
+++ /dev/null
@@ -1,24 +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.
- */
-
-package aws.s3
-
-
-// camel-k: language=groovy
-
-from("kamelet:aws-s3-source/aws-s3-credentials")
- .to("log:info")
diff --git a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.yaml
similarity index 68%
copy from tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
copy to tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.yaml
index 6661b959..2522cf60 100644
--- a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.yaml
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+# ---------------------------------------------------------------------------
# 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.
@@ -7,13 +6,18 @@
# (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
+# 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.
+# ---------------------------------------------------------------------------
-# delete secret
-oc delete secret salesforce-credentials -n ${YAKS_NAMESPACE}
+- route:
+ from:
+ uri: "kamelet:aws-s3-source/aws-s3-credentials"
+ steps:
+ - to:
+ uri: "log:info"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.groovy
deleted file mode 100644
index 41fbcdd9..00000000
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.groovy
+++ /dev/null
@@ -1,33 +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.
- */
-
-package aws.s3
-
-
-// camel-k: language=groovy
-
-def parameters = 'bucketNameOrArn=${aws.s3.bucketNameOrArn}&'+
- 'overrideEndpoint=true&' +
- 'forcePathStyle=true&' +
- 'uriEndpointOverride=${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}&' +
- 'accessKey=${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}&' +
- 'secretKey=${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}&'+
- 'region=${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}&'+
- 'deleteAfterRead=true'
-
-from("kamelet:aws-s3-source?$parameters")
- .to("log:info")
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.yaml
similarity index 67%
copy from tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
copy to tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.yaml
index f90ce0ad..0d448753 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.yaml
@@ -15,23 +15,18 @@
# 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: ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
- user: ${user}
- password: ${password}
- topic: ${topic}
- securityProtocol: ${securityProtocol}
- deserializeHeaders: ${deserializeHeaders}
- sink:
- uri: yaks:resolveURL('test-service')/result
-
+- route:
+ from:
+ uri: "kamelet:aws-s3-source"
+ parameters:
+ bucketNameOrArn: '${aws.s3.bucketNameOrArn}'
+ overrideEndpoint: 'true'
+ forcePathStyle: 'true'
+ uriEndpointOverride: '${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}'
+ accessKey: '${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}'
+ secretKey: '${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}'
+ region: '${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}'
+ deleteAfterRead: 'true'
+ steps:
+ - to:
+ uri: "log:info"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.yaml
index 4638a908..4fc2b390 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.yaml
@@ -29,10 +29,10 @@ spec:
bucketNameOrArn: ${aws.s3.bucketNameOrArn}
overrideEndpoint: true
forcePathStyle: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_S3_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
sink:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/waitForLocalStack.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/s3/waitForLocalStack.groovy
index 870923c2..358a50f8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/waitForLocalStack.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/waitForLocalStack.groovy
@@ -17,4 +17,4 @@
package aws.ddb
-$(waitFor().seconds(15.0).http().url("${YAKS_TESTCONTAINERS_LOCALSTACK_S3_LOCAL_URL}"))
+$(waitFor().seconds(15.0).http().url("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/yaks-config.yaml
index a2d55d91..8080a7d6 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/yaks-config.yaml
@@ -22,27 +22,27 @@ config:
testcontainers:
enabled: true
env:
- - name: YAKS_CAMEL_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMEL_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KAMELETS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KAMELETS_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KNATIVE_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KNATIVE_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
resources:
- amazonS3Client.groovy
- aws-s3-credentials.properties
- - aws-s3-to-log-uri-based.groovy
- - aws-s3-to-log-secret-based.groovy
+ - aws-s3-to-log-uri-based.yaml
+ - aws-s3-to-log-secret-based.yaml
- aws-s3-uri-pipe.yaml
- aws-s3-to-http.yaml
- aws-s3-to-knative-channel.yaml
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/amazonSQSClient.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/amazonSQSClient.groovy
index 3939d775..9df1eaef 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/amazonSQSClient.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/amazonSQSClient.groovy
@@ -24,13 +24,13 @@ import software.amazon.awssdk.services.sqs.SqsClient
SqsClient sqsClient = SqsClient
.builder()
- .endpointOverride(URI.create("${YAKS_TESTCONTAINERS_LOCALSTACK_SQS_LOCAL_URL}"))
+ .endpointOverride(URI.create("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
.credentialsProvider(StaticCredentialsProvider.create(
AwsBasicCredentials.create(
- "${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
- "${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
+ "${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}")
))
- .region(Region.of("${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}"))
+ .region(Region.of("${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}"))
.build()
sqsClient.createQueue(s -> s.queueName("${aws.sqs.queueName}"))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-credentials.properties b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-credentials.properties
index 5e69dd70..86ac2b0d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-credentials.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-credentials.properties
@@ -1,8 +1,8 @@
# Please add your AWS SQS account credentials
camel.kamelet.aws-sqs-source.aws-sqs-credentials.queueNameOrArn=${aws.sqs.queueName}
camel.kamelet.aws-sqs-source.aws-sqs-credentials.overrideEndpoint=true
-camel.kamelet.aws-sqs-source.aws-sqs-credentials.uriEndpointOverride=${YAKS_TESTCONTAINERS_LOCALSTACK_SQS_URL}
-camel.kamelet.aws-sqs-source.aws-sqs-credentials.secretKey=${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
-camel.kamelet.aws-sqs-source.aws-sqs-credentials.accessKey=${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
-camel.kamelet.aws-sqs-source.aws-sqs-credentials.region=${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+camel.kamelet.aws-sqs-source.aws-sqs-credentials.uriEndpointOverride=${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+camel.kamelet.aws-sqs-source.aws-sqs-credentials.secretKey=${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+camel.kamelet.aws-sqs-source.aws-sqs-credentials.accessKey=${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+camel.kamelet.aws-sqs-source.aws-sqs-credentials.region=${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
camel.kamelet.aws-sqs-source.aws-sqs-credentials.deleteAfterRead=true
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-property-conf.feature b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-property-conf.feature
index 1350e096..6da7b18c 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-property-conf.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-property-conf.feature
@@ -15,10 +15,14 @@ Feature: AWS SQS Kamelet - property based config
Given load to Camel registry amazonSQSClient.groovy
# Create binding
Given Camel K integration property file aws-sqs-credentials.properties
- Given create Camel K integration aws-sqs-to-log-prop-based.groovy
+ Given create Camel K integration aws-sqs-to-log-prop-based.yaml
"""
- from("kamelet:aws-sqs-source/aws-sqs-credentials")
- .to("log:info")
+ - route:
+ from:
+ uri: "kamelet:aws-sqs-source/aws-sqs-credentials"
+ steps:
+ - to:
+ uri: "log:info"
"""
Then Camel K integration aws-sqs-to-log-prop-based should be running
# Verify Kamelet source
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-secret-conf.feature b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-secret-conf.feature
index 0682b836..d0236d25 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-secret-conf.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-secret-conf.feature
@@ -21,7 +21,7 @@ Feature: AWS SQS Kamelet - secret based config
# Create AWS-SQS client
Given load to Camel registry amazonSQSClient.groovy
# Create binding
- Given load Camel K integration aws-sqs-to-log-secret-based.groovy
+ Given load Camel K integration aws-sqs-to-log-secret-based.yaml
Then Camel K integration aws-sqs-to-log-secret-based should be running
# Verify Kamelet source
Given variable aws.sqs.message is "Hello from SQS Kamelet"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-uri-conf.feature b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-uri-conf.feature
index 6706b317..b904023b 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-uri-conf.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-source-uri-conf.feature
@@ -14,7 +14,7 @@ Feature: AWS SQS Kamelet - URI based config
# Create AWS-SQS client
Given load to Camel registry amazonSQSClient.groovy
# Create binding
- Given load Camel K integration aws-sqs-to-log-uri-based.groovy
+ Given load Camel K integration aws-sqs-to-log-uri-based.yaml
Then Camel K integration aws-sqs-to-log-uri-based should be running
# Verify Kamelet source
Given variable aws.sqs.message is "Hello from SQS Kamelet"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-knative-channel.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-knative-channel.yaml
index 3e9582e9..1726cd65 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-knative-channel.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-knative-channel.yaml
@@ -28,10 +28,10 @@ spec:
properties:
queueNameOrArn: ${aws.sqs.queueName}
overrideEndpoint: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_SQS_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
steps:
- ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-secret-based.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-secret-based.groovy
deleted file mode 100644
index 5431eca0..00000000
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-secret-based.groovy
+++ /dev/null
@@ -1,24 +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.
- */
-
-package aws.sqs
-
-
-// camel-k: language=groovy
-
-from("kamelet:aws-sqs-source/aws-sqs-credentials")
- .to("log:info")
diff --git a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-secret-based.yaml
similarity index 68%
copy from tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
copy to tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-secret-based.yaml
index 6661b959..f8bc6a71 100644
--- a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-secret-based.yaml
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+# ---------------------------------------------------------------------------
# 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.
@@ -7,13 +6,18 @@
# (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
+# 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.
+# ---------------------------------------------------------------------------
-# delete secret
-oc delete secret salesforce-credentials -n ${YAKS_NAMESPACE}
+- route:
+ from:
+ uri: "kamelet:aws-sqs-source/aws-sqs-credentials"
+ steps:
+ - to:
+ uri: "log:info"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.groovy
deleted file mode 100644
index f38e4074..00000000
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.groovy
+++ /dev/null
@@ -1,32 +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.
- */
-
-package aws.sqs
-
-
-// camel-k: language=groovy
-
-def parameters = 'queueNameOrArn=${aws.sqs.queueName}&'+
- 'overrideEndpoint=true&' +
- 'uriEndpointOverride=${YAKS_TESTCONTAINERS_LOCALSTACK_SQS_URL}&' +
- 'accessKey=${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}&' +
- 'secretKey=${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}&'+
- 'region=${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}&'+
- 'deleteAfterRead=true'
-
-from("kamelet:aws-sqs-source?$parameters")
- .to("log:info")
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.yaml
similarity index 67%
copy from tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
copy to tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.yaml
index f90ce0ad..329604b3 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.yaml
@@ -15,23 +15,18 @@
# 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: ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
- user: ${user}
- password: ${password}
- topic: ${topic}
- securityProtocol: ${securityProtocol}
- deserializeHeaders: ${deserializeHeaders}
- sink:
- uri: yaks:resolveURL('test-service')/result
-
+- route:
+ from:
+ uri: "kamelet:aws-sqs-source"
+ parameters:
+ queueNameOrArn: '${aws.sqs.queueName}'
+ overrideEndpoint: 'true'
+ forcePathStyle: 'true'
+ uriEndpointOverride: '${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}'
+ accessKey: '${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}'
+ secretKey: '${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}'
+ region: '${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}'
+ deleteAfterRead: 'true'
+ steps:
+ - to:
+ uri: "log:info"
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.yaml
index 867dc1d7..b190f45a 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.yaml
@@ -28,10 +28,10 @@ spec:
properties:
queueNameOrArn: ${aws.sqs.queueName}
overrideEndpoint: true
- uriEndpointOverride: ${YAKS_TESTCONTAINERS_LOCALSTACK_SQS_URL}
- accessKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
- secretKey: ${YAKS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
- region: ${YAKS_TESTCONTAINERS_LOCALSTACK_REGION}
+ uriEndpointOverride: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}
+ accessKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}
+ secretKey: ${CITRUS_TESTCONTAINERS_LOCALSTACK_SECRET_KEY}
+ region: ${CITRUS_TESTCONTAINERS_LOCALSTACK_REGION}
sink:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/waitForLocalStack.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/waitForLocalStack.groovy
index c3a828a1..358a50f8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/waitForLocalStack.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/waitForLocalStack.groovy
@@ -17,4 +17,4 @@
package aws.ddb
-$(waitFor().seconds(15.0).http().url("${YAKS_TESTCONTAINERS_LOCALSTACK_SQS_LOCAL_URL}"))
+$(waitFor().seconds(15.0).http().url("${CITRUS_TESTCONTAINERS_LOCALSTACK_SERVICE_URL}"))
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/yaks-config.yaml
index bdf4d8ba..6f5bfc65 100644
--- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/yaks-config.yaml
@@ -22,26 +22,26 @@ config:
testcontainers:
enabled: true
env:
- - name: YAKS_CAMEL_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMEL_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KAMELETS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KAMELETS_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KNATIVE_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KNATIVE_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
resources:
- amazonSQSClient.groovy
- - aws-sqs-to-log-uri-based.groovy
- - aws-sqs-to-log-secret-based.groovy
+ - aws-sqs-to-log-uri-based.yaml
+ - aws-sqs-to-log-secret-based.yaml
- aws-sqs-credentials.properties
- aws-sqs-uri-pipe.yaml
- aws-sqs-to-knative-channel.yaml
diff --git a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties b/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
index dbc1b3c8..a4496b0c 100644
--- a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
@@ -5,17 +5,18 @@ citrus.file.encoding=UTF-8
citrus.default.message.type=JSON
citrus.type.converter=camel
-yaks.cluster.type=local
-yaks.camelk.max.attempts=10
+citrus.cluster.type=local
+citrus.camelk.max.attempts=10
+citrus.camel.jbang.max.attempts=10
-yaks.jbang.camel.version=4.8.0
-yaks.jbang.kamelets.version=4.9.0-SNAPSHOT
+citrus.jbang.camel.version=4.9.0
+citrus.jbang.kamelets.version=4.10.0-SNAPSHOT
-yaks.jbang.kamelets.local.dir=../../../kamelets
-yaks.jbang.camel.dump.integration.output=true
+citrus.jbang.kamelets.local.dir=../../../kamelets
+citrus.jbang.camel.dump.integration.output=true
-yaks.kubernetes.auto.remove.resources=false
-yaks.knative.auto.remove.resources=false
-yaks.camelk.auto.remove.resources=false
-yaks.kamelets.auto.remove.resources=false
-yaks.testcontainers.auto.remove.resources=false
+citrus.kubernetes.auto.remove.resources=false
+citrus.knative.auto.remove.resources=false
+citrus.camelk.auto.remove.resources=false
+citrus.kamelets.auto.remove.resources=false
+citrus.testcontainers.auto.remove.resources=false
diff --git a/tests/camel-kamelets-itest/src/test/resources/earthquake/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/earthquake/yaks-config.yaml
index d54cb7ac..5f2af0e3 100644
--- a/tests/camel-kamelets-itest/src/test/resources/earthquake/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/earthquake/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers:
diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/README.md b/tests/camel-kamelets-itest/src/test/resources/jira/README.md
index 9d1801d4..6185e084 100644
--- a/tests/camel-kamelets-itest/src/test/resources/jira/README.md
+++ b/tests/camel-kamelets-itest/src/test/resources/jira/README.md
@@ -40,6 +40,6 @@ $ yaks run --local src/test/resources/jira/jira-source.feature
$ yaks run --local src/test/resources/jira/jira-add-issue-sink.feature
```
-You can increase number of attempts to run the test by adding: "-e YAKS_CAMELK_MAX_ATTEMPTS=1000"
+You can increase number of attempts to run the test by adding: "-e CITRUS_CAMELK_MAX_ATTEMPTS=1000"
You will be provided with the test log output and the test results.
diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/jira/yaks-config.yaml
index 4db76ca6..96ff6707 100644
--- a/tests/camel-kamelets-itest/src/test/resources/jira/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/jira/yaks-config.yaml
@@ -20,19 +20,19 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMEL_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMEL_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KAMELETS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KAMELETS_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KNATIVE_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KNATIVE_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/install.sh b/tests/camel-kamelets-itest/src/test/resources/kafka/install.sh
index 18e2ea84..46253ef6 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/install.sh
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/install.sh
@@ -16,13 +16,13 @@
# limitations under the License.
# Install Kafka
-kubectl create -f https://strimzi.io/install/latest?namespace=$YAKS_NAMESPACE
+kubectl create -f https://strimzi.io/install/latest?namespace=$CITRUS_NAMESPACE
# Apply the `Kafka` Cluster CR file
-kubectl apply -f https://strimzi.io/examples/latest/kafka/kafka-ephemeral-single.yaml -n $YAKS_NAMESPACE
+kubectl apply -f https://strimzi.io/examples/latest/kafka/kafka-ephemeral-single.yaml -n $CITRUS_NAMESPACE
# wait for everything to start
-kubectl wait kafka/my-cluster --for=condition=Ready --timeout=300s -n $YAKS_NAMESPACE
+kubectl wait kafka/my-cluster --for=condition=Ready --timeout=300s -n $CITRUS_NAMESPACE
# create default topic
-kubectl apply -f https://strimzi.io/examples/latest/topic/kafka-topic.yaml -n $YAKS_NAMESPACE
+kubectl apply -f https://strimzi.io/examples/latest/topic/kafka-topic.yaml -n $CITRUS_NAMESPACE
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
index 32a98c4c..df639eb1 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
@@ -35,7 +35,7 @@ spec:
apiVersion: camel.apache.org/v1
name: kafka-sink
properties:
- bootstrapServers: ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
+ bootstrapServers: ${CITRUS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
user: ${user}
password: ${password}
topic: ${topic}
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink.feature b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink.feature
index bb0477cd..153f6736 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink.feature
@@ -36,7 +36,7 @@ Feature: Kafka Kamelet sink
Scenario: Verify Kafka sink output
Given Kafka connection
- | url | ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS} |
+ | url | ${CITRUS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS} |
Then receive Kafka message with body: ${message}
Scenario: Remove resources
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-source-pipe.yaml
index f90ce0ad..45af26c5 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
@@ -26,7 +26,7 @@ spec:
apiVersion: camel.apache.org/v1
name: kafka-source
properties:
- bootstrapServers: ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
+ bootstrapServers: ${CITRUS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
user: ${user}
password: ${password}
topic: ${topic}
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source.feature b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source.feature
index ee297b5a..bc3bbec7 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source.feature
@@ -45,7 +45,7 @@ Feature: Kafka Kamelet source
Scenario: Send message to Kafka topic and verify sink output
Given variable key is "citrus:randomNumber(4)"
Given Kafka connection
- | url | ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS} |
+ | url | ${CITRUS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS} |
Given Kafka message key: ${key}
When send Kafka message with body and headers: ${message}
| event-source | ${source} |
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router-pipe.yaml
index c47dde10..977a378e 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router-pipe.yaml
@@ -53,7 +53,7 @@ spec:
apiVersion: camel.apache.org/v1
name: kafka-sink
properties:
- bootstrapServers: ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
+ bootstrapServers: ${CITRUS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS}
user: ${user}
password: ${password}
topic: dummy
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router.feature b/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router.feature
index 76c43a49..e96d521b 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/timestamp-router.feature
@@ -39,7 +39,7 @@ Feature: Kafka Timestamp Router
Scenario: Receive message on Kafka topic and verify sink output
Given new Kafka connection
- | url | ${YAKS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS} |
+ | url | ${CITRUS_TESTCONTAINERS_REDPANDA_LOCAL_BOOTSTRAP_SERVERS} |
| consumerGroup | consumer-1 |
Given URL: yaks:resolveURL('timestamp-router-pipe',8080)
Given HTTP request query parameter kafka.TOPIC="${topicName}"
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/uninstall.sh b/tests/camel-kamelets-itest/src/test/resources/kafka/uninstall.sh
index dd02da55..79dfde00 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/uninstall.sh
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/uninstall.sh
@@ -16,7 +16,7 @@
# limitations under the License.
# delete Kafka cluster
-kubectl delete kafka/my-cluster -n $YAKS_NAMESPACE
+kubectl delete kafka/my-cluster -n $CITRUS_NAMESPACE
# delete default topic
-kubectl delete kafkatopic/my-topic -n $YAKS_NAMESPACE
+kubectl delete kafkatopic/my-topic -n $CITRUS_NAMESPACE
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/yaks-config.yaml
index df55ae63..63790ebb 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/yaks-config.yaml
@@ -20,13 +20,13 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
diff --git a/tests/camel-kamelets-itest/src/test/resources/mail/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/mail/yaks-config.yaml
index ddf676ee..b991c6fa 100644
--- a/tests/camel-kamelets-itest/src/test/resources/mail/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/mail/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers:
diff --git a/tests/camel-kamelets-itest/src/test/resources/openapi/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/openapi/yaks-config.yaml
index f819b5b4..05b05fd5 100644
--- a/tests/camel-kamelets-itest/src/test/resources/openapi/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/openapi/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers:
diff --git a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-binary-source-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-binary-source-pipe.yaml
index 36a3896e..625171ca 100644
--- a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-binary-source-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-binary-source-pipe.yaml
@@ -20,9 +20,6 @@ kind: Pipe
metadata:
name: protobuf-binary-source-pipe
spec:
- integration:
- dependencies:
- - "camel:jackson-protobuf"
source:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-x-struct-sink-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-x-struct-sink-pipe.yaml
index 5fb05bd9..50234e5d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-x-struct-sink-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-x-struct-sink-pipe.yaml
@@ -20,9 +20,6 @@ kind: Pipe
metadata:
name: protobuf-x-struct-sink-pipe
spec:
- integration:
- dependencies:
- - "camel:jackson-protobuf"
source:
ref:
kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/protobuf/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/protobuf/yaks-config.yaml
index 186bb32a..ef7832c8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/protobuf/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/protobuf/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers:
diff --git a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh b/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
index 6661b959..8ed16e66 100644
--- a/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
+++ b/tests/camel-kamelets-itest/src/test/resources/salesforce/delete-secret.sh
@@ -16,4 +16,4 @@
# limitations under the License.
# delete secret
-oc delete secret salesforce-credentials -n ${YAKS_NAMESPACE}
+oc delete secret salesforce-credentials -n ${CITRUS_NAMESPACE}
diff --git a/tests/camel-kamelets-itest/src/test/resources/salesforce/prepare-secret.sh b/tests/camel-kamelets-itest/src/test/resources/salesforce/prepare-secret.sh
index 88ebcc30..399faef6 100755
--- a/tests/camel-kamelets-itest/src/test/resources/salesforce/prepare-secret.sh
+++ b/tests/camel-kamelets-itest/src/test/resources/salesforce/prepare-secret.sh
@@ -16,6 +16,6 @@
# limitations under the License.
# create secret from properties file
-oc create secret generic salesforce-credentials --from-file=salesforce-credentials.properties -n ${YAKS_NAMESPACE}
+oc create secret generic salesforce-credentials --from-file=salesforce-credentials.properties -n ${CITRUS_NAMESPACE}
# bind secret to test by name
-oc label secret salesforce-credentials yaks.citrusframework.org/test=salesforce-sink -n ${YAKS_NAMESPACE}
+oc label secret salesforce-credentials yaks.citrusframework.org/test=salesforce-sink -n ${CITRUS_NAMESPACE}
diff --git a/tests/camel-kamelets-itest/src/test/resources/salesforce/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/salesforce/yaks-config.yaml
index 97e0dea1..35558c19 100644
--- a/tests/camel-kamelets-itest/src/test/resources/salesforce/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/salesforce/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
cucumber:
tags:
diff --git a/tests/camel-kamelets-itest/src/test/resources/slack/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/slack/yaks-config.yaml
index faf6d19c..597566a5 100644
--- a/tests/camel-kamelets-itest/src/test/resources/slack/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/slack/yaks-config.yaml
@@ -20,19 +20,19 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMEL_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMEL_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KAMELETS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KAMELETS_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KNATIVE_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KNATIVE_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
- - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES
value: false
- name: CITRUS_TYPE_CONVERTER
value: camel
diff --git a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.feature b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.feature
index ffb1b745..c214672d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.feature
@@ -14,7 +14,7 @@ Feature: Verify Camel K integrations
# Run Camel K integration
Given Camel K integration property file timer-to-http.properties
- When load Camel K integration timer-to-http.groovy
+ When load Camel K integration timer-to-http.yaml
Then Camel K integration timer-to-http should be running
# Verify Http request and send response
diff --git a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.groovy b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.groovy
deleted file mode 100644
index b14b4936..00000000
--- a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.groovy
+++ /dev/null
@@ -1,26 +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.
- */
-
-package timer
-
-// camel-k: language=groovy
-
-from('timer:tick?period=10000')
- .setHeader("CamelHttpMethod", constant("PUT"))
- .setBody().constant('{{message}}')
- .to('yaks:resolveURL(test-service)/messages')
- .to('log:info?showStreams=true')
diff --git a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.yaml b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.yaml
new file mode 100644
index 00000000..ea3276df
--- /dev/null
+++ b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.yaml
@@ -0,0 +1,19 @@
+- route:
+ from:
+ uri: 'timer:tick'
+ parameters:
+ period: 10000
+ steps:
+ - setHeader:
+ name: "CamelHttpMethod"
+ expression:
+ constant: "PUT"
+ - setBody:
+ expression:
+ constant: '{{message}}'
+ - to:
+ uri: 'yaks:resolveURL(test-service)/messages'
+ - to:
+ uri: 'log:info'
+ parameters:
+ showStreams: true
diff --git a/tests/camel-kamelets-itest/src/test/resources/timer/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/timer/yaks-config.yaml
index 9ee419af..6e68916d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/timer/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/timer/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers:
@@ -34,7 +34,7 @@ config:
level: INFO
resources:
- timer-to-http-pipe.yaml
- - timer-to-http.groovy
+ - timer-to-http.yaml
- timer-to-http.properties
dump:
enabled: true
diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/yaks-config.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/yaks-config.yaml
index 1f86f2eb..3b2ee81d 100644
--- a/tests/camel-kamelets-itest/src/test/resources/transformation/yaks-config.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/transformation/yaks-config.yaml
@@ -20,11 +20,11 @@ config:
temporary: false
runtime:
env:
- - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_CAMELK_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES
+ - name: CITRUS_KUBERNETES_AUTO_REMOVE_RESOURCES
value: false
- - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
+ - name: CITRUS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
settings:
loggers: