Azure Storage Blob Kamelets: Expose the credentialsType parameter wit…

…h SHARED_ACCOUNT_KEY as default Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
apache · Jun 28, 2023 · d823d0b · d823d0b
1 parent e1868a4
commit d823d0b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 16 deletions.
diff --git a/kamelets/azure-storage-blob-sink.kamelet.yaml b/kamelets/azure-storage-blob-sink.kamelet.yaml
@@ -38,7 +38,6 @@ spec:
     required:
       - accountName
       - containerName
-      - accessKey
     type: object
     properties:
       accountName:
@@ -59,6 +58,12 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
+      credentialType:
+        title: Credential Type
+        description: Determines the credential strategy to adopt.
+        type: string
+        enum: ["SHARED_ACCOUNT_KEY", "AZURE_IDENTITY"]
+        default: "SHARED_ACCOUNT_KEY"
   dependencies:
     - "camel:core"
     - "camel:azure-storage-blob"
@@ -87,6 +92,6 @@ spec:
       - to:
           uri: "azure-storage-blob://{{accountName}}/{{containerName}}"
           parameters:
-            accessKey: "{{accessKey}}"
+            accessKey: "{{?accessKey}}"
             operation: "uploadBlockBlob"
-            credentialType: "SHARED_ACCOUNT_KEY"
+            credentialType: "{{credentialType}}"
diff --git a/kamelets/azure-storage-blob-source.kamelet.yaml b/kamelets/azure-storage-blob-source.kamelet.yaml
@@ -38,7 +38,6 @@ spec:
     required:
       - accountName
       - containerName
-      - accessKey
     type: object
     properties:
       accountName:
@@ -71,6 +70,12 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      credentialType:
+        title: Credential Type
+        description: Determines the credential strategy to adopt.
+        type: string
+        enum: ["SHARED_ACCOUNT_KEY", "AZURE_IDENTITY"]
+        default: "SHARED_ACCOUNT_KEY"
   dependencies:
     - "camel:azure-storage-blob"
     - "camel:kamelet"
@@ -90,8 +95,8 @@ spec:
     from:
       uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
       parameters:
-        accessKey: "{{accessKey}}"
-        credentialType: "SHARED_ACCOUNT_KEY"
+        accessKey: "{{?accessKey}}"
+        credentialType: "{{credentialType}}"
         delay: "{{delay}}"
       steps:
         - process:
@@ -106,6 +111,6 @@ spec:
                       uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
                       parameters:
                         operation: "deleteBlob"
-                        accessKey: "{{accessKey}}"
-                        credentialType: "SHARED_ACCOUNT_KEY"
+                        accessKey: "{{?accessKey}}"
+                        credentialType: "{{credentialType}}"
 
diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
@@ -38,7 +38,6 @@ spec:
     required:
       - accountName
       - containerName
-      - accessKey
     type: object
     properties:
       accountName:
@@ -59,6 +58,12 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
+      credentialType:
+        title: Credential Type
+        description: Determines the credential strategy to adopt.
+        type: string
+        enum: ["SHARED_ACCOUNT_KEY", "AZURE_IDENTITY"]
+        default: "SHARED_ACCOUNT_KEY"
   dependencies:
     - "camel:core"
     - "camel:azure-storage-blob"
@@ -87,6 +92,6 @@ spec:
       - to:
           uri: "azure-storage-blob://{{accountName}}/{{containerName}}"
           parameters:
-            accessKey: "{{accessKey}}"
+            accessKey: "{{?accessKey}}"
             operation: "uploadBlockBlob"
-            credentialType: "SHARED_ACCOUNT_KEY"
+            credentialType: "{{credentialType}}"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
@@ -38,7 +38,6 @@ spec:
     required:
       - accountName
       - containerName
-      - accessKey
     type: object
     properties:
       accountName:
@@ -71,6 +70,12 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      credentialType:
+        title: Credential Type
+        description: Determines the credential strategy to adopt.
+        type: string
+        enum: ["SHARED_ACCOUNT_KEY", "AZURE_IDENTITY"]
+        default: "SHARED_ACCOUNT_KEY"
   dependencies:
     - "camel:azure-storage-blob"
     - "camel:kamelet"
@@ -90,8 +95,8 @@ spec:
     from:
       uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
       parameters:
-        accessKey: "{{accessKey}}"
-        credentialType: "SHARED_ACCOUNT_KEY"
+        accessKey: "{{?accessKey}}"
+        credentialType: "{{credentialType}}"
         delay: "{{delay}}"
       steps:
         - process:
@@ -106,6 +111,6 @@ spec:
                       uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
                       parameters:
                         operation: "deleteBlob"
-                        accessKey: "{{accessKey}}"
-                        credentialType: "SHARED_ACCOUNT_KEY"
+                        accessKey: "{{?accessKey}}"
+                        credentialType: "{{credentialType}}"