You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/11/03 14:18:45 UTC
[camel-kamelets] branch 1131 created (now 1cacff2f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch 1131
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
at 1cacff2f aws-s3-sink kamelet ignores keyName property
This branch includes the following new commits:
new e8f26fca aws-s3-sink kamelet ignores keyName property
new 1cacff2f aws-s3-sink kamelet ignores keyName property
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel-kamelets] 02/02: aws-s3-sink kamelet ignores keyName property
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 1131
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 1cacff2f593866daf60034a451ba50e8fc7e6f2e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 3 15:17:22 2022 +0100
aws-s3-sink kamelet ignores keyName property
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
kamelets/aws-s3-sink.kamelet.yaml | 35 ++++++++++++----------
.../resources/kamelets/aws-s3-sink.kamelet.yaml | 35 ++++++++++++----------
2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/kamelets/aws-s3-sink.kamelet.yaml b/kamelets/aws-s3-sink.kamelet.yaml
index ca62484c..61a5dc55 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -108,22 +108,27 @@ spec:
uri: "kamelet:source"
steps:
- choice:
+ precondition: true
when:
- - simple: "${header[file]}"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${header[file]}"
- - simple: "${header[ce-file]}"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${header[ce-file]}"
- - simple: "${propertiesExist:!keyName}"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${exchangeId}"
+ - simple: '${propertiesExist:!keyName}'
+ steps:
+ - choice:
+ when:
+ - simple: "${header[file]}"
+ steps:
+ - set-header:
+ name: CamelAwsS3Key
+ simple: "${header[file]}"
+ - simple: "${header[ce-file]}"
+ steps:
+ - set-header:
+ name: CamelAwsS3Key
+ simple: "${header[ce-file]}"
+ otherwise:
+ steps:
+ - set-header:
+ name: CamelAwsS3Key
+ simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
index d8d8ab6f..61a5dc55 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
@@ -108,22 +108,27 @@ spec:
uri: "kamelet:source"
steps:
- choice:
+ precondition: true
when:
- - simple: "${header[file]}"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${header[file]}"
- - simple: "${header[ce-file]}"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${header[ce-file]}"
- - simple: "'{{?keyName}}' == ''"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${exchangeId}"
+ - simple: '${propertiesExist:!keyName}'
+ steps:
+ - choice:
+ when:
+ - simple: "${header[file]}"
+ steps:
+ - set-header:
+ name: CamelAwsS3Key
+ simple: "${header[file]}"
+ - simple: "${header[ce-file]}"
+ steps:
+ - set-header:
+ name: CamelAwsS3Key
+ simple: "${header[ce-file]}"
+ otherwise:
+ steps:
+ - set-header:
+ name: CamelAwsS3Key
+ simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
[camel-kamelets] 01/02: aws-s3-sink kamelet ignores keyName property
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 1131
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit e8f26fcad55707599285887657ef2ab5af7e4c4d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 3 14:52:14 2022 +0100
aws-s3-sink kamelet ignores keyName property
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
kamelets/aws-s3-sink.kamelet.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kamelets/aws-s3-sink.kamelet.yaml b/kamelets/aws-s3-sink.kamelet.yaml
index d8d8ab6f..ca62484c 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -119,7 +119,7 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- - simple: "'{{?keyName}}' == ''"
+ - simple: "${propertiesExist:!keyName}"
steps:
- set-header:
name: CamelAwsS3Key