aws-s3-sink kamelet ignores keyName property

Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
apache · Nov 3, 2022 · d95b2bd · d95b2bd
1 parent 9065791
commit d95b2bd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 30 deletions.
diff --git 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
@@ -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: