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 026c2d5242b53b2f664b095cb1925afa76052047 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Apr 6 17:08:59 2020 +0200 CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, EKS --- .../aws2/eks/EKS2ComponentVerifierExtension.java | 4 ++++ .../aws2/eks/EKS2ComponentVerifierExtensionTest.java | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtension.java b/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtension.java index 309cf2d..bc0470f 100644 --- a/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtension.java +++ b/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtension.java @@ -67,6 +67,10 @@ public class EKS2ComponentVerifierExtension extends DefaultComponentVerifierExte try { EKS2Configuration configuration = setProperties(new EKS2Configuration(), parameters); + if (!EksClient.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()); EksClientBuilder clientBuilder = EksClient.builder(); EksClient client = clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)).region(Region.of(configuration.getRegion())).build(); diff --git a/components/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtensionTest.java b/components/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtensionTest.java index 9730931..1a7ee4f 100644 --- a/components/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtensionTest.java +++ b/components/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentVerifierExtensionTest.java @@ -70,5 +70,22 @@ public class EKS2ComponentVerifierExtensionTest extends CamelTestSupport { assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); } + + @Test + public void testConnectivityAndRegion() throws Exception { + Component component = context().getComponent("aws2-eks"); + 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", EKS2Operations.listClusters); + + ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters); + + assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); + } }
