You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/20 10:33:32 UTC
[camel] branch master updated (aab1568 -> 195984e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from aab1568 [CAMEL-11731] ensure camel-servlet can be used in really async mode (#4617)
new 6e0f247 CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS
new 781c1b8 CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS Regen
new c4142cc CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS Catalog
new 195984e CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS added note to migration guide
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/catalog/components/aws2-sns.json | 4 ++--
.../org/apache/camel/catalog/docs/aws2-sns-component.adoc | 4 ++--
.../camel/component/aws2/sns/Sns2ComponentConfigurer.java | 12 ++++++------
.../camel/component/aws2/sns/Sns2EndpointConfigurer.java | 12 ++++++------
.../camel/component/aws2/sns/Sns2EndpointUriFactory.java | 2 +-
.../org/apache/camel/component/aws2/sns/aws2-sns.json | 4 ++--
.../camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 4 ++--
.../apache/camel/component/aws2/sns/Sns2Configuration.java | 10 +++++-----
.../camel/component/aws2/sns/client/Sns2ClientFactory.java | 2 +-
.../component/dsl/Aws2SnsComponentBuilderFactory.java | 8 ++++----
.../builder/endpoint/dsl/Sns2EndpointBuilderFactory.java | 10 ++++++----
docs/components/modules/ROOT/pages/aws2-sns-component.adoc | 4 ++--
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 4 ++++
13 files changed, 43 insertions(+), 37 deletions(-)
[camel] 04/04: CAMEL-15843 - Camel-AWS2: Rename useIamCredentials
to useDefaultCredentialProvider where it is used,
SNS added note to migration guide
Posted by ac...@apache.org.
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.git
commit 195984ee9d4ef438e4d9e4efbf19000d73ce9e39
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 11:32:30 2020 +0100
CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS added note to migration guide
---
docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
index c6668c7..def8346 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
@@ -243,6 +243,10 @@ In this context, it wasn't having any sense to maintain the autodiscoverClient o
The camel-aws2-sns has now support for autowiring the amazonSNSClient option with SnsClient instance coming from the registry.
In this context, it wasn't having any sense to maintain the autodiscoverClient option, which has been now removed.
+=== Camel-AWS2-SNS UseIamCredentials
+
+The option useIamCredentials has been renamed to useDefaultCredentialsProvider, since we changed to a DefaultCredentialsProvider approach.
+
=== Camel-AWS2-SQS Autowire support
The camel-aws2-sqs has now support for autowiring the amazonSQSClient option with SqsClient instance coming from the registry.
[camel] 03/04: CAMEL-15843 - Camel-AWS2: Rename useIamCredentials
to useDefaultCredentialProvider where it is used, SNS Catalog
Posted by ac...@apache.org.
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.git
commit c4142ccbd364db173e18565edf722c57529be425
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 11:31:40 2020 +0100
CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS Catalog
---
.../resources/org/apache/camel/catalog/components/aws2-sns.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
index 4316ded..6ac26c6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
@@ -38,7 +38,7 @@
"subject": { "kind": "property", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "property", "displayName": "Subscribe SNSto SQS", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Define if the subscription between SNS Topic and SQS must be done or not" },
"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.sns.Sns2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" },
- "useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect [...]
+ "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS i [...]
"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.sns.Sns2Configuration", "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
@@ -61,7 +61,7 @@
"subject": { "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "parameter", "displayName": "Subscribe SNSto SQS", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Define if the subscription between SNS Topic and SQS must be done or not" },
"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.sns.Sns2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" },
- "useIAMCredentials": { "kind": "parameter", "displayName": "Use IAMCredentials", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expec [...]
+ "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS [...]
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
"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.sns.Sns2Configuration", "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
[camel] 01/04: CAMEL-15843 - Camel-AWS2: Rename useIamCredentials
to useDefaultCredentialProvider where it is used, SNS
Posted by ac...@apache.org.
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.git
commit 6e0f247cad50bce0e938a5d6e1abf71db71ace71
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 11:19:54 2020 +0100
CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS
---
.../org/apache/camel/component/aws2/sns/Sns2Configuration.java | 10 +++++-----
.../camel/component/aws2/sns/client/Sns2ClientFactory.java | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
index 3b57d19..043116b 100644
--- a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
+++ b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
@@ -66,7 +66,7 @@ public class Sns2Configuration implements Cloneable {
@UriParam(defaultValue = "false")
private boolean trustAllCertificates;
@UriParam(defaultValue = "false")
- private boolean useIAMCredentials;
+ private boolean useDefaultCredentialsProvider;
public String getSubject() {
return subject;
@@ -267,16 +267,16 @@ public class Sns2Configuration implements Cloneable {
this.trustAllCertificates = trustAllCertificates;
}
- public boolean isUseIAMCredentials() {
- return useIAMCredentials;
+ public boolean isUseDefaultCredentialsProvider() {
+ return useDefaultCredentialsProvider;
}
/**
* Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static
* credentials to be passed in.
*/
- public void setUseIAMCredentials(boolean useIAMCredentials) {
- this.useIAMCredentials = useIAMCredentials;
+ public void setUseDefaultCredentialsProvider(boolean useDefaultCredentialsProvider) {
+ this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
}
// *************************************************
diff --git a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/Sns2ClientFactory.java b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/Sns2ClientFactory.java
index 3e1fd60..bae1e95 100644
--- a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/Sns2ClientFactory.java
+++ b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/Sns2ClientFactory.java
@@ -35,7 +35,7 @@ public final class Sns2ClientFactory {
* @return SNSClient
*/
public static Sns2InternalClient getSnsClient(Sns2Configuration configuration) {
- return configuration.isUseIAMCredentials()
+ return configuration.isUseDefaultCredentialsProvider()
? new Sns2ClientIAMOptimized(configuration) : new Sns2ClientStandardImpl(configuration);
}
}
[camel] 02/04: CAMEL-15843 - Camel-AWS2: Rename useIamCredentials
to useDefaultCredentialProvider where it is used, SNS Regen
Posted by ac...@apache.org.
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.git
commit 781c1b87b2eb90c854bf433ffb22254f07b00187
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 11:21:33 2020 +0100
CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to useDefaultCredentialProvider where it is used, SNS Regen
---
.../org/apache/camel/catalog/docs/aws2-sns-component.adoc | 4 ++--
.../camel/component/aws2/sns/Sns2ComponentConfigurer.java | 12 ++++++------
.../camel/component/aws2/sns/Sns2EndpointConfigurer.java | 12 ++++++------
.../camel/component/aws2/sns/Sns2EndpointUriFactory.java | 2 +-
.../org/apache/camel/component/aws2/sns/aws2-sns.json | 4 ++--
.../camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 4 ++--
.../component/dsl/Aws2SnsComponentBuilderFactory.java | 8 ++++----
.../builder/endpoint/dsl/Sns2EndpointBuilderFactory.java | 10 ++++++----
docs/components/modules/ROOT/pages/aws2-sns-component.adoc | 4 ++--
9 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
index cffbd92..7244117 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
@@ -68,7 +68,7 @@ The AWS 2 Simple Notification System (SNS) component supports 20 options, which
| *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
-| *useIAMCredentials* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
| *autowiredEnabled* (advanced) | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
@@ -120,7 +120,7 @@ with the following path and query parameters:
| *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
-| *useIAMCredentials* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
index 6fa2db7..ff85612 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
@@ -62,8 +62,8 @@ public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implement
case "subscribeSNStoSQS": getOrCreateConfiguration(target).setSubscribeSNStoSQS(property(camelContext, boolean.class, value)); return true;
case "trustallcertificates":
case "trustAllCertificates": getOrCreateConfiguration(target).setTrustAllCertificates(property(camelContext, boolean.class, value)); return true;
- case "useiamcredentials":
- case "useIAMCredentials": getOrCreateConfiguration(target).setUseIAMCredentials(property(camelContext, boolean.class, value)); return true;
+ case "usedefaultcredentialsprovider":
+ case "useDefaultCredentialsProvider": getOrCreateConfiguration(target).setUseDefaultCredentialsProvider(property(camelContext, boolean.class, value)); return true;
default: return false;
}
}
@@ -110,8 +110,8 @@ public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implement
case "subscribeSNStoSQS": return boolean.class;
case "trustallcertificates":
case "trustAllCertificates": return boolean.class;
- case "useiamcredentials":
- case "useIAMCredentials": return boolean.class;
+ case "usedefaultcredentialsprovider":
+ case "useDefaultCredentialsProvider": return boolean.class;
default: return null;
}
}
@@ -154,8 +154,8 @@ public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implement
case "subscribeSNStoSQS": return getOrCreateConfiguration(target).isSubscribeSNStoSQS();
case "trustallcertificates":
case "trustAllCertificates": return getOrCreateConfiguration(target).isTrustAllCertificates();
- case "useiamcredentials":
- case "useIAMCredentials": return getOrCreateConfiguration(target).isUseIAMCredentials();
+ case "usedefaultcredentialsprovider":
+ case "useDefaultCredentialsProvider": return getOrCreateConfiguration(target).isUseDefaultCredentialsProvider();
default: return null;
}
}
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
index f6db53f..f551b0f 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
@@ -55,8 +55,8 @@ public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements
case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
case "trustallcertificates":
case "trustAllCertificates": target.getConfiguration().setTrustAllCertificates(property(camelContext, boolean.class, value)); return true;
- case "useiamcredentials":
- case "useIAMCredentials": target.getConfiguration().setUseIAMCredentials(property(camelContext, boolean.class, value)); return true;
+ case "usedefaultcredentialsprovider":
+ case "useDefaultCredentialsProvider": target.getConfiguration().setUseDefaultCredentialsProvider(property(camelContext, boolean.class, value)); return true;
default: return false;
}
}
@@ -103,8 +103,8 @@ public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements
case "synchronous": return boolean.class;
case "trustallcertificates":
case "trustAllCertificates": return boolean.class;
- case "useiamcredentials":
- case "useIAMCredentials": return boolean.class;
+ case "usedefaultcredentialsprovider":
+ case "useDefaultCredentialsProvider": return boolean.class;
default: return null;
}
}
@@ -147,8 +147,8 @@ public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements
case "synchronous": return target.isSynchronous();
case "trustallcertificates":
case "trustAllCertificates": return target.getConfiguration().isTrustAllCertificates();
- case "useiamcredentials":
- case "useIAMCredentials": return target.getConfiguration().isUseIAMCredentials();
+ case "usedefaultcredentialsprovider":
+ case "useDefaultCredentialsProvider": return target.getConfiguration().isUseDefaultCredentialsProvider();
default: return null;
}
}
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
index 4ebcb97..c2a7e5a 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
@@ -21,7 +21,6 @@ public class Sns2EndpointUriFactory extends org.apache.camel.support.component.E
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
Set<String> props = new HashSet<>(21);
- props.add("useIAMCredentials");
props.add("serverSideEncryptionEnabled");
props.add("autoCreateTopic");
props.add("proxyProtocol");
@@ -31,6 +30,7 @@ public class Sns2EndpointUriFactory extends org.apache.camel.support.component.E
props.add("subscribeSNStoSQS");
props.add("queueUrl");
props.add("messageStructure");
+ props.add("useDefaultCredentialsProvider");
props.add("proxyHost");
props.add("trustAllCertificates");
props.add("proxyPort");
diff --git a/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json b/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
index 4316ded..6ac26c6 100644
--- a/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
+++ b/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
@@ -38,7 +38,7 @@
"subject": { "kind": "property", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "property", "displayName": "Subscribe SNSto SQS", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Define if the subscription between SNS Topic and SQS must be done or not" },
"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.sns.Sns2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" },
- "useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect [...]
+ "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS i [...]
"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.sns.Sns2Configuration", "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
@@ -61,7 +61,7 @@
"subject": { "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "parameter", "displayName": "Subscribe SNSto SQS", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Define if the subscription between SNS Topic and SQS must be done or not" },
"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.sns.Sns2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" },
- "useIAMCredentials": { "kind": "parameter", "displayName": "Use IAMCredentials", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expec [...]
+ "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS [...]
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
"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.sns.Sns2Configuration", "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.sns.Sns2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
diff --git a/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc b/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
index cffbd92..7244117 100644
--- a/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
+++ b/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
@@ -68,7 +68,7 @@ The AWS 2 Simple Notification System (SNS) component supports 20 options, which
| *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
-| *useIAMCredentials* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
| *autowiredEnabled* (advanced) | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
@@ -120,7 +120,7 @@ with the following path and query parameters:
| *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
-| *useIAMCredentials* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
index 5048a24..258a55f 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
@@ -266,9 +266,9 @@ public interface Aws2SnsComponentBuilderFactory {
* Default: false
* Group: producer
*/
- default Aws2SnsComponentBuilder useIAMCredentials(
- boolean useIAMCredentials) {
- doSetProperty("useIAMCredentials", useIAMCredentials);
+ default Aws2SnsComponentBuilder useDefaultCredentialsProvider(
+ boolean useDefaultCredentialsProvider) {
+ doSetProperty("useDefaultCredentialsProvider", useDefaultCredentialsProvider);
return this;
}
/**
@@ -351,7 +351,7 @@ public interface Aws2SnsComponentBuilderFactory {
case "subject": getOrCreateConfiguration((Sns2Component) component).setSubject((java.lang.String) value); return true;
case "subscribeSNStoSQS": getOrCreateConfiguration((Sns2Component) component).setSubscribeSNStoSQS((boolean) value); return true;
case "trustAllCertificates": getOrCreateConfiguration((Sns2Component) component).setTrustAllCertificates((boolean) value); return true;
- case "useIAMCredentials": getOrCreateConfiguration((Sns2Component) component).setUseIAMCredentials((boolean) value); return true;
+ case "useDefaultCredentialsProvider": getOrCreateConfiguration((Sns2Component) component).setUseDefaultCredentialsProvider((boolean) value); return true;
case "autowiredEnabled": ((Sns2Component) component).setAutowiredEnabled((boolean) value); return true;
case "accessKey": getOrCreateConfiguration((Sns2Component) component).setAccessKey((java.lang.String) value); return true;
case "secretKey": getOrCreateConfiguration((Sns2Component) component).setSecretKey((java.lang.String) value); return true;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
index b40ad23..33a2603 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
@@ -373,8 +373,9 @@ public interface Sns2EndpointBuilderFactory {
* Default: false
* Group: producer
*/
- default Sns2EndpointBuilder useIAMCredentials(boolean useIAMCredentials) {
- doSetProperty("useIAMCredentials", useIAMCredentials);
+ default Sns2EndpointBuilder useDefaultCredentialsProvider(
+ boolean useDefaultCredentialsProvider) {
+ doSetProperty("useDefaultCredentialsProvider", useDefaultCredentialsProvider);
return this;
}
/**
@@ -386,8 +387,9 @@ public interface Sns2EndpointBuilderFactory {
* Default: false
* Group: producer
*/
- default Sns2EndpointBuilder useIAMCredentials(String useIAMCredentials) {
- doSetProperty("useIAMCredentials", useIAMCredentials);
+ default Sns2EndpointBuilder useDefaultCredentialsProvider(
+ String useDefaultCredentialsProvider) {
+ doSetProperty("useDefaultCredentialsProvider", useDefaultCredentialsProvider);
return this;
}
/**
diff --git a/docs/components/modules/ROOT/pages/aws2-sns-component.adoc b/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
index e75e7fd..cd25819 100644
--- a/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
@@ -70,7 +70,7 @@ The AWS 2 Simple Notification System (SNS) component supports 20 options, which
| *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
-| *useIAMCredentials* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
| *autowiredEnabled* (advanced) | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
@@ -122,7 +122,7 @@ with the following path and query parameters:
| *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
-| *useIAMCredentials* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String