This is an automated email from the ASF dual-hosted git repository.
acosentino 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 997de421846 [create-pull-request] automated change
997de421846 is described below
commit 997de421846d6d6edca745e8f0271ea126ccb308
Author: oscerd <osc...@users.noreply.github.com>
AuthorDate: Fri Mar 17 01:08:16 2023 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/aws2-s3.json | 8 ++++--
.../src/main/docs/aws2-s3.json | 15 ++++++++++-
.../springboot/AWS2S3ComponentConfiguration.java | 30 ++++++++++++++++++++--
3 files changed, 48 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
index 7ec0839459a..eac36b45de2 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
@@ -31,13 +31,15 @@
"pojoRequest": { "kind": "property", "displayName": "Pojo Request",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"policy": { "kind": "property", "displayName": "Policy", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The policy for this
queue to set in the com.amazonaws.services.s3.AmazonS3#setBucketPolicy()
method." },
"prefix": { "kind": "property", "displayName": "Prefix", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The prefix which is used
in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume
objects we are interested in." },
+ "profileCredentialsName": { "kind": "property", "displayName": "Profile
Credentials Name", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If using a profile credentials provider this
parameter will set the profile name" },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the SQS client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"common", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Specify a proxy port to
be used inside the client definition." },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol",
"group": "common", "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "To define a proxy protocol when instantiating
th [...]
"region": { "kind": "property", "displayName": "Region", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The region in which S3
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region (f [...]
"trustAllCertificates": { "kind": "property", "displayName": "Trust All
Certificates", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
"uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint
Override", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "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": "common", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a def [...]
+ "useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "group": "common", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a def [...]
+ "useProfileCredentialsProvider": { "kind": "property", "displayName": "Use
Profile Credentials Provider", "group": "common", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a pro [...]
"customerAlgorithm": { "kind": "property", "displayName": "Customer
Algorithm", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the customer algorithm to use in case
CustomerKey is enabled" },
"customerKeyId": { "kind": "property", "displayName": "Customer Key Id",
"group": "common (advanced)", "label": "common,advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the id of Customer key to use in case
CustomerKey is enabled" },
"customerKeyMD5": { "kind": "property", "displayName": "Customer Key MD5",
"group": "common (advanced)", "label": "common,advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the MD5 of Customer key to use in case
CustomerKey is enabled" },
@@ -116,13 +118,15 @@
"pojoRequest": { "kind": "parameter", "displayName": "Pojo Request",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"policy": { "kind": "parameter", "displayName": "Policy", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The policy for this
queue to set in the com.amazonaws.services.s3.AmazonS3#setBucketPolicy()
method." },
"prefix": { "kind": "parameter", "displayName": "Prefix", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The prefix which is used
in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume
objects we are interested in." },
+ "profileCredentialsName": { "kind": "parameter", "displayName": "Profile
Credentials Name", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If using a profile credentials provider this
parameter will set the profile name" },
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the SQS client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"common", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Specify a proxy port to
be used inside the client definition." },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "common", "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "To define a proxy protocol when instantiating
t [...]
"region": { "kind": "parameter", "displayName": "Region", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The region in which S3
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": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
"uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint
Override", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "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": "common", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a de [...]
+ "useDefaultCredentialsProvider": { "kind": "parameter", "displayName":
"Use Default Credentials Provider", "group": "common", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a de [...]
+ "useProfileCredentialsProvider": { "kind": "parameter", "displayName":
"Use Profile Credentials Provider", "group": "common", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a pr [...]
"customerAlgorithm": { "kind": "parameter", "displayName": "Customer
Algorithm", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the customer algorithm to use in case
CustomerKey is enabled" },
"customerKeyId": { "kind": "parameter", "displayName": "Customer Key Id",
"group": "common (advanced)", "label": "common,advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the id of Customer key to use in case
CustomerKey is enabled" },
"customerKeyMD5": { "kind": "parameter", "displayName": "Customer Key
MD5", "group": "common (advanced)", "label": "common,advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the MD5 of Customer key to use in case
CustomerKey is enabled" },
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
index df7f3c3005c..213c70a76d5 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
+++ b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
@@ -257,6 +257,12 @@
"description": "The prefix which is used in the
com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we
are interested in.",
"sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration"
},
+ {
+ "name": "camel.component.aws2-s3.profile-credentials-name",
+ "type": "java.lang.String",
+ "description": "If using a profile credentials provider this parameter
will set the profile name",
+ "sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration"
+ },
{
"name": "camel.component.aws2-s3.proxy-host",
"type": "java.lang.String",
@@ -342,7 +348,14 @@
{
"name": "camel.component.aws2-s3.use-default-credentials-provider",
"type": "java.lang.Boolean",
- "description": "Set whether the S3 client should expect to load
credentials through a default credentials provider or to expect static
credentials to be passed in.",
+ "description": "Set whether the S3 client should expect to load
credentials through a default credentials provider.",
+ "sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration",
+ "defaultValue": false
+ },
+ {
+ "name": "camel.component.aws2-s3.use-profile-credentials-provider",
+ "type": "java.lang.Boolean",
+ "description": "Set whether the S3 client should expect to load
credentials through a profile credentials provider.",
"sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration",
"defaultValue": false
},
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
index 599d4465b6d..d26106ece33 100644
---
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
+++
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
@@ -91,6 +91,11 @@ public class AWS2S3ComponentConfiguration
* objects we are interested in.
*/
private String prefix;
+ /**
+ * If using a profile credentials provider this parameter will set the
+ * profile name
+ */
+ private String profileCredentialsName;
/**
* To define a proxy host when instantiating the SQS client
*/
@@ -120,10 +125,14 @@ public class AWS2S3ComponentConfiguration
private String uriEndpointOverride;
/**
* Set whether the S3 client should expect to load credentials through a
- * default credentials provider or to expect static credentials to be
passed
- * in.
+ * default credentials provider.
*/
private Boolean useDefaultCredentialsProvider = false;
+ /**
+ * Set whether the S3 client should expect to load credentials through a
+ * profile credentials provider.
+ */
+ private Boolean useProfileCredentialsProvider = false;
/**
* Define the customer algorithm to use in case CustomerKey is enabled
*/
@@ -387,6 +396,14 @@ public class AWS2S3ComponentConfiguration
this.prefix = prefix;
}
+ public String getProfileCredentialsName() {
+ return profileCredentialsName;
+ }
+
+ public void setProfileCredentialsName(String profileCredentialsName) {
+ this.profileCredentialsName = profileCredentialsName;
+ }
+
public String getProxyHost() {
return proxyHost;
}
@@ -444,6 +461,15 @@ public class AWS2S3ComponentConfiguration
this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
}
+ public Boolean getUseProfileCredentialsProvider() {
+ return useProfileCredentialsProvider;
+ }
+
+ public void setUseProfileCredentialsProvider(
+ Boolean useProfileCredentialsProvider) {
+ this.useProfileCredentialsProvider = useProfileCredentialsProvider;
+ }
+
public String getCustomerAlgorithm() {
return customerAlgorithm;
}
