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 63b6743c21585d7535ea77de547763c5a2daf53d Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Apr 7 10:29:30 2020 +0200 CAMEL-14850 - Camel-AWS2-*: Improve the verifiers to check if a particular service works on a specified region, Kinesis --- .../component/aws2/kinesis/Kinesis2ComponentVerifierExtension.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentVerifierExtension.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentVerifierExtension.java index f082ff0..ad1cab3 100644 --- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentVerifierExtension.java +++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentVerifierExtension.java @@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.kinesis; 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; @@ -26,6 +27,7 @@ import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.firehose.FirehoseClient; import software.amazon.awssdk.services.kinesis.KinesisClient; import software.amazon.awssdk.services.kinesis.KinesisClientBuilder; @@ -67,6 +69,10 @@ public class Kinesis2ComponentVerifierExtension extends DefaultComponentVerifier try { Kinesis2Configuration configuration = setProperties(new Kinesis2Configuration(), parameters); + if (!KinesisClient.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()); KinesisClientBuilder clientBuilder = KinesisClient.builder(); KinesisClient client = clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)).region(Region.of(configuration.getRegion())).build();
