This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-20159 in repository https://gitbox.apache.org/repos/asf/camel.git
commit a43feed539e6343b83588b4fed850bb52441a5c0 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Nov 29 09:40:16 2023 +0100 CAMEL-20159 - Camel-AWS-Config: Add Test-infra module Signed-off-by: Andrea Cosentino <[email protected]> --- test-infra/camel-test-infra-aws-v2/pom.xml | 6 +++++ .../test/infra/aws2/clients/AWSSDKClientUtils.java | 5 ++++ ...ce.java => AWSConfigLocalContainerService.java} | 30 +++------------------- .../infra/aws2/services/AWSServiceFactory.java | 4 +++ .../camel/test/infra/aws2/services/Service.java | 1 + 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/test-infra/camel-test-infra-aws-v2/pom.xml b/test-infra/camel-test-infra-aws-v2/pom.xml index 857d11a15ba..4f9330ec4a6 100644 --- a/test-infra/camel-test-infra-aws-v2/pom.xml +++ b/test-infra/camel-test-infra-aws-v2/pom.xml @@ -129,6 +129,12 @@ <version>${aws-java-sdk2-version}</version> </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>config</artifactId> + <version>${aws-java-sdk2-version}</version> + </dependency> + <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>apache-client</artifactId> diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/clients/AWSSDKClientUtils.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/clients/AWSSDKClientUtils.java index c552483515b..fc31a4896f5 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/clients/AWSSDKClientUtils.java +++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/clients/AWSSDKClientUtils.java @@ -30,6 +30,7 @@ import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; import software.amazon.awssdk.core.SdkClient; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; +import software.amazon.awssdk.services.config.ConfigClient; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.services.ec2.Ec2Client; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @@ -143,6 +144,10 @@ public final class AWSSDKClientUtils { return newClient("SNS", SnsClient::builder); } + public static ConfigClient newConfigClient() { + return newClient("Config", ConfigClient::builder); + } + public static CloudWatchClient newCloudWatchClient() { return newClient("Cloud Watch", CloudWatchClient::builder); } diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSConfigLocalContainerService.java similarity index 59% copy from test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java copy to test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSConfigLocalContainerService.java index b79861e21e2..63e0aa5951b 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java +++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSConfigLocalContainerService.java @@ -17,32 +17,8 @@ package org.apache.camel.test.infra.aws2.services; -public enum Service { - CLOUD_WATCH("cloudwatch"), - DYNAMODB("dynamodb"), - EC2("ec2"), - EVENT_BRIDGE("eventbridge"), - IAM("iam"), - KINESIS("kinesis"), - KMS("kms"), - LAMBDA("lambda"), - S3("s3"), - SECRETS_MANAGER("secretsmanager"), - SNS("sns"), - SQS("sqs"), - STS("sts"); - - private final String serviceName; - - Service(String serviceName) { - this.serviceName = serviceName; - } - - public String getServiceName() { - return serviceName; - } - - public static String serviceName(Service service) { - return service.serviceName; +public class AWSConfigLocalContainerService extends AWSLocalContainerService { + public AWSConfigLocalContainerService() { + super(Service.CONFIG); } } diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java index 91f3af28acd..dcb06c49cb6 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java +++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java @@ -59,6 +59,10 @@ public final class AWSServiceFactory { return createService(AWSSNSLocalContainerService::new); } + public static AWSService createConfigService() { + return createService(AWSConfigLocalContainerService::new); + } + public static AWSService createCloudWatchService() { return createService(AWSCloudWatchLocalContainerService::new); } diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java index b79861e21e2..c3c383bbbd2 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java +++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/Service.java @@ -19,6 +19,7 @@ package org.apache.camel.test.infra.aws2.services; public enum Service { CLOUD_WATCH("cloudwatch"), + CONFIG("config"), DYNAMODB("dynamodb"), EC2("ec2"), EVENT_BRIDGE("eventbridge"),
