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 5133869 Regen docs
5133869 is described below
commit 513386946a2d4ca832443ce49c4e32c5386c7371
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri Mar 20 16:00:23 2020 +0100
Regen docs
---
docs/components/modules/ROOT/pages/aws-s3-component.adoc | 6 ++++--
docs/components/modules/ROOT/pages/aws2-s3-component.adoc | 8 ++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 0961193..2d4a581 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -41,7 +41,7 @@
from("aws-s3://helloBucket?accessKey=yourAccessKey&secretKey=yourSecretKey&prefi
// component options: START
-The AWS S3 Storage Service component supports 37 options, which are listed
below.
+The AWS S3 Storage Service component supports 38 options, which are listed
below.
@@ -51,6 +51,7 @@ The AWS S3 Storage Service component supports 37 options,
which are listed below
| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. | | AmazonS3
| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
| *configuration* (common) | The component configuration | | S3Configuration
+| *endpointConfiguration* (common) | Amazon AWS Endpoint Configuration | |
EndpointConfiguration
| *pathStyleAccess* (common) | Whether or not the S3 client should use path
style access | false | boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
| *proxyHost* (common) | To define a proxy host when instantiating the SQS
client | | String
@@ -117,7 +118,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (57 parameters):
+=== Query Parameters (58 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -125,6 +126,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. | | AmazonS3
| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
+| *endpointConfiguration* (common) | Amazon AWS Endpoint Configuration | |
EndpointConfiguration
| *pathStyleAccess* (common) | Whether or not the S3 client should use path
style access | false | boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
| *proxyHost* (common) | To define a proxy host when instantiating the SQS
client | | String
diff --git a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
index 975db40..bb49308 100644
--- a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
@@ -44,7 +44,7 @@
from("aws2-s3://helloBucket?accessKey=yourAccessKey&secretKey=yourSecretKey&pref
// component options: START
-The AWS2 S3 Storage Service component supports 28 options, which are listed
below.
+The AWS2 S3 Storage Service component supports 30 options, which are listed
below.
@@ -54,11 +54,13 @@ The AWS2 S3 Storage Service component supports 28 options,
which are listed belo
| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. | | S3Client
| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
| *configuration* (common) | The component configuration | |
AWS2S3Configuration
+| *overrideEndpoint* (common) | Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpointOverride option | false
| boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
| *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
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the
S3 client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol
| *region* (common) | The region in which S3 client needs to work. When using
this parameter, the configuration will expect the lowercase name of the region
(for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | |
String
+| *uriEndpointOverride* (common) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to
load credentials on an EC2 instance or to expect static credentials to be
passed in. | 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 AWS2S3Constants#BUCKET_NAME and AWS2S3Constants#KEY
headers, or only the AWS2S3C [...]
@@ -111,7 +113,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (48 parameters):
+=== Query Parameters (50 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -119,11 +121,13 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. | | S3Client
| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
+| *overrideEndpoint* (common) | Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpointOverride option | false
| boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
| *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
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the
S3 client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol
| *region* (common) | The region in which S3 client needs to work. When using
this parameter, the configuration will expect the lowercase name of the region
(for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | |
String
+| *uriEndpointOverride* (common) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to
load credentials on an EC2 instance or to expect static credentials to be
passed in. | 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 AWS2S3Constants#BUCKET_NAME and AWS2S3Constants#KEY
headers, or only the AWS2S3C [...]
