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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 20bc0ed CAMEL-16171 - Add uri-endpoint-override options to all AWS2
components - AWS2-EC2 component - Regen
20bc0ed is described below
commit 20bc0ed0e3a013c9b2c773e103e1997ffae33125
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Mar 1 07:22:59 2021 +0100
CAMEL-16171 - Add uri-endpoint-override options to all AWS2 components -
AWS2-EC2 component - Regen
---
.../springboot/catalog/components/aws2-ec2.json | 6 ++++-
.../src/main/docs/aws2-ec2-starter.adoc | 4 +++-
.../springboot/AWS2EC2ComponentConfiguration.java | 26 ++++++++++++++++++++++
components-starter/camel-corda-starter/pom.xml | 8 +++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++
docs/modules/ROOT/pages/aws2-ec2-starter.adoc | 4 +++-
6 files changed, 57 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
index 43d3ff5..94bcae9 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
@@ -27,6 +27,7 @@
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
component configuration" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 star [...]
"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": true, "type": "object",
"javaType": "org.apache.camel.component.aws2.ec2.AWS2EC2Operations", "enum": [
"createAndRunInstances", "startInstances", "stopInstances",
"terminateInstances", "describeInstances", "describeInstancesStatus",
"rebootInstances", "monitorInstances", "unmonitorInstances", "createTags",
"deleteTags" ], "deprecated": false, "deprecationNote": "", "au [...]
+ "overrideEndpoint": { "kind": "property", "displayName": "Override
Endpoint", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "Set the need for
overidding the endpoint. This option needs to be used in combination with
uriEnd [...]
"pojoRequest": { "kind": "property", "displayName": "Pojo Request",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the EC2 client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the EC2 client" },
@@ -34,6 +35,7 @@
"region": { "kind": "property", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "The region in which EC2
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the regi [...]
"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
"trustAllCertificates": { "kind": "property", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option" },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "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 t [...]
},
"properties": {
@@ -42,12 +44,14 @@
"amazonEc2Client": { "kind": "parameter", "displayName": "Amazon Ec2
Client", "group": "producer", "label": "producer", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.ec2.Ec2Client",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "To use a existing
configured AmazonEC2Client as client" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 sta [...]
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": true, "type": "object",
"javaType": "org.apache.camel.component.aws2.ec2.AWS2EC2Operations", "enum": [
"createAndRunInstances", "startInstances", "stopInstances",
"terminateInstances", "describeInstances", "describeInstancesStatus",
"rebootInstances", "monitorInstances", "unmonitorInstances", "createTags",
"deleteTags" ], "deprecated": false, "deprecationNote": "", "a [...]
+ "overrideEndpoint": { "kind": "parameter", "displayName": "Override
Endpoint", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "Set the need for
overidding the endpoint. This option needs to be used in combination with uriEn
[...]
"pojoRequest": { "kind": "parameter", "displayName": "Pojo Request",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the EC2 client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the EC2 client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"HTTPS", "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiati [...]
"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "The region in which EC2
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the reg [...]
"secretKey": { "kind": "parameter", "displayName": "Secret Key", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "kind": "parameter", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" }
+ "trustAllCertificates": { "kind": "parameter", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ec2.AWS2EC2Configuration",
"configurationField": "configuration", "description": "Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option" }
}
}
diff --git
a/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc
b/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc
index 91ed2ce..e4e4b38 100644
---
a/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc
+++
b/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-ec2 with Spring Boot make sure to use the
following Maven depend
----
-The component supports 14 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -31,6 +31,7 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-ec2.enabled* | Whether to enable auto configuration of
the aws2-ec2 component. This is enabled by default. | | Boolean
| *camel.component.aws2-ec2.lazy-start-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 t [...]
| *camel.component.aws2-ec2.operation* | The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags | | AWS2EC2Operations
+| *camel.component.aws2-ec2.override-endpoint* | Set the need for overidding
the endpoint. This option needs to be used in combination with
uriEndpointOverride option | false | Boolean
| *camel.component.aws2-ec2.pojo-request* | If we want to use a POJO request
as body or not | false | Boolean
| *camel.component.aws2-ec2.proxy-host* | To define a proxy host when
instantiating the EC2 client | | String
| *camel.component.aws2-ec2.proxy-port* | To define a proxy port when
instantiating the EC2 client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-ec2.region* | 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
| *camel.component.aws2-ec2.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-ec2.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-ec2.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java
b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java
index 7b149b7..df7681f 100644
---
a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java
@@ -74,6 +74,11 @@ public class AWS2EC2ComponentConfiguration
*/
private AWS2EC2Operations operation;
/**
+ * Set the need for overidding the endpoint. This option needs to be used
in
+ * combination with uriEndpointOverride option
+ */
+ private Boolean overrideEndpoint = false;
+ /**
* If we want to use a POJO request as body or not
*/
private Boolean pojoRequest = false;
@@ -104,6 +109,11 @@ public class AWS2EC2ComponentConfiguration
*/
private Boolean trustAllCertificates = false;
/**
+ * Set the overriding uri endpoint. This option needs to be used in
+ * combination with overrideEndpoint option
+ */
+ private String uriEndpointOverride;
+ /**
* 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
@@ -153,6 +163,14 @@ public class AWS2EC2ComponentConfiguration
this.operation = operation;
}
+ public Boolean getOverrideEndpoint() {
+ return overrideEndpoint;
+ }
+
+ public void setOverrideEndpoint(Boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
+
public Boolean getPojoRequest() {
return pojoRequest;
}
@@ -209,6 +227,14 @@ public class AWS2EC2ComponentConfiguration
this.trustAllCertificates = trustAllCertificates;
}
+ public String getUriEndpointOverride() {
+ return uriEndpointOverride;
+ }
+
+ public void setUriEndpointOverride(String uriEndpointOverride) {
+ this.uriEndpointOverride = uriEndpointOverride;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index b215b27..4aa7023 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
<!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 1cdd52f..3656ac0 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/aws2-ec2-starter.adoc
b/docs/modules/ROOT/pages/aws2-ec2-starter.adoc
index 91ed2ce..e4e4b38 100644
--- a/docs/modules/ROOT/pages/aws2-ec2-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-ec2-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-ec2 with Spring Boot make sure to use the
following Maven depend
----
-The component supports 14 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -31,6 +31,7 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-ec2.enabled* | Whether to enable auto configuration of
the aws2-ec2 component. This is enabled by default. | | Boolean
| *camel.component.aws2-ec2.lazy-start-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 t [...]
| *camel.component.aws2-ec2.operation* | The operation to perform. It can be
createAndRunInstances, startInstances, stopInstances, terminateInstances,
describeInstances, describeInstancesStatus, rebootInstances, monitorInstances,
unmonitorInstances, createTags or deleteTags | | AWS2EC2Operations
+| *camel.component.aws2-ec2.override-endpoint* | Set the need for overidding
the endpoint. This option needs to be used in combination with
uriEndpointOverride option | false | Boolean
| *camel.component.aws2-ec2.pojo-request* | If we want to use a POJO request
as body or not | false | Boolean
| *camel.component.aws2-ec2.proxy-host* | To define a proxy host when
instantiating the EC2 client | | String
| *camel.component.aws2-ec2.proxy-port* | To define a proxy port when
instantiating the EC2 client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-ec2.region* | 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
| *camel.component.aws2-ec2.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-ec2.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-ec2.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
|===
// spring-boot-auto-configure options: END
