This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new d2dc2d6 Regen
d2dc2d6 is described below
commit d2dc2d6374aee60d4f6c39ad2d2175b5642b68e1
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri May 14 10:09:00 2021 +0200
Regen
---
.../camel/springboot/catalog/components/aws2-kms.json | 2 ++
.../camel/springboot/catalog/components/mongodb.json | 3 +++
.../src/main/docs/aws2-kms-starter.adoc | 3 ++-
.../aws2/kms/springboot/KMS2ComponentConfiguration.java | 15 +++++++++++++++
docs/modules/ROOT/pages/aws2-kms-starter.adoc | 3 ++-
5 files changed, 24 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 b00cb80..8d367d1 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
@@ -34,6 +34,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.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" },
+ "useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "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 whether the KMS
client should expect to load credentials through a d [...]
"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" }
@@ -51,6 +52,7 @@
"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" },
+ "useDefaultCredentialsProvider": { "kind": "parameter", "displayName":
"Use Default Credentials Provider", "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 whether the KMS
client should expect to load credentials through a [...]
"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/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
index 6123f56..284fc7a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
@@ -33,6 +33,7 @@
"collectionIndex": { "kind": "parameter", "displayName": "Collection
Index", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the collection index (JSON FORMAT : {
field1 : order1, field2 : order2})" },
"createCollection": { "kind": "parameter", "displayName": "Create
Collection", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Create collection during
initialisation if it doesn't exist. Default is true." },
"database": { "kind": "parameter", "displayName": "Database", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the name of the MongoDB database to target" },
+ "hosts": { "kind": "parameter", "displayName": "Hosts", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Host address of mongodb server in host:port format. It's
possible also use more than one address, as comma separated list of hosts:
host1:port1,host2:port2. If hosts parameter is specified, provided
connectionBean is ignored." },
"mongoConnection": { "kind": "parameter", "displayName": "Mongo
Connection", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "com.mongodb.client.MongoClient", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the connection bean
used as a client for connecting to a database." },
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"common", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.mongodb.MongoDbOperation", "enum": [ "findById",
"findOneByQuery", "findAll", "findDistinct", "insert", "save", "update",
"remove", "bulkWrite", "aggregate", "getDbStats", "getColStats", "count",
"command" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the operation this endpoint [...]
"outputType": { "kind": "parameter", "displayName": "Output Type",
"group": "common", "label": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.component.mongodb.MongoDbOutputType", "enum": [
"DocumentList", "Document", "MongoIterable" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Convert the output of the
producer to the selected type : DocumentList Document or MongoIterable.
DocumentList or MongoIterable applies to findAll [...]
@@ -47,6 +48,8 @@
"writeConcern": { "kind": "parameter", "displayName": "Write Concern",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "ACKNOWLEDGED", "W1", "W2", "W3",
"UNACKNOWLEDGED", "JOURNALED", "MAJORITY" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "ACKNOWLEDGED", "description":
"Configure the connection bean with the level of acknowledgment requested from
MongoDB for write operations to a [...]
"writeResultAsHeader": { "kind": "parameter", "displayName": "Write Result
As Header", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "In write
operations, it determines whether instead of returning WriteResult as the body
of the OUT message, we transfer the IN message to the OUT and attach the
WriteResult as a header." },
"streamFilter": { "kind": "parameter", "displayName": "Stream Filter",
"group": "changeStream", "label": "changeStream", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Filter condition for change streams
consumer." },
+ "password": { "kind": "parameter", "displayName": "Password", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "User password for mongodb connection" },
+ "username": { "kind": "parameter", "displayName": "Username", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "Username for mongodb connection" },
"persistentId": { "kind": "parameter", "displayName": "Persistent Id",
"group": "tail", "label": "tail", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "One tail tracking collection can host many
trackers for several tailable consumers. To keep them separate, each tracker
should have its own unique persistentId." },
"persistentTailTracking": { "kind": "parameter", "displayName":
"Persistent Tail Tracking", "group": "tail", "label": "tail", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Enable persistent tail tracking, which is a mechanism to keep track of the
last consumed message across system restarts. The next time the system is up,
the endpoint will recover the cursor from the point [...]
"tailTrackCollection": { "kind": "parameter", "displayName": "Tail Track
Collection", "group": "tail", "label": "tail", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Collection where tail tracking
information will be persisted. If not specified,
MongoDbTailTrackingConfig#DEFAULT_COLLECTION will be used by default." },
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 de2dfb7..0d9378f 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 16 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -40,5 +40,6 @@ The component supports 16 options, which are listed below.
| *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
+| *camel.component.aws2-kms.use-default-credentials-provider* | Set whether
the KMS client should expect to load credentials through a default credentials
provider or to expect static credentials to be passed in. | false | Boolean
|===
// 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 a98cd92..2a5554f 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
@@ -103,6 +103,12 @@ public class KMS2ComponentConfiguration
*/
private String uriEndpointOverride;
/**
+ * Set whether the KMS client should expect to load credentials through a
+ * default credentials provider or to expect static credentials to be
passed
+ * in.
+ */
+ private Boolean useDefaultCredentialsProvider = false;
+ /**
* 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
@@ -216,6 +222,15 @@ public class KMS2ComponentConfiguration
this.uriEndpointOverride = uriEndpointOverride;
}
+ public Boolean getUseDefaultCredentialsProvider() {
+ return useDefaultCredentialsProvider;
+ }
+
+ public void setUseDefaultCredentialsProvider(
+ Boolean useDefaultCredentialsProvider) {
+ this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
diff --git a/docs/modules/ROOT/pages/aws2-kms-starter.adoc
b/docs/modules/ROOT/pages/aws2-kms-starter.adoc
index de2dfb7..0d9378f 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 16 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -40,5 +40,6 @@ The component supports 16 options, which are listed below.
| *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
+| *camel.component.aws2-kms.use-default-credentials-provider* | Set whether
the KMS client should expect to load credentials through a default credentials
provider or to expect static credentials to be passed in. | false | Boolean
|===
// spring-boot-auto-configure options: END
