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 a700c97 CAMEL-16171 - Add uri-endpoint-override options to all AWS2
components - AWS2-KMS component
a700c97 is described below
commit a700c97a23dc1f0e4fb4534dafc08ee536237eb6
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Mar 2 08:46:36 2021 +0100
CAMEL-16171 - Add uri-endpoint-override options to all AWS2 components -
AWS2-KMS component
---
.../springboot/catalog/components/aws2-kms.json | 4 ++++
.../src/main/docs/aws2-kms-starter.adoc | 4 +++-
.../kms/springboot/KMS2ComponentConfiguration.java | 26 ++++++++++++++++++++++
components-starter/camel-corda-starter/pom.xml | 8 +++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++
docs/modules/ROOT/pages/aws2-kms-starter.adoc | 4 +++-
6 files changed, 56 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json
index 85e5515..8d68353 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json
@@ -26,12 +26,14 @@
"kmsClient": { "kind": "property", "displayName": "Kms Client", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"software.amazon.awssdk.services.kms.KmsClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To use a existing
configured AWS KMS as client" },
"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": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.kms.KMS2Operations", "enum": [ "listKeys",
"createKey", "disableKey", "scheduleKeyDeletion", "describeKey", "enableKey" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"conf [...]
+ "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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpoi [...]
"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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the KMS client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the KMS client" },
"proxyProtocol": { "kind": "property", "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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "To define a proxy protocol when instantiating
t [...]
"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.kms.KMS2Configuration",
"configurationField": "configuration", "description": "The region in which EKS
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region [...]
"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.kms.KMS2Configuration", "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.kms.KMS2Configuration", "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 [...]
"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
@@ -41,12 +43,14 @@
"kmsClient": { "kind": "parameter", "displayName": "Kms Client", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"software.amazon.awssdk.services.kms.KmsClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To use a existing
configured AWS KMS 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": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.kms.KMS2Operations", "enum": [ "listKeys",
"createKey", "disableKey", "scheduleKeyDeletion", "describeKey", "enableKey" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"con [...]
+ "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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpo [...]
"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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the KMS client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the KMS 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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "To define a proxy protocol when instantiating
[...]
"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.kms.KMS2Configuration",
"configurationField": "configuration", "description": "The region in which EKS
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region [...]
"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.kms.KMS2Configuration", "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.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
"accessKey": { "kind": "parameter", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "parameter", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
}
diff --git
a/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc
b/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc
index 959109d..de2dfb7 100644
---
a/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc
+++
b/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-kms 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-kms.kms-client* | To use a existing configured AWS KMS
as client. The option is a software.amazon.awssdk.services.kms.KmsClient type.
| | KmsClient
| *camel.component.aws2-kms.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-kms.operation* | The operation to perform | |
KMS2Operations
+| *camel.component.aws2-kms.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-kms.pojo-request* | If we want to use a POJO request
as body or not | false | Boolean
| *camel.component.aws2-kms.proxy-host* | To define a proxy host when
instantiating the KMS client | | String
| *camel.component.aws2-kms.proxy-port* | To define a proxy port when
instantiating the KMS client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-kms.region* | The region in which EKS 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-kms.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-kms.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-kms.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-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java
b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java
index 3b3c424..a98cd92 100644
---
a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java
@@ -67,6 +67,11 @@ public class KMS2ComponentConfiguration
*/
private KMS2Operations 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;
@@ -93,6 +98,11 @@ public class KMS2ComponentConfiguration
*/
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
@@ -142,6 +152,14 @@ public class KMS2ComponentConfiguration
this.operation = operation;
}
+ public Boolean getOverrideEndpoint() {
+ return overrideEndpoint;
+ }
+
+ public void setOverrideEndpoint(Boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
+
public Boolean getPojoRequest() {
return pojoRequest;
}
@@ -190,6 +208,14 @@ public class KMS2ComponentConfiguration
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-kms-starter.adoc
b/docs/modules/ROOT/pages/aws2-kms-starter.adoc
index 959109d..de2dfb7 100644
--- a/docs/modules/ROOT/pages/aws2-kms-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-kms-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-kms 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-kms.kms-client* | To use a existing configured AWS KMS
as client. The option is a software.amazon.awssdk.services.kms.KmsClient type.
| | KmsClient
| *camel.component.aws2-kms.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-kms.operation* | The operation to perform | |
KMS2Operations
+| *camel.component.aws2-kms.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-kms.pojo-request* | If we want to use a POJO request
as body or not | false | Boolean
| *camel.component.aws2-kms.proxy-host* | To define a proxy host when
instantiating the KMS client | | String
| *camel.component.aws2-kms.proxy-port* | To define a proxy port when
instantiating the KMS client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-kms.region* | The region in which EKS 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-kms.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-kms.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-kms.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
