[camel-kafka-connector] branch main updated: (chores) itests-aws2: use the default test infra container

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git


The following commit(s) were added to refs/heads/main by this push:
     new e59c781b9 (chores) itests-aws2: use the default test infra container
e59c781b9 is described below

commit e59c781b9676ba103d58912300d4ff87d92e88aa
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Jul 27 15:18:27 2022 +0200

    (chores) itests-aws2: use the default test infra container
---
 .../aws/v2/cw/sink/CamelSinkAWSCWITCase.java             | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git 
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
 
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
index b14ac164c..e03bb7513 100644
--- 
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
+++ 
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
@@ -29,10 +29,7 @@ import 
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
 import org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
 import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSLocalContainerService;
-import org.apache.camel.test.infra.aws2.services.AWSRemoteService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.Service;
 import org.apache.camel.test.infra.common.TestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,11 +54,7 @@ public class CamelSinkAWSCWITCase extends 
CamelSinkTestSupport {
 
     @RegisterExtension
     public static AWSService awsService = AWSServiceFactory
-            .builder()
-            .addRemoteMapping(AWSRemoteService::new)
-            .addLocalMapping(CustomAWSCloudWatchLocalContainerService::new)
-            .withPropertyNameFormat("%s-service.instance.type")
-            .build();
+            .createCloudWatchService();
 
     private static final Logger LOG = 
LoggerFactory.getLogger(CamelSinkAWSCWITCase.class);
 
@@ -72,13 +65,6 @@ public class CamelSinkAWSCWITCase extends 
CamelSinkTestSupport {
     private volatile int received;
     private final int expect = 10;
 
-    // Dimensions are broken in localstack implementation of CloudWatch 0.12.10
-    private static class CustomAWSCloudWatchLocalContainerService extends 
AWSLocalContainerService {
-        public CustomAWSCloudWatchLocalContainerService() {
-            super("localstack/localstack:0.12.9.1", Service.CLOUD_WATCH);
-        }
-    }
-
     private static class CustomProducer extends StringMessageProducer {
         public CustomProducer(String bootstrapServer, String topicName, int 
count) {
             super(bootstrapServer, topicName, count);