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 a2e6066 CAMEL-16171 - Add uri-endpoint-override options to all AWS2
components - AWS2-STS component
a2e6066 is described below
commit a2e606646c2247ea1d6b372f8fa01aac165a4ca6
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Mar 4 13:11:01 2021 +0100
CAMEL-16171 - Add uri-endpoint-override options to all AWS2 components -
AWS2-STS component
---
.../springboot/catalog/components/aws2-sts.json | 4 ++++
.../src/main/docs/aws2-sts-starter.adoc | 4 +++-
.../sts/springboot/STS2ComponentConfiguration.java | 26 ++++++++++++++++++++++
docs/modules/ROOT/pages/aws2-sts-starter.adoc | 4 +++-
4 files changed, 36 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json
index 2748c87..1772329 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json
@@ -25,6 +25,7 @@
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.sts.STS2Configuration",
"deprecated": false, "autowired": false, "secret": false, "description":
"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": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.sts.STS2Operations", "enum": [ "assumeRole",
"getSessionToken", "getFederationToken" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
"assumeRole", "configurationClass":
"org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField":
"configura [...]
+ "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.sts.STS2Configuration", "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.sts.STS2Configuration", "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.sts.STS2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the STS 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.sts.STS2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the STS client" },
@@ -32,6 +33,7 @@
"region": { "kind": "property", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "aws-global", "configurationClass":
"org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField":
"configuration", "description": "The region in which STS client needs to work.
When using this parameter, the configuration will expect the [...]
"stsClient": { "kind": "property", "displayName": "Sts Client", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"software.amazon.awssdk.services.sts.StsClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration",
"configurationField": "configuration", "description": "To use a existing
configured AWS STS as client" },
"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.sts.STS2Configuration", "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.sts.STS2Configuration", "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.sts.STS2Configuration", "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.sts.STS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
@@ -40,6 +42,7 @@
"label": { "kind": "path", "displayName": "Label", "group": "producer",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField":
"configuration", "description": "Logical name" },
"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.sts.STS2Operations", "enum": [ "assumeRole",
"getSessionToken", "getFederationToken" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
"assumeRole", "configurationClass":
"org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField":
"configur [...]
+ "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.sts.STS2Configuration", "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.sts.STS2Configuration", "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.sts.STS2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the STS 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.sts.STS2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the STS client" },
@@ -47,6 +50,7 @@
"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "aws-global", "configurationClass":
"org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField":
"configuration", "description": "The region in which STS client needs to work.
When using this parameter, the configuration will expect th [...]
"stsClient": { "kind": "parameter", "displayName": "Sts Client", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"software.amazon.awssdk.services.sts.StsClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration",
"configurationField": "configuration", "description": "To use a existing
configured AWS STS as client" },
"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.sts.STS2Configuration", "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.sts.STS2Configuration", "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.sts.STS2Configuration", "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.sts.STS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
}
diff --git
a/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc
b/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc
index 0f5fda3..3a04066 100644
---
a/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc
+++
b/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-sts 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.
@@ -30,6 +30,7 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-sts.enabled* | Whether to enable auto configuration of
the aws2-sts component. This is enabled by default. | | Boolean
| *camel.component.aws2-sts.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-sts.operation* | The operation to perform | |
STS2Operations
+| *camel.component.aws2-sts.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-sts.pojo-request* | If we want to use a POJO request
as body or not | false | Boolean
| *camel.component.aws2-sts.proxy-host* | To define a proxy host when
instantiating the STS client | | String
| *camel.component.aws2-sts.proxy-port* | To define a proxy port when
instantiating the STS client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-sts.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-sts.sts-client* | To use a existing configured AWS STS
as client. The option is a software.amazon.awssdk.services.sts.StsClient type.
| | StsClient
| *camel.component.aws2-sts.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-sts.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-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java
b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java
index 59b5897..6ec1cde 100644
---
a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java
@@ -62,6 +62,11 @@ public class STS2ComponentConfiguration
*/
private STS2Operations operation = STS2Operations.assumeRole;
/**
+ * 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 STS2ComponentConfiguration
*/
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
@@ -134,6 +144,14 @@ public class STS2ComponentConfiguration
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 STS2ComponentConfiguration
this.trustAllCertificates = trustAllCertificates;
}
+ public String getUriEndpointOverride() {
+ return uriEndpointOverride;
+ }
+
+ public void setUriEndpointOverride(String uriEndpointOverride) {
+ this.uriEndpointOverride = uriEndpointOverride;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
diff --git a/docs/modules/ROOT/pages/aws2-sts-starter.adoc
b/docs/modules/ROOT/pages/aws2-sts-starter.adoc
index 0f5fda3..3a04066 100644
--- a/docs/modules/ROOT/pages/aws2-sts-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-sts-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-sts 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.
@@ -30,6 +30,7 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-sts.enabled* | Whether to enable auto configuration of
the aws2-sts component. This is enabled by default. | | Boolean
| *camel.component.aws2-sts.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-sts.operation* | The operation to perform | |
STS2Operations
+| *camel.component.aws2-sts.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-sts.pojo-request* | If we want to use a POJO request
as body or not | false | Boolean
| *camel.component.aws2-sts.proxy-host* | To define a proxy host when
instantiating the STS client | | String
| *camel.component.aws2-sts.proxy-port* | To define a proxy port when
instantiating the STS client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-sts.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-sts.sts-client* | To use a existing configured AWS STS
as client. The option is a software.amazon.awssdk.services.sts.StsClient type.
| | StsClient
| *camel.component.aws2-sts.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-sts.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
