This is an automated email from the ASF dual-hosted git repository.
acosentino 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 99962a62 chore: Fix YAKS tests for Camel 4.5.0 (#1986)
99962a62 is described below
commit 99962a62fc43ee3fc8b43189d5bb90b34df60ac6
Author: Christoph Deppisch <[email protected]>
AuthorDate: Sat Apr 6 08:23:51 2024 +0200
chore: Fix YAKS tests for Camel 4.5.0 (#1986)
- Update Apache Camel runtime to 4.5.0
- Use Citrus 4.2.0
- Update YAKS 0.19.0
---
pom.xml | 4 ++--
tests/camel-kamelets-itest/pom.xml | 17 +++++++----------
.../src/test/resources/{ => avro}/User.avsc | 0
.../resources/{ => avro}/avro-binary-source-pipe.yaml | 0
.../resources/{ => avro}/avro-deserialize-pipe.yaml | 0
.../test/resources/{ => avro}/avro-serialize-pipe.yaml | 0
.../resources/{ => avro}/avro-x-struct-sink-pipe.yaml | 0
.../src/test/resources/avro/yaks-config.yaml | 10 +++++-----
.../resources/{ => aws/ddb}/amazonDDBClient.groovy | 1 +
.../resources/{ => aws/ddb}/aws-ddb-sink-pipe.yaml | 0
.../src/test/resources/{ => aws/ddb}/putItem.groovy | 2 ++
.../test/resources/{ => aws/ddb}/verifyItems.groovy | 2 ++
.../src/test/resources/aws/ddb/yaks-config.yaml | 8 ++++----
.../test/resources/{ => aws/s3}/amazonS3Client.groovy | 1 +
.../{ => aws/s3}/aws-s3-credentials.properties | 0
...aws-s3-to-http.feature => aws-s3-http-pipe.feature} | 12 ++++++------
.../resources/aws/s3/aws-s3-knative-broker.feature | 6 +++---
.../resources/aws/s3/aws-s3-knative-channel.feature | 6 +++---
.../aws/s3/aws-s3-knative-cloudevents.feature | 6 +++---
.../aws/s3/aws-s3-source-property-conf.feature | 6 +++---
.../resources/aws/s3/aws-s3-source-secret-conf.feature | 6 +++---
.../resources/aws/s3/aws-s3-source-uri-conf.feature | 6 +++---
.../test/resources/{ => aws/s3}/aws-s3-to-http.yaml | 0
.../{ => aws/s3}/aws-s3-to-knative-broker.yaml | 0
.../{ => aws/s3}/aws-s3-to-knative-channel.yaml | 0
.../{ => aws/s3}/aws-s3-to-log-secret-based.groovy | 1 +
.../{ => aws/s3}/aws-s3-to-log-uri-based.groovy | 1 +
.../src/test/resources/aws/s3/aws-s3-uri-pipe.feature | 6 +++---
.../test/resources/{ => aws/s3}/aws-s3-uri-pipe.yaml | 0
.../resources/{ => aws/s3}/knative-channel-to-log.yaml | 0
.../test/resources/{ => aws/s3}/knative-to-log.yaml | 0
.../src/test/resources/aws/s3/yaks-config.yaml | 18 +++++++++---------
.../src/test/resources/citrus-application.properties | 4 ++--
.../resources/{ => earthquake}/earthquake-to-http.yaml | 0
.../test/resources/{ => kafka}/kafka-sink-pipe.yaml | 0
.../test/resources/{ => kafka}/kafka-source-pipe.yaml | 0
.../src/test/resources/kafka/yaks-config.yaml | 4 ++--
.../src/test/resources/{ => mail}/mail-server.groovy | 2 ++
.../src/test/resources/mail/mail-sink.feature | 4 ++--
.../src/test/resources/{ => mail}/timer-to-mail.yaml | 0
.../src/test/resources/mail/yaks-config.yaml | 4 ++--
.../src/test/resources/{ => openapi}/openapi.json | 0
.../src/test/resources/{ => openapi}/pet.json | 0
.../{ => openapi}/rest-openapi-sink-pipe.yaml | 0
.../src/test/resources/openapi/yaks-config.yaml | 6 +++---
.../direct-to-salesforce-delete-pipe.yaml | 0
.../direct-to-salesforce-update-pipe.yaml | 0
.../{ => salesforce}/salesforce-credentials.properties | 0
.../{ => salesforce}/timer-to-salesforce-pipe.yaml | 0
.../src/test/resources/salesforce/yaks-config.yaml | 8 ++++----
.../test/resources/{ => timer}/timer-to-http-pipe.yaml | 0
.../test/resources/{ => timer}/timer-to-http.groovy | 3 ++-
.../resources/{ => timer}/timer-to-http.properties | 0
.../src/test/resources/timer/yaks-config.yaml | 6 +++---
.../{ => transformation}/data-type-action-pipe.yaml | 0
.../extract-field-action-pipe.yaml | 0
.../{ => transformation}/insert-field-action-pipe.yaml | 0
.../src/test/resources/transformation/yaks-config.yaml | 6 +++---
58 files changed, 87 insertions(+), 79 deletions(-)
diff --git a/pom.xml b/pom.xml
index ae804c75..28c3da51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,9 +65,9 @@
<camel.version>4.5.0</camel.version>
<camel.k.crds.version>2.2.0</camel.k.crds.version>
- <citrus.version>4.1.0</citrus.version>
+ <citrus.version>4.2.0</citrus.version>
<cucumber.version>7.16.1</cucumber.version>
- <yaks.version>0.17.1</yaks.version>
+ <yaks.version>0.19.0</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/pom.xml
b/tests/camel-kamelets-itest/pom.xml
index 8936902e..b80a77dd 100644
--- a/tests/camel-kamelets-itest/pom.xml
+++ b/tests/camel-kamelets-itest/pom.xml
@@ -46,6 +46,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.citrusframework.yaks</groupId>
+ <artifactId>yaks-bom</artifactId>
+ <version>${yaks.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -126,61 +133,51 @@
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-standard</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-http</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-kubernetes</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-knative</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-kafka</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-groovy</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-camel</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-camel-k</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-testcontainers</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework.yaks</groupId>
<artifactId>yaks-jdbc</artifactId>
- <version>${yaks.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tests/camel-kamelets-itest/src/test/resources/User.avsc
b/tests/camel-kamelets-itest/src/test/resources/avro/User.avsc
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/User.avsc
rename to tests/camel-kamelets-itest/src/test/resources/avro/User.avsc
diff --git
a/tests/camel-kamelets-itest/src/test/resources/avro-binary-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/avro/avro-binary-source-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/avro-binary-source-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/avro/avro-binary-source-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/avro-deserialize-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/avro/avro-deserialize-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/avro-deserialize-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/avro/avro-deserialize-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/avro-serialize-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/avro/avro-serialize-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/avro-serialize-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/avro/avro-serialize-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/avro-x-struct-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/avro/avro-x-struct-sink-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/avro-x-struct-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/avro/avro-x-struct-sink-pipe.yaml
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 941e0014..38c11c7f 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
@@ -33,11 +33,11 @@ config:
- name: INTEGRATION_LOGS
level: INFO
resources:
- - ../avro-serialize-pipe.yaml
- - ../avro-deserialize-pipe.yaml
- - ../avro-binary-source-pipe.yaml
- - ../avro-x-struct-sink-pipe.yaml
- - ../User.avsc
+ - avro-serialize-pipe.yaml
+ - avro-deserialize-pipe.yaml
+ - avro-binary-source-pipe.yaml
+ - avro-x-struct-sink-pipe.yaml
+ - User.avsc
dump:
enabled: true
failedOnly: true
diff --git
a/tests/camel-kamelets-itest/src/test/resources/amazonDDBClient.groovy
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy
similarity index 99%
rename from tests/camel-kamelets-itest/src/test/resources/amazonDDBClient.groovy
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy
index 2d332366..95e18b40 100644
--- a/tests/camel-kamelets-itest/src/test/resources/amazonDDBClient.groovy
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/amazonDDBClient.groovy
@@ -1,3 +1,4 @@
+package aws.ddb
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws-ddb-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-pipe.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/aws-ddb-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-pipe.yaml
diff --git a/tests/camel-kamelets-itest/src/test/resources/putItem.groovy
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/putItem.groovy
similarity index 98%
rename from tests/camel-kamelets-itest/src/test/resources/putItem.groovy
rename to tests/camel-kamelets-itest/src/test/resources/aws/ddb/putItem.groovy
index fd482f90..325a055b 100644
--- a/tests/camel-kamelets-itest/src/test/resources/putItem.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/putItem.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+package aws.ddb
+
import software.amazon.awssdk.services.dynamodb.model.AttributeValue
import software.amazon.awssdk.services.dynamodb.model.ReturnValue
diff --git a/tests/camel-kamelets-itest/src/test/resources/verifyItems.groovy
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/verifyItems.groovy
similarity index 98%
rename from tests/camel-kamelets-itest/src/test/resources/verifyItems.groovy
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/verifyItems.groovy
index cfed3949..9484339f 100644
--- a/tests/camel-kamelets-itest/src/test/resources/verifyItems.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/verifyItems.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+package aws.ddb
+
$(repeatOnError()
.until('i > ${maxRetryAttempts}')
.actions(new org.citrusframework.TestAction() {
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 1e1a0014..dbd40ded 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
@@ -35,10 +35,10 @@ config:
- name: CITRUS_TYPE_CONVERTER
value: camel
resources:
- - ../../putItem.groovy
- - ../../verifyItems.groovy
- - ../../amazonDDBClient.groovy
- - ../../aws-ddb-sink-pipe.yaml
+ - putItem.groovy
+ - verifyItems.groovy
+ - amazonDDBClient.groovy
+ - aws-ddb-sink-pipe.yaml
cucumber:
tags:
- "not @ignored"
diff --git
a/tests/camel-kamelets-itest/src/test/resources/amazonS3Client.groovy
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy
similarity index 99%
rename from tests/camel-kamelets-itest/src/test/resources/amazonS3Client.groovy
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy
index 5a8c5f0d..64299883 100644
--- a/tests/camel-kamelets-itest/src/test/resources/amazonS3Client.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/amazonS3Client.groovy
@@ -1,3 +1,4 @@
+package aws.s3
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-credentials.properties
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-credentials.properties
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws-s3-credentials.properties
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-credentials.properties
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.feature
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-http-pipe.feature
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.feature
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-http-pipe.feature
index f040b30e..c938cb37 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.feature
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-http-pipe.feature
@@ -10,22 +10,22 @@ Feature: AWS S3 Source - Http sink
| aws.s3.key | hello.txt |
Scenario: Create infrastructure
- # Create Http server
- Given create Kubernetes service test-service
- Given purge endpoint test-service
# Start LocalStack container
Given Enable service S3
Given start LocalStack container
Scenario: Verify AWS-S3 Kamelet to Http
+ # Create Http server
+ Given create Kubernetes service test-service
+ Given purge endpoint test-service
+ # Create AWS-S3 client
+ Given New Camel context
+ Given load to Camel registry amazonS3Client.groovy
# Create binding
When load Pipe aws-s3-to-http.yaml
And Pipe aws-s3-to-http is available
And Camel K integration aws-s3-to-http is running
Then Camel K integration aws-s3-to-http should print (aws-s3-to-http)
started
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
Given send Camel exchange
to("aws2-s3://${aws.s3.bucketNameOrArn}?amazonS3Client=#amazonS3Client") with
body: ${aws.s3.message}
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-broker.feature
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-broker.feature
index 9282a218..252e63a0 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-broker.feature
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-broker.feature
@@ -19,14 +19,14 @@ Feature: AWS S3 Source - Knative broker binding
And Knative broker default is running
Scenario: Verify AWS-S3 Kamelet to Knative binding
+ # Create AWS-S3 client
+ Given New Camel context
+ Given load to Camel registry amazonS3Client.groovy
# Create binding
When load Pipe aws-s3-to-knative-broker.yaml
And Pipe aws-s3-to-knative-broker is available
And Camel K integration aws-s3-to-knative-broker is running
Then Camel K integration aws-s3-to-knative-broker should print Started
aws-s3-to-knative-broker
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given create Knative event consumer service event-consumer-service
Given create Knative trigger event-service-trigger on service
event-consumer-service with filter on attributes
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-channel.feature
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-channel.feature
index 87b21837..6bf82631 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-channel.feature
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-channel.feature
@@ -17,6 +17,9 @@ Feature: AWS S3 Source - binding to Knative channel
And create Knative channel messages
Scenario: Verify AWS-S3 Kamelet to InMemoryChannel binding
+ # Create AWS-S3 client
+ Given New Camel context
+ Given load to Camel registry amazonS3Client.groovy
# Create binding
Given load Pipe aws-s3-to-knative-channel.yaml
Given load Pipe knative-channel-to-log.yaml
@@ -27,9 +30,6 @@ Feature: AWS S3 Source - binding to Knative channel
And Camel K integration aws-s3-to-knative-channel should print Started
aws-s3-to-knative-channel
And Camel K integration knative-channel-to-log should print Installed
features
Then sleep 10000 ms
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
Given send Camel exchange
to("aws2-s3://${aws.s3.bucketNameOrArn}?amazonS3Client=#amazonS3Client") with
body: ${aws.s3.message}
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-cloudevents.feature
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-cloudevents.feature
index eb9cc70d..d8797b1c 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-cloudevents.feature
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-knative-cloudevents.feature
@@ -19,14 +19,14 @@ Feature: AWS S3 Source - cloud events data type
And Knative broker default is running
Scenario: Verify AWS-S3 Kamelet to Knative binding
+ # Create AWS-S3 client
+ Given New Camel context
+ Given load to Camel registry amazonS3Client.groovy
# Create binding
When load Pipe aws-s3-to-knative-broker.yaml
And Pipe aws-s3-to-knative-broker is available
And Camel K integration aws-s3-to-knative-broker is running
Then Camel K integration aws-s3-to-knative-broker should print Started
aws-s3-to-knative-broker
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given create Knative event consumer service event-consumer-service
Given create Knative trigger event-service-trigger on service
event-consumer-service with filter on attributes
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 fe29ad15..38ba178d 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
@@ -12,6 +12,9 @@ Feature: AWS S3 Source - property based config
Given start LocalStack container
Scenario: Verify AWS-S3 Kamelet to log binding
+ # Create AWS-S3 client
+ Given New Camel context
+ 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
@@ -20,9 +23,6 @@ Feature: AWS S3 Source - property based config
.to("log:info")
"""
Then Camel K integration aws-s3-to-log-prop-based should be running
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
Given send Camel exchange
to("aws2-s3://${aws.s3.bucketNameOrArn}?amazonS3Client=#amazonS3Client") with
body: ${aws.s3.message}
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 138c68e0..1f0f81fa 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
@@ -16,15 +16,15 @@ Feature: AWS S3 Source - secret based config
| aws-s3-credentials.properties |
citrus:encodeBase64(citrus:readFile(aws-s3-credentials.properties)) |
Scenario: Verify AWS-S3 Kamelet to log binding
+ # Create AWS-S3 client
+ Given New Camel context
+ Given load to Camel registry amazonS3Client.groovy
# Create binding
Given create labels on Kubernetes secret aws-s3-source-credentials
| camel.apache.org/kamelet | aws-s3-source |
| camel.apache.org/kamelet.configuration | aws-s3-credentials |
Given load Camel K integration aws-s3-to-log-secret-based.groovy
Then Camel K integration aws-s3-to-log-secret-based should be running
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
Given send Camel exchange
to("aws2-s3://${aws.s3.bucketNameOrArn}?amazonS3Client=#amazonS3Client") with
body: ${aws.s3.message}
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 4042dceb..ff202d9b 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
@@ -12,12 +12,12 @@ Feature: AWS S3 Source - URI based config
Given start LocalStack container
Scenario: Verify AWS-S3 Kamelet to log binding
- # Create binding
- Given load Camel K integration aws-s3-to-log-uri-based.groovy
- Then Camel K integration aws-s3-to-log-uri-based should be running
# Create AWS-S3 client
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
+ 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}"
Given send Camel exchange
to("aws2-s3://${aws.s3.bucketNameOrArn}?amazonS3Client=#amazonS3Client") with
body: ${aws.s3.message}
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/aws-s3-to-http.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-knative-broker.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-broker.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws-s3-to-knative-broker.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-broker.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-knative-channel.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-channel.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws-s3-to-knative-channel.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-knative-channel.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-log-secret-based.groovy
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.groovy
similarity index 98%
rename from
tests/camel-kamelets-itest/src/test/resources/aws-s3-to-log-secret-based.groovy
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.groovy
index 02fb1c58..e4a06798 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-log-secret-based.groovy
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-secret-based.groovy
@@ -1,3 +1,4 @@
+package aws.s3
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-log-uri-based.groovy
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.groovy
similarity index 98%
rename from
tests/camel-kamelets-itest/src/test/resources/aws-s3-to-log-uri-based.groovy
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.groovy
index a1163335..cd67fb74 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws-s3-to-log-uri-based.groovy
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.groovy
@@ -1,3 +1,4 @@
+package aws.s3
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.feature
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.feature
index 3be46dd7..413f2667 100644
---
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.feature
+++
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.feature
@@ -12,14 +12,14 @@ Feature: AWS S3 Source - binding to URI
Given start LocalStack container
Scenario: Verify AWS-S3 Kamelet to log binding
+ # Create AWS-S3 client
+ Given New Camel context
+ Given load to Camel registry amazonS3Client.groovy
# Create binding
When load Pipe aws-s3-uri-pipe.yaml
And Pipe aws-s3-uri-pipe is available
And Camel K integration aws-s3-uri-pipe is running
Then Camel K integration aws-s3-uri-pipe should print Started
aws-s3-uri-pipe
- # Create AWS-S3 client
- Given New Camel context
- Given load to Camel registry amazonS3Client.groovy
# Verify Kamelet source
Given Camel exchange message header CamelAwsS3Key="${aws.s3.key}"
Given send Camel exchange
to("aws2-s3://${aws.s3.bucketNameOrArn}?amazonS3Client=#amazonS3Client") with
body: ${aws.s3.message}
diff --git a/tests/camel-kamelets-itest/src/test/resources/aws-s3-uri-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/aws-s3-uri-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/knative-channel-to-log.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/knative-channel-to-log.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/knative-channel-to-log.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/knative-channel-to-log.yaml
diff --git a/tests/camel-kamelets-itest/src/test/resources/knative-to-log.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/knative-to-log.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/knative-to-log.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/knative-to-log.yaml
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 2518c34e..94fe3eff 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
@@ -39,15 +39,15 @@ config:
- 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-uri-pipe.yaml
- - ../../aws-s3-to-http.yaml
- - ../../aws-s3-to-knative-channel.yaml
- - ../../aws-s3-to-knative-broker.yaml
- - ../../knative-channel-to-log.yaml
+ - amazonS3Client.groovy
+ - aws-s3-credentials.properties
+ - aws-s3-to-log-uri-based.groovy
+ - aws-s3-to-log-secret-based.groovy
+ - aws-s3-uri-pipe.yaml
+ - aws-s3-to-http.yaml
+ - aws-s3-to-knative-channel.yaml
+ - aws-s3-to-knative-broker.yaml
+ - knative-channel-to-log.yaml
cucumber:
tags:
- "not @ignored and not @knative"
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 19991c7c..5f768fab 100644
---
a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
+++
b/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
@@ -8,8 +8,8 @@ citrus.type.converter=camel
yaks.cluster.type=local
yaks.camelk.max.attempts=10
-yaks.jbang.camel.version=4.4.0-SNAPSHOT
-yaks.jbang.kamelets.version=4.4.0-SNAPSHOT
+yaks.jbang.camel.version=4.5.0
+yaks.jbang.kamelets.version=4.6.0-SNAPSHOT
yaks.jbang.kamelets.local.dir=../../../kamelets
yaks.jbang.camel.dump.integration.output=true
diff --git
a/tests/camel-kamelets-itest/src/test/resources/earthquake-to-http.yaml
b/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/earthquake-to-http.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.yaml
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/kafka-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka-source-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/kafka-source-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.yaml
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 8613dfeb..63ba6c1d 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
@@ -37,8 +37,8 @@ config:
- name: INTEGRATION_LOGS
level: INFO
resources:
- - ../kafka-source-pipe.yaml
- - ../kafka-sink-pipe.yaml
+ - kafka-source-pipe.yaml
+ - kafka-sink-pipe.yaml
dump:
enabled: true
failedOnly: true
diff --git a/tests/camel-kamelets-itest/src/test/resources/mail-server.groovy
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-server.groovy
similarity index 98%
rename from tests/camel-kamelets-itest/src/test/resources/mail-server.groovy
rename to tests/camel-kamelets-itest/src/test/resources/mail/mail-server.groovy
index 4d740cf9..f7ef8c9c 100644
--- a/tests/camel-kamelets-itest/src/test/resources/mail-server.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/mail/mail-server.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+package mail
+
System.properties['citrus.mail.marshaller.type'] = "JSON"
mail()
diff --git
a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink.feature
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink.feature
index d3ecbd17..02a0dbff 100644
--- a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink.feature
+++ b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink.feature
@@ -46,8 +46,8 @@ Feature: Mail Sink
{
"from": "${email}",
"to": "${to}",
- "cc": "",
- "bcc": "",
+ "cc": null,
+ "bcc": null,
"replyTo": "@ignore@",
"subject": "${subject}",
"body": {
diff --git a/tests/camel-kamelets-itest/src/test/resources/timer-to-mail.yaml
b/tests/camel-kamelets-itest/src/test/resources/mail/timer-to-mail.yaml
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/timer-to-mail.yaml
rename to tests/camel-kamelets-itest/src/test/resources/mail/timer-to-mail.yaml
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 84fd7dac..ddf676ee 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
@@ -37,8 +37,8 @@ config:
artifactId: citrus-mail
version: "@citrus.version@"
resources:
- - ../mail-server.groovy
- - ../timer-to-mail.yaml
+ - mail-server.groovy
+ - timer-to-mail.yaml
dump:
enabled: true
failedOnly: true
diff --git a/tests/camel-kamelets-itest/src/test/resources/openapi.json
b/tests/camel-kamelets-itest/src/test/resources/openapi/openapi.json
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/openapi.json
rename to tests/camel-kamelets-itest/src/test/resources/openapi/openapi.json
diff --git a/tests/camel-kamelets-itest/src/test/resources/pet.json
b/tests/camel-kamelets-itest/src/test/resources/openapi/pet.json
similarity index 100%
rename from tests/camel-kamelets-itest/src/test/resources/pet.json
rename to tests/camel-kamelets-itest/src/test/resources/openapi/pet.json
diff --git
a/tests/camel-kamelets-itest/src/test/resources/rest-openapi-sink-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/rest-openapi-sink-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-pipe.yaml
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 93e62d4d..f819b5b4 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
@@ -33,9 +33,9 @@ config:
- name: INTEGRATION_LOGS
level: INFO
resources:
- - ../pet.json
- - ../openapi.json
- - ../rest-openapi-sink-pipe.yaml
+ - pet.json
+ - openapi.json
+ - rest-openapi-sink-pipe.yaml
dump:
enabled: true
failedOnly: true
diff --git
a/tests/camel-kamelets-itest/src/test/resources/direct-to-salesforce-delete-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/salesforce/direct-to-salesforce-delete-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/direct-to-salesforce-delete-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/salesforce/direct-to-salesforce-delete-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/direct-to-salesforce-update-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/salesforce/direct-to-salesforce-update-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/direct-to-salesforce-update-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/salesforce/direct-to-salesforce-update-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/salesforce-credentials.properties
b/tests/camel-kamelets-itest/src/test/resources/salesforce/salesforce-credentials.properties
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/salesforce-credentials.properties
rename to
tests/camel-kamelets-itest/src/test/resources/salesforce/salesforce-credentials.properties
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer-to-salesforce-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/salesforce/timer-to-salesforce-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/timer-to-salesforce-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/salesforce/timer-to-salesforce-pipe.yaml
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 ea84f667..97e0dea1 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
@@ -37,10 +37,10 @@ config:
level: INFO
secret: salesforce-credentials
resources:
- - ../timer-to-salesforce-pipe.yaml
- - ../direct-to-salesforce-update-pipe.yaml
- - ../direct-to-salesforce-delete-pipe.yaml
- - ../salesforce-credentials.properties
+ - timer-to-salesforce-pipe.yaml
+ - direct-to-salesforce-update-pipe.yaml
+ - direct-to-salesforce-delete-pipe.yaml
+ - salesforce-credentials.properties
dump:
enabled: true
failedOnly: true
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer-to-http-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/timer-to-http-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.yaml
diff --git a/tests/camel-kamelets-itest/src/test/resources/timer-to-http.groovy
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.groovy
similarity index 98%
rename from tests/camel-kamelets-itest/src/test/resources/timer-to-http.groovy
rename to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.groovy
index e1a184d4..b14b4936 100644
--- a/tests/camel-kamelets-itest/src/test/resources/timer-to-http.groovy
+++ b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.groovy
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +15,8 @@
* limitations under the License.
*/
+package timer
+
// camel-k: language=groovy
from('timer:tick?period=10000')
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer-to-http.properties
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.properties
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/timer-to-http.properties
rename to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.properties
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 76ff59a6..9ee419af 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
@@ -33,9 +33,9 @@ config:
- name: INTEGRATION_LOGS
level: INFO
resources:
- - ../timer-to-http-pipe.yaml
- - ../timer-to-http.groovy
- - ../timer-to-http.properties
+ - timer-to-http-pipe.yaml
+ - timer-to-http.groovy
+ - timer-to-http.properties
dump:
enabled: true
failedOnly: true
diff --git
a/tests/camel-kamelets-itest/src/test/resources/data-type-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/data-type-action-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/extract-field-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/extract-field-action-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/insert-field-action-pipe.yaml
b/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/insert-field-action-pipe.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.yaml
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 e6f6a3a9..1f86f2eb 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
@@ -33,9 +33,9 @@ config:
- name: INTEGRATION_LOGS
level: INFO
resources:
- - ../insert-field-action-pipe.yaml
- - ../extract-field-action-pipe.yaml
- - ../data-type-action-pipe.yaml
+ - insert-field-action-pipe.yaml
+ - extract-field-action-pipe.yaml
+ - data-type-action-pipe.yaml
dump:
enabled: true
failedOnly: true
