[camel] 01/02: CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, MQ

[acosentino]

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 566667cd79fe371a4e2b74d54f3e2364e2b46657
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 8 08:01:51 2020 +0200

    CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular 
service works on a specified region, MQ
---
 .../component/aws2/mq/MQ2ComponentVerifierExtension.java |  5 +++++
 .../aws2/mq/MQComponentVerifierExtensionTest.java        | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git 
a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java
 
b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java
index d3e41bc..c5ee595 100644
--- 
a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java
+++ 
b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.mq;
 
 import java.util.Map;
 
+import 
org.apache.camel.component.extension.ComponentVerifierExtension.VerificationError;
 import 
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
@@ -67,6 +68,10 @@ public class MQ2ComponentVerifierExtension extends 
DefaultComponentVerifierExten
 
         try {
             MQ2Configuration configuration = setProperties(new 
MQ2Configuration(), parameters);
+            if 
(!MqClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
 {
+                ResultErrorBuilder errorBuilder = 
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER,
 "The service is not supported in this region");
+                return builder.error(errorBuilder.build()).build();
+            }
             AwsBasicCredentials cred = 
AwsBasicCredentials.create(configuration.getAccessKey(), 
configuration.getSecretKey());
             MqClientBuilder clientBuilder = MqClient.builder();
             MqClient client = 
clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)).region(Region.of(configuration.getRegion())).build();
diff --git 
a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java
 
b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java
index b5fadec..90f46f6 100644
--- 
a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java
+++ 
b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java
@@ -71,4 +71,20 @@ public class MQComponentVerifierExtensionTest extends 
CamelTestSupport {
         assertEquals(ComponentVerifierExtension.Result.Status.ERROR, 
result.getStatus());
     }
 
+    @Test
+    public void testConnectivityAndRegion() throws Exception {
+        Component component = context().getComponent("aws2-mq");
+        ComponentVerifierExtension verifier = 
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("secretKey", "l");
+        parameters.put("accessKey", "k");
+        parameters.put("region", "l");
+        parameters.put("label", "test");
+        parameters.put("operation", MQ2Operations.listBrokers);
+
+        ComponentVerifierExtension.Result result = 
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
+
+        assertEquals(ComponentVerifierExtension.Result.Status.ERROR, 
result.getStatus());
+    }
 }