From 05732e27a82a9822f5391fe387da0222b57c0960 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 3 Feb 2022 14:07:28 +0100 Subject: [PATCH 1/6] Support DefaultCredentialProvider in the AWS Kamelets - AWS EC2 --- kamelets/aws-ec2-sink.kamelet.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/kamelets/aws-ec2-sink.kamelet.yaml b/kamelets/aws-ec2-sink.kamelet.yaml index c465ab3cb..79259e0a1 100644 --- a/kamelets/aws-ec2-sink.kamelet.yaml +++ b/kamelets/aws-ec2-sink.kamelet.yaml @@ -33,12 +33,14 @@ spec: description: |- Check the status of EC2 instances + Access Key/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'. + + When using a default Credentials Provider the EC2 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. + The Kamelet expects the following headers to be set: - `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids. required: - - accessKey - - secretKey - region type: object properties: @@ -63,6 +65,13 @@ spec: description: The AWS region to connect to type: string example: eu-west-1 + 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:core" - "camel:aws2-ec2" @@ -86,7 +95,8 @@ spec: - to: uri: "aws2-ec2:ec2-route" parameters: - accessKey: "{{accessKey}}" - secretKey: "{{secretKey}}" + accessKey: "{{?accessKey}}" + secretKey: "{{?secretKey}}" region: "{{region}}" operation: "describeInstancesStatus" + useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" From 33c2cacd359647397863ad9d37e50f383338418b Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 3 Feb 2022 14:08:06 +0100 Subject: [PATCH 2/6] Support DefaultCredentialProvider in the AWS Kamelets - AWS EC2 --- .../kamelets/aws-ec2-sink.kamelet.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml index c465ab3cb..79259e0a1 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml @@ -33,12 +33,14 @@ spec: description: |- Check the status of EC2 instances + Access Key/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'. + + When using a default Credentials Provider the EC2 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. + The Kamelet expects the following headers to be set: - `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids. required: - - accessKey - - secretKey - region type: object properties: @@ -63,6 +65,13 @@ spec: description: The AWS region to connect to type: string example: eu-west-1 + 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:core" - "camel:aws2-ec2" @@ -86,7 +95,8 @@ spec: - to: uri: "aws2-ec2:ec2-route" parameters: - accessKey: "{{accessKey}}" - secretKey: "{{secretKey}}" + accessKey: "{{?accessKey}}" + secretKey: "{{?secretKey}}" region: "{{region}}" operation: "describeInstancesStatus" + useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" From 031f169079dfaef784c6f01314c7781c1b5db2e0 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 3 Feb 2022 14:10:20 +0100 Subject: [PATCH 3/6] Support DefaultCredentialProvider in the AWS Kamelets - AWS Kinesis Firehose --- .../aws-kinesis-firehose-sink.kamelet.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/kamelets/aws-kinesis-firehose-sink.kamelet.yaml b/kamelets/aws-kinesis-firehose-sink.kamelet.yaml index 52a9e6482..c3495747a 100644 --- a/kamelets/aws-kinesis-firehose-sink.kamelet.yaml +++ b/kamelets/aws-kinesis-firehose-sink.kamelet.yaml @@ -32,10 +32,12 @@ spec: title: AWS Kinesis Firehose Sink description: |- Send message to an AWS Kinesis Firehose Stream + + Access Key/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'. + + When using a default Credentials Provider the Kinesis Firehose 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: - streamName - - accessKey - - secretKey - region type: object properties: @@ -64,6 +66,13 @@ spec: description: The AWS region to connect to type: string example: eu-west-1 + useDefaultCredentialsProvider: + title: Default Credentials Provider + description: Set whether the Kinesis Firehose 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-kinesis" - "camel:kamelet" @@ -74,6 +83,7 @@ spec: - to: uri: "aws2-kinesis-firehose:{{streamName}}" parameters: - accessKey: "{{accessKey}}" - secretKey: "{{secretKey}}" + accessKey: "{{?accessKey}}" + secretKey: "{{?secretKey}}" region: "{{region}}" + useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" From 62480f21a1aadd589d2ad76e96d36a7dfc950c62 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 3 Feb 2022 14:11:20 +0100 Subject: [PATCH 4/6] Support DefaultCredentialProvider in the AWS Kamelets - AWS Kinesis Firehose --- .../aws-kinesis-firehose-sink.kamelet.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml index 52a9e6482..c3495747a 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml @@ -32,10 +32,12 @@ spec: title: AWS Kinesis Firehose Sink description: |- Send message to an AWS Kinesis Firehose Stream + + Access Key/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'. + + When using a default Credentials Provider the Kinesis Firehose 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: - streamName - - accessKey - - secretKey - region type: object properties: @@ -64,6 +66,13 @@ spec: description: The AWS region to connect to type: string example: eu-west-1 + useDefaultCredentialsProvider: + title: Default Credentials Provider + description: Set whether the Kinesis Firehose 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-kinesis" - "camel:kamelet" @@ -74,6 +83,7 @@ spec: - to: uri: "aws2-kinesis-firehose:{{streamName}}" parameters: - accessKey: "{{accessKey}}" - secretKey: "{{secretKey}}" + accessKey: "{{?accessKey}}" + secretKey: "{{?secretKey}}" region: "{{region}}" + useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" From 5dfba29bc21d03ceb260c24bb1260aa0f52cfc30 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 3 Feb 2022 14:11:42 +0100 Subject: [PATCH 5/6] Support DefaultCredentialProvider in the AWS Kamelets - AWS EC2 --- kamelets/aws-ec2-sink.kamelet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kamelets/aws-ec2-sink.kamelet.yaml b/kamelets/aws-ec2-sink.kamelet.yaml index 79259e0a1..6bfed6131 100644 --- a/kamelets/aws-ec2-sink.kamelet.yaml +++ b/kamelets/aws-ec2-sink.kamelet.yaml @@ -67,7 +67,7 @@ spec: example: eu-west-1 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. + description: Set whether the EC2 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' From fd995b61e3265b8f184ca2f9e79a40f95922ed88 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 3 Feb 2022 18:18:56 +0100 Subject: [PATCH 6/6] Support DefaultCredentialProvider in the AWS Kamelets - AWS EC2 --- .../src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml index 79259e0a1..6bfed6131 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml @@ -67,7 +67,7 @@ spec: example: eu-west-1 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. + description: Set whether the EC2 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'