This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 1517 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit e54ea9427fd33da2e900ff77ac9932d47ed4feb0 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jun 28 11:42:27 2023 +0200 Azure Storage Blob Kamelets: Expose the credentialsType parameter with SHARED_ACCOUNT_KEY as default Signed-off-by: Andrea Cosentino <[email protected]> --- kamelets/azure-storage-blob-sink.kamelet.yaml | 11 ++++++++--- kamelets/azure-storage-blob-source.kamelet.yaml | 15 ++++++++++----- .../kamelets/azure-storage-blob-sink.kamelet.yaml | 11 ++++++++--- .../kamelets/azure-storage-blob-source.kamelet.yaml | 15 ++++++++++----- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/kamelets/azure-storage-blob-sink.kamelet.yaml b/kamelets/azure-storage-blob-sink.kamelet.yaml index 3c5f189f..769247c8 100644 --- 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 index c1f09c80..854c08ba 100644 --- 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 index 3c5f189f..769247c8 100644 --- 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 index c1f09c80..854c08ba 100644 --- 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}}"
