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:27:39 UTC
[camel-kamelets] branch 0.9.x updated (8c28af78 -> 7624af7e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch 0.9.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
from 8c28af78 Azure Storage Blob Source Kamelet: Add a deleteAfterRead parameter
new d04fbd8e aws-s3-sink kamelet ignores keyName property
new 7624af7e 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.
Summary of changes:
kamelets/aws-s3-sink.kamelet.yaml | 36 ++++++++++++----------
.../resources/kamelets/aws-s3-sink.kamelet.yaml | 36 ++++++++++++----------
2 files changed, 40 insertions(+), 32 deletions(-)
[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 0.9.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit d04fbd8e958eb5b8bf6118a7651ddc2294f87168
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 e1b92499..d655160b 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -120,7 +120,7 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- - simple: "${properties:keyName:null} == 'null'"
+ - simple: "${propertiesExist:!keyName}"
steps:
- set-header:
name: CamelAwsS3Key
[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 0.9.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 7624af7e9e790e271e979579ba21f3b0119c5749
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 | 36 ++++++++++++----------
.../resources/kamelets/aws-s3-sink.kamelet.yaml | 36 ++++++++++++----------
2 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/kamelets/aws-s3-sink.kamelet.yaml b/kamelets/aws-s3-sink.kamelet.yaml
index d655160b..8b6305e9 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -109,23 +109,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}"
- # this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
+ - 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 e1b92499..8b6305e9 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
@@ -109,23 +109,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: "${properties:keyName:null} == 'null'"
- steps:
- - set-header:
- name: CamelAwsS3Key
- simple: "${exchangeId}"
- # this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
+ - 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: