From 6d9eb9e5d068d5a4945df2b002192bde6096b010 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Tue, 25 Jan 2022 18:17:44 +0100 Subject: [PATCH 1/3] Support DefaultCredentialProvider in the AWS Kamelets - AWS S3 Source --- kamelets/aws-s3-source.kamelet.yaml | 14 ++++++++++---- .../resources/kamelets/aws-s3-source.kamelet.yaml | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/kamelets/aws-s3-source.kamelet.yaml b/kamelets/aws-s3-source.kamelet.yaml index c0490406e..6d7cf7ccf 100644 --- a/kamelets/aws-s3-source.kamelet.yaml +++ b/kamelets/aws-s3-source.kamelet.yaml @@ -17,8 +17,6 @@ spec: Receive data from AWS S3. required: - bucketNameOrArn - - accessKey - - secretKey - region type: object properties: @@ -80,6 +78,13 @@ spec: x-descriptors: - 'urn:alm:descriptor:com.tectonic.ui:checkbox' default: false + useDefaultCredentialsProvider: + title: Default Credentials Provider + description: Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. + type: boolean + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:checkbox' + default: false dependencies: - "camel:aws2-s3" - "camel:kamelet" @@ -88,12 +93,13 @@ spec: uri: "aws2-s3:{{bucketNameOrArn}}" parameters: autoCreateBucket: "{{autoCreateBucket}}" - secretKey: "{{secretKey}}" - accessKey: "{{accessKey}}" + secretKey: "{{?secretKey}}" + accessKey: "{{?accessKey}}" region: "{{region}}" includeBody: "{{includeBody}}" ignoreBody: "{{ignoreBody}}" deleteAfterRead: "{{deleteAfterRead}}" prefix: "{{?prefix}}" + useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" steps: - to: "kamelet:sink" diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml index c0490406e..6d7cf7ccf 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml @@ -17,8 +17,6 @@ spec: Receive data from AWS S3. required: - bucketNameOrArn - - accessKey - - secretKey - region type: object properties: @@ -80,6 +78,13 @@ spec: x-descriptors: - 'urn:alm:descriptor:com.tectonic.ui:checkbox' default: false + useDefaultCredentialsProvider: + title: Default Credentials Provider + description: Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. + type: boolean + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:checkbox' + default: false dependencies: - "camel:aws2-s3" - "camel:kamelet" @@ -88,12 +93,13 @@ spec: uri: "aws2-s3:{{bucketNameOrArn}}" parameters: autoCreateBucket: "{{autoCreateBucket}}" - secretKey: "{{secretKey}}" - accessKey: "{{accessKey}}" + secretKey: "{{?secretKey}}" + accessKey: "{{?accessKey}}" region: "{{region}}" includeBody: "{{includeBody}}" ignoreBody: "{{ignoreBody}}" deleteAfterRead: "{{deleteAfterRead}}" prefix: "{{?prefix}}" + useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" steps: - to: "kamelet:sink" From edba49665bf5a691370798c380ff606e929c3f5c Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Tue, 25 Jan 2022 18:30:04 +0100 Subject: [PATCH 2/3] Support DefaultCredentialProvider in the AWS Kamelets - AWS S3 Source --- kamelets/aws-s3-source.kamelet.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kamelets/aws-s3-source.kamelet.yaml b/kamelets/aws-s3-source.kamelet.yaml index 6d7cf7ccf..1b63ebf7d 100644 --- a/kamelets/aws-s3-source.kamelet.yaml +++ b/kamelets/aws-s3-source.kamelet.yaml @@ -14,7 +14,11 @@ spec: definition: title: "AWS S3 Source" description: |- - Receive data from AWS S3. + Receive data from AWS S3 Bucket. + + Access Key/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'. + + When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet. required: - bucketNameOrArn - region From 7ffb9c706ae4dc797dda812aad1e347ab4757275 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Tue, 25 Jan 2022 18:39:00 +0100 Subject: [PATCH 3/3] Support DefaultCredentialProvider in the AWS Kamelets - AWS S3 Source --- .../src/main/resources/kamelets/aws-s3-source.kamelet.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml index 6d7cf7ccf..1b63ebf7d 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml @@ -14,7 +14,11 @@ spec: definition: title: "AWS S3 Source" description: |- - Receive data from AWS S3. + Receive data from AWS S3 Bucket. + + Access Key/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'. + + When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet. required: - bucketNameOrArn - region