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
commit 31619f97c2924aa91740f84da5ac5a97a3e390cf
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Mar 1 06:57:11 2021 +0100
CAMEL-16171 - Add uri-endpoint-override options to all AWS2 components -
AWS2-EC2 component
---
.../org/apache/camel/catalog/docs/aws2-ec2-component.adoc | 8 ++++++--
components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc | 8 ++++++--
.../camel/component/aws2/ec2/EC2ComponentConfigurationTest.java | 3 ++-
docs/components/modules/ROOT/pages/aws2-ec2-component.adoc | 8 ++++++--
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-ec2-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-ec2-component.adoc
index f1ec35c..f8eeedd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-ec2-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-ec2-component.adoc
@@ -42,7 +42,7 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS 2 Elastic Compute Cloud (EC2) component supports 13 options, which are
listed below.
+The AWS 2 Elastic Compute Cloud (EC2) component supports 15 options, which are
listed below.
@@ -54,6 +54,7 @@ The AWS 2 Elastic Compute Cloud (EC2) component supports 13
options, which are l
| *configuration* (producer) | The component configuration | |
AWS2EC2Configuration
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags. There are 11 enums and the value
can be one of: createAndRunInstances, startInstances, stopInstances,
terminateInstances, describeInstances, describeInstancesStatus,
rebootInstances, monitorInstances, unmonitorInstances [...]
+| *overrideEndpoint* (producer) | Set the need for overidding the endpoint.
This option needs to be used in combination with uriEndpointOverride option |
false | boolean
| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2
client | | Integer
@@ -61,6 +62,7 @@ The AWS 2 Elastic Compute Cloud (EC2) component supports 13
options, which are l
| *region* (producer) | The region in which EC2 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
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
+| *uriEndpointOverride* (producer) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used
for automatic autowiring options (the option must be marked as autowired) by
looking up in the registry to find if there is a single instance of matching
type, which then gets configured on the component. This can be used for
automatic configuring JDBC data sources, JMS connection factories, AWS Clients,
etc. | true | boolean
|===
// component options: END
@@ -87,7 +89,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (11 parameters):
+=== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -97,6 +99,7 @@ with the following path and query parameters:
| *amazonEc2Client* (producer) | *Autowired* To use a existing configured
AmazonEC2Client as client | | Ec2Client
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags. There are 11 enums and the value
can be one of: createAndRunInstances, startInstances, stopInstances,
terminateInstances, describeInstances, describeInstancesStatus,
rebootInstances, monitorInstances, unmonitorInstances [...]
+| *overrideEndpoint* (producer) | Set the need for overidding the endpoint.
This option needs to be used in combination with uriEndpointOverride option |
false | boolean
| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2
client | | Integer
@@ -104,6 +107,7 @@ with the following path and query parameters:
| *region* (producer) | The region in which EC2 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
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
+| *uriEndpointOverride* (producer) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
|===
// endpoint options: END
diff --git a/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
b/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
index f1ec35c..f8eeedd 100644
--- a/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
+++ b/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
@@ -42,7 +42,7 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS 2 Elastic Compute Cloud (EC2) component supports 13 options, which are
listed below.
+The AWS 2 Elastic Compute Cloud (EC2) component supports 15 options, which are
listed below.
@@ -54,6 +54,7 @@ The AWS 2 Elastic Compute Cloud (EC2) component supports 13
options, which are l
| *configuration* (producer) | The component configuration | |
AWS2EC2Configuration
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags. There are 11 enums and the value
can be one of: createAndRunInstances, startInstances, stopInstances,
terminateInstances, describeInstances, describeInstancesStatus,
rebootInstances, monitorInstances, unmonitorInstances [...]
+| *overrideEndpoint* (producer) | Set the need for overidding the endpoint.
This option needs to be used in combination with uriEndpointOverride option |
false | boolean
| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2
client | | Integer
@@ -61,6 +62,7 @@ The AWS 2 Elastic Compute Cloud (EC2) component supports 13
options, which are l
| *region* (producer) | The region in which EC2 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
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
+| *uriEndpointOverride* (producer) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used
for automatic autowiring options (the option must be marked as autowired) by
looking up in the registry to find if there is a single instance of matching
type, which then gets configured on the component. This can be used for
automatic configuring JDBC data sources, JMS connection factories, AWS Clients,
etc. | true | boolean
|===
// component options: END
@@ -87,7 +89,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (11 parameters):
+=== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -97,6 +99,7 @@ with the following path and query parameters:
| *amazonEc2Client* (producer) | *Autowired* To use a existing configured
AmazonEC2Client as client | | Ec2Client
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags. There are 11 enums and the value
can be one of: createAndRunInstances, startInstances, stopInstances,
terminateInstances, describeInstances, describeInstancesStatus,
rebootInstances, monitorInstances, unmonitorInstances [...]
+| *overrideEndpoint* (producer) | Set the need for overidding the endpoint.
This option needs to be used in combination with uriEndpointOverride option |
false | boolean
| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2
client | | Integer
@@ -104,6 +107,7 @@ with the following path and query parameters:
| *region* (producer) | The region in which EC2 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
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
+| *uriEndpointOverride* (producer) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
|===
// endpoint options: END
diff --git
a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
index 6d74eac..092657b 100644
---
a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
+++
b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
@@ -141,7 +141,8 @@ public class EC2ComponentConfigurationTest extends
CamelTestSupport {
public void createEndpointWithUriOverride() throws Exception {
AWS2EC2Component component = context.getComponent("aws2-ec2",
AWS2EC2Component.class);
AWS2EC2Endpoint endpoint = (AWS2EC2Endpoint) component
-
.createEndpoint("aws2-ec2://testDomain?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&overrideEndpoint=true&uriEndpointOverride=http://localhost:9090";);
+ .createEndpoint(
+
"aws2-ec2://testDomain?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&overrideEndpoint=true&uriEndpointOverride=http://localhost:9090";);
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
diff --git a/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
b/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
index 23955e4..4f2e239 100644
--- a/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
@@ -44,7 +44,7 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS 2 Elastic Compute Cloud (EC2) component supports 13 options, which are
listed below.
+The AWS 2 Elastic Compute Cloud (EC2) component supports 15 options, which are
listed below.
@@ -56,6 +56,7 @@ The AWS 2 Elastic Compute Cloud (EC2) component supports 13
options, which are l
| *configuration* (producer) | The component configuration | |
AWS2EC2Configuration
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags. There are 11 enums and the value
can be one of: createAndRunInstances, startInstances, stopInstances,
terminateInstances, describeInstances, describeInstancesStatus,
rebootInstances, monitorInstances, unmonitorInstances [...]
+| *overrideEndpoint* (producer) | Set the need for overidding the endpoint.
This option needs to be used in combination with uriEndpointOverride option |
false | boolean
| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2
client | | Integer
@@ -63,6 +64,7 @@ The AWS 2 Elastic Compute Cloud (EC2) component supports 13
options, which are l
| *region* (producer) | The region in which EC2 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
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
+| *uriEndpointOverride* (producer) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used
for automatic autowiring options (the option must be marked as autowired) by
looking up in the registry to find if there is a single instance of matching
type, which then gets configured on the component. This can be used for
automatic configuring JDBC data sources, JMS connection factories, AWS Clients,
etc. | true | boolean
|===
// component options: END
@@ -89,7 +91,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (11 parameters):
+=== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -99,6 +101,7 @@ with the following path and query parameters:
| *amazonEc2Client* (producer) | *Autowired* To use a existing configured
AmazonEC2Client as client | | Ec2Client
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags. There are 11 enums and the value
can be one of: createAndRunInstances, startInstances, stopInstances,
terminateInstances, describeInstances, describeInstancesStatus,
rebootInstances, monitorInstances, unmonitorInstances [...]
+| *overrideEndpoint* (producer) | Set the need for overidding the endpoint.
This option needs to be used in combination with uriEndpointOverride option |
false | boolean
| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2
client | | Integer
@@ -106,6 +109,7 @@ with the following path and query parameters:
| *region* (producer) | The region in which EC2 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
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
+| *uriEndpointOverride* (producer) | Set the overriding uri endpoint. This
option needs to be used in combination with overrideEndpoint option | | String
|===
// endpoint options: END
