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 c531c0f2c48398b39a0a6f2085f416671aff9ecd
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Sep 23 08:43:02 2020 +0200
Camel-AWS2-Eventbridge: Support eventbusNameOrArn like the other AWS*
components
---
.../org/apache/camel/catalog/components/aws2-eventbridge.json | 4 +---
.../apache/camel/component/aws2/eventbridge/EventbridgeComponent.java | 3 ---
.../eventbridge/integration/EventbridgePutRuleIntegrationTest.java | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
index 787ca71..14b2c20 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
@@ -25,7 +25,6 @@
"autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover
Client", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "Setting the
autoDiscoverClient mechanism, if true, the component will look for a client
instanc [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"deprecated": false, "secret": false, "description": "Component configuration"
},
"eventbridgeClient": { "kind": "property", "displayName": "Eventbridge
Client", "group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.services.eventbridge.EventBridgeClient",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "To use a existing
configured AWS Eventbridge as client" },
- "eventbusName": { "kind": "property", "displayName": "Eventbus Name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "default", "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "The eventbus name, the
default value is default and this means it will be the AWS event bus of your a
[...]
"eventPatternFile": { "kind": "property", "displayName": "Event Pattern
File", "group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "EventPattern File" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.eventbridge.EventbridgeOperations", "enum": [
"putRule", "putTargets", "removeTargets" ], "deprecated": false,
"deprecationNote": "", "secret": false, "defaultValue": "putRule",
"configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", [...]
@@ -40,10 +39,9 @@
"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" }
},
"properties": {
- "label": { "kind": "path", "displayName": "Label", "group": "producer",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "Logical name" },
+ "eventbusNameOrArn": { "kind": "path", "displayName": "Eventbus Name Or
Arn", "group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"secret": false, "description": "Event bus name or ARN" },
"autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover
Client", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "Setting the
autoDiscoverClient mechanism, if true, the component will look for a client
instan [...]
"eventbridgeClient": { "kind": "parameter", "displayName": "Eventbridge
Client", "group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.services.eventbridge.EventBridgeClient",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "To use a existing
configured AWS Eventbridge as client" },
- "eventbusName": { "kind": "parameter", "displayName": "Eventbus Name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "default", "configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "The eventbus name, the
default value is default and this means it will be the AWS event bus of your
[...]
"eventPatternFile": { "kind": "parameter", "displayName": "Event Pattern
File", "group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration", "description": "EventPattern File" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": 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 starting and cause the [...]
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.eventbridge.EventbridgeOperations", "enum": [
"putRule", "putTargets", "removeTargets" ], "deprecated": false,
"deprecationNote": "", "secret": false, "defaultValue": "putRule",
"configurationClass":
"org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration",
"configurationField": "configuration" [...]
diff --git
a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
index d8d0ec4..1547925 100644
---
a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
+++
b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
@@ -55,9 +55,6 @@ public class EventbridgeComponent extends DefaultComponent {
if (remaining == null || remaining.trim().length() == 0) {
throw new IllegalArgumentException("Event bus name must be
specified.");
}
- if (remaining.startsWith("arn:")) {
- remaining = remaining.substring(remaining.lastIndexOf(':') + 1,
remaining.length());
- }
EventbridgeConfiguration configuration
= this.configuration != null ? this.configuration.copy() : new
EventbridgeConfiguration();
configuration.setEventbusName(remaining);
diff --git
a/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
b/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
index 8c5cf75..d1ca459 100644
---
a/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
+++
b/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
@@ -43,7 +43,7 @@ public class EventbridgePutRuleIntegrationTest extends
CamelTestSupport {
EventBridgeClient client
= EventBridgeClient.builder()
.credentialsProvider(StaticCredentialsProvider.create(
- AwsBasicCredentials.create("xxxx", "yyyy")))
+ AwsBasicCredentials.create("xxxxx", "yyyy")))
.region(Region.EU_WEST_1).build();
@EndpointInject
