Minio Sink Kamelet: Like we do in S3 add the ability to specify objec…

…tName instead of using header (#1601) Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
apache · Aug 30, 2023 · 2b535a0 · 2b535a0
1 parent 9fa99a2
commit 2b535a0
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 30 deletions.
diff --git a/kamelets/minio-sink.kamelet.yaml b/kamelets/minio-sink.kamelet.yaml
@@ -75,6 +75,10 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      keyName:
+        title: Key Name
+        description: The key name for saving an element in the bucket.
+        type: string
   dependencies:
     - "camel:core"
     - "camel:minio"
@@ -84,26 +88,32 @@ spec:
       uri: "kamelet:source"
       steps:
       - choice:
+          precondition: true
           when:
-          - simple: "${header[file]}"
-            steps:
-            - set-header:
-                name: CamelMinioObjectName
-                simple: "${header[file]}"
-          - simple: "${header[ce-file]}"
-            steps:
-            - set-header:
-                name: CamelMinioObjectName
-                simple: "${header[ce-file]}"
-          otherwise:
-            steps:
-            - set-header:
-                name: CamelMinioObjectName
-                simple: "${exchangeId}"
+            - simple: '${propertiesExist:!keyName}'
+              steps:
+                - choice:   
+                    when:
+                      - simple: "${header[file]}"
+                        steps:
+                          - set-header:
+                              name: CamelMinioObjectName
+                              simple: "${header[file]}"
+                      - simple: "${header[ce-file]}"
+                        steps:
+                          - set-header:
+                              name: CamelMinioObjectName
+                              simple: "${header[ce-file]}"
+                    otherwise:
+                      steps:
+                        - set-header:
+                            name: CamelMinioObjectName
+                            simple: "${exchangeId}"
       - to:
           uri: "minio:{{bucketName}}"
           parameters:
             autoCreateBucket: "{{autoCreateBucket}}"
             secretKey: "{{secretKey}}"
             accessKey: "{{accessKey}}"
             endpoint: "{{endpoint}}"
+            keyName: "{{?keyName}}"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/minio-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/minio-sink.kamelet.yaml
@@ -75,6 +75,10 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      keyName:
+        title: Key Name
+        description: The key name for saving an element in the bucket.
+        type: string
   dependencies:
     - "camel:core"
     - "camel:minio"
@@ -84,26 +88,32 @@ spec:
       uri: "kamelet:source"
       steps:
       - choice:
+          precondition: true
           when:
-          - simple: "${header[file]}"
-            steps:
-            - set-header:
-                name: CamelMinioObjectName
-                simple: "${header[file]}"
-          - simple: "${header[ce-file]}"
-            steps:
-            - set-header:
-                name: CamelMinioObjectName
-                simple: "${header[ce-file]}"
-          otherwise:
-            steps:
-            - set-header:
-                name: CamelMinioObjectName
-                simple: "${exchangeId}"
+            - simple: '${propertiesExist:!keyName}'
+              steps:
+                - choice:   
+                    when:
+                      - simple: "${header[file]}"
+                        steps:
+                          - set-header:
+                              name: CamelMinioObjectName
+                              simple: "${header[file]}"
+                      - simple: "${header[ce-file]}"
+                        steps:
+                          - set-header:
+                              name: CamelMinioObjectName
+                              simple: "${header[ce-file]}"
+                    otherwise:
+                      steps:
+                        - set-header:
+                            name: CamelMinioObjectName
+                            simple: "${exchangeId}"
       - to:
           uri: "minio:{{bucketName}}"
           parameters:
             autoCreateBucket: "{{autoCreateBucket}}"
             secretKey: "{{secretKey}}"
             accessKey: "{{accessKey}}"
             endpoint: "{{endpoint}}"
+            keyName: "{{?keyName}}"