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/04/07 12:24:28 UTC

[camel] branch master updated (95866ee -> 41349c5)

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 95866ee  CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, Fixed CS
     new 67c6e23  CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, Lambda
     new 41349c5  CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, Fixed CS

The 2 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:
 .../aws2/lambda/Lambda2ComponentVerifierExtension.java   |  4 ++++
 .../lambda/LambdaComponentVerifierExtensionTest.java     | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)


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

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 41349c5965a0cbb6a30685458af782f5485ad2a2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 7 14:24:02 2020 +0200

    CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, Fixed CS
---
 .../camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
index b38a523..0f90b03 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws2.lambda;
 
 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;


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

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 67c6e2302541b3a742d182c78a0a8c6a7ff31c38
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 7 14:21:55 2020 +0200

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

diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
index 225ef1b..b38a523 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.lambda;
 
 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;
@@ -66,6 +67,10 @@ public class Lambda2ComponentVerifierExtension extends DefaultComponentVerifierE
 
         try {
             Lambda2Configuration configuration = setProperties(new Lambda2Configuration(), parameters);
+            if (!LambdaClient.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());
             LambdaClientBuilder clientBuilder = LambdaClient.builder();
             LambdaClient client = clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)).region(Region.of(configuration.getRegion())).build();
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentVerifierExtensionTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentVerifierExtensionTest.java
index 5af8e0f..c2bda52 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentVerifierExtensionTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentVerifierExtensionTest.java
@@ -71,4 +71,20 @@ public class LambdaComponentVerifierExtensionTest extends CamelTestSupport {
         assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
     }
 
+    @Test
+    public void testConnectivityAndRegion() throws Exception {
+        Component component = context().getComponent("aws2-lambda");
+        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("function", "myfunction");
+        parameters.put("operation", "invokeFunction");
+
+        ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
+
+        assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+    }
 }