From 89d0ff3dae7c128e2eab86c395aa54137171eca0 Mon Sep 17 00:00:00 2001
From: Claudio Miranda <claudio@claudius.com.br>
Date: Mon, 10 Oct 2022 19:21:21 -0300
Subject: [PATCH] Fix keyName condition

---
 kamelets/aws-s3-sink.kamelet.yaml                          | 7 +++----
 kamelets/ceph-sink.kamelet.yaml                            | 3 +--
 .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml   | 7 +++----
 .../src/main/resources/kamelets/ceph-sink.kamelet.yaml     | 3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/kamelets/aws-s3-sink.kamelet.yaml b/kamelets/aws-s3-sink.kamelet.yaml
index fc95eafbb..d8d8ab6f6 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -34,7 +34,7 @@ spec:
       Upload data to an Amazon S3 Bucket.
 
       The basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
+
       If you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.
 
       In the header, you can optionally set the `file` / `ce-partition` property to specify the name of the file to upload.
@@ -119,12 +119,11 @@ spec:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${header[ce-file]}"
-          - simple: "${properties:keyName:null} == 'null'"
+          - simple: "'{{?keyName}}' == ''"
             steps:
             - set-header:
                 name: CamelAwsS3Key
-                simple: "${exchangeId}"      
-                # this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
+                simple: "${exchangeId}"
       - to:
           uri: "aws2-s3:{{bucketNameOrArn}}"
           parameters:
diff --git a/kamelets/ceph-sink.kamelet.yaml b/kamelets/ceph-sink.kamelet.yaml
index 9c38739d0..2a2dd0231 100644
--- a/kamelets/ceph-sink.kamelet.yaml
+++ b/kamelets/ceph-sink.kamelet.yaml
@@ -104,12 +104,11 @@ spec:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${header[ce-file]}"
-          - simple: "${properties:keyName:null} == 'null'"
+          - simple: "'{{?keyName}}' == ''"
             steps:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${exchangeId}"
-                # this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
       - to:
           uri: "aws2-s3:{{bucketName}}"
           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 fc95eafbb..d8d8ab6f6 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
@@ -34,7 +34,7 @@ spec:
       Upload data to an Amazon S3 Bucket.
 
       The basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
+
       If you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.
 
       In the header, you can optionally set the `file` / `ce-partition` property to specify the name of the file to upload.
@@ -119,12 +119,11 @@ spec:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${header[ce-file]}"
-          - simple: "${properties:keyName:null} == 'null'"
+          - simple: "'{{?keyName}}' == ''"
             steps:
             - set-header:
                 name: CamelAwsS3Key
-                simple: "${exchangeId}"      
-                # this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
+                simple: "${exchangeId}"
       - to:
           uri: "aws2-s3:{{bucketNameOrArn}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/ceph-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/ceph-sink.kamelet.yaml
index 9c38739d0..2a2dd0231 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/ceph-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/ceph-sink.kamelet.yaml
@@ -104,12 +104,11 @@ spec:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${header[ce-file]}"
-          - simple: "${properties:keyName:null} == 'null'"
+          - simple: "'{{?keyName}}' == ''"
             steps:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${exchangeId}"
-                # this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
       - to:
           uri: "aws2-s3:{{bucketName}}"
           parameters: