This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9dee6cd Camel AWS S3: AccessKey and SecretKey are secret
9dee6cd is described below
commit 9dee6cd8ce4b52356ba45452fbb59aed09a81b22
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Jan 12 13:11:50 2018 +0100
Camel AWS S3: AccessKey and SecretKey are secret
---
components/camel-aws/src/main/docs/aws-s3-component.adoc | 4 ++--
.../main/java/org/apache/camel/component/aws/s3/S3Configuration.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-s3-component.adoc
b/components/camel-aws/src/main/docs/aws-s3-component.adoc
index cd3bec9..1d0246d 100644
--- a/components/camel-aws/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-s3-component.adoc
@@ -82,7 +82,6 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessKey* (common) | Amazon AWS Access Key | | String
| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.sqs.AmazonS3 in the link:registry.htmlRegistry. | |
AmazonS3
| *amazonS3Endpoint* (common) | The region with which the AWS-S3 client wants
to work with. | | String
| *encryptionMaterials* (common) | The encryption materials to use in case of
Symmetric/Asymmetric client usage | | EncryptionMaterials
@@ -91,7 +90,6 @@ with the following path and query parameters:
| *proxyHost* (common) | To define a proxy host when instantiating the SQS
client | | String
| *proxyPort* (common) | Specify a proxy port to be used inside the client
definition. | | Integer
| *region* (common) | The region where the bucket is located. This option is
used in the com.amazonaws.services.s3.model.CreateBucketRequest. | | String
-| *secretKey* (common) | Amazon AWS Secret Key | | String
| *useEncryption* (common) | Define if encryption must be used or not | false
| boolean
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler which mean any exceptions occurred while the
consumer is trying to pickup incoming messages or the likes will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *deleteAfterRead* (consumer) | Delete objects from S3 after they have been
retrieved. The delete is only performed if the Exchange is committed. If a
rollback occurs the object is not deleted. If this option is false then the
same objects will be retrieve over and over again on the polls. Therefore you
need to use the Idempotent Consumer EIP in the route to filter out duplicates.
You can filter using the link S3ConstantsBUCKET_NAME and link S3ConstantsKEY
headers or only the link S3Con [...]
@@ -125,6 +123,8 @@ with the following path and query parameters:
| *startScheduler* (scheduler) | Whether the scheduler should be auto started.
| true | boolean
| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. |
MILLISECONDS | TimeUnit
| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used.
See ScheduledExecutorService in JDK for details. | true | boolean
+| *accessKey* (security) | Amazon AWS Access Key | | String
+| *secretKey* (security) | Amazon AWS Secret Key | | String
|===
// endpoint options: END
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 46f9487..95ff8c1 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -30,9 +30,9 @@ public class S3Configuration implements Cloneable {
private String bucketName;
@UriParam
private AmazonS3 amazonS3Client;
- @UriParam
+ @UriParam(label = "security", secret = true)
private String accessKey;
- @UriParam
+ @UriParam(label = "security", secret = true)
private String secretKey;
@UriParam(label = "consumer")
private String fileName;
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
