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

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


The following commit(s) were added to refs/heads/main by this push:
     new a753947  AWS2 components have to set client.endpointOverride() to work 
on Localstack #2216
a753947 is described below

commit a753947a4b76d9853dcbfe1a2b57d393c79769be
Author: Peter Palaga <[email protected]>
AuthorDate: Fri May 14 10:34:39 2021 +0200

    AWS2 components have to set client.endpointOverride() to work on Localstack 
#2216
---
 .../quarkus/component/aws2/cw/it/Aws2CwIT.java     |  3 --
 .../quarkus/component/aws2/cw/it/Aws2CwTest.java   |  3 --
 .../quarkus/component/aws2/ddb/it/Aws2DdbIT.java   |  2 --
 .../quarkus/component/aws2/ddb/it/Aws2DdbTest.java |  3 --
 .../component/aws2/lambda/it/Aws2LambdaIT.java     |  2 +-
 .../component/aws2/lambda/it/Aws2LambdaTest.java   | 33 ++++++++++++++++------
 .../quarkus/component/aws2/ses/it/Aws2SesIT.java   |  3 +-
 .../quarkus/component/aws2/ses/it/Aws2SesTest.java |  3 +-
 .../component/aws2/sqs/it/Aws2SqsSnsIT.java        |  2 --
 .../component/aws2/sqs/it/Aws2SqsSnsTest.java      |  3 --
 .../test/support/aws2/Aws2TestEnvContext.java      | 15 ++--------
 .../test/support/aws2/Aws2TestResource.java        |  2 +-
 12 files changed, 34 insertions(+), 40 deletions(-)

diff --git 
a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwIT.java
 
b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwIT.java
index b77875c..245e5c0 100644
--- 
a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwIT.java
+++ 
b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwIT.java
@@ -17,10 +17,7 @@
 package org.apache.camel.quarkus.component.aws2.cw.it;
 
 import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-//TODO disabled because of https://github.com/apache/camel-quarkus/issues/2216
-@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+")
 @NativeImageTest
 class Aws2CwIT extends Aws2CwTest {
 
diff --git 
a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java
 
b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java
index f5f42d7..7f92d0a 100644
--- 
a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java
+++ 
b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java
@@ -29,15 +29,12 @@ import 
org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
 import org.awaitility.Awaitility;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.testcontainers.containers.localstack.LocalStackContainer.Service;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatch.model.Datapoint;
 import 
software.amazon.awssdk.services.cloudwatch.model.GetMetricStatisticsRequest;
 import software.amazon.awssdk.services.cloudwatch.model.Statistic;
 
-//TODO disabled because of https://github.com/apache/camel-quarkus/issues/2216
-@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+")
 @QuarkusTest
 @QuarkusTestResource(Aws2TestResource.class)
 class Aws2CwTest {
diff --git 
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbIT.java
 
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbIT.java
index 31cdf1f..6370abc 100644
--- 
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbIT.java
+++ 
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbIT.java
@@ -17,10 +17,8 @@
 package org.apache.camel.quarkus.component.aws2.ddb.it;
 
 import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
 @NativeImageTest
-@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+") // TODO https://github.com/apache/camel-quarkus/issues/2216
 class Aws2DdbIT extends Aws2DdbTest {
 
 }
diff --git 
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java
 
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java
index 86108a0..2ebf6d8 100644
--- 
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java
+++ 
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java
@@ -30,12 +30,9 @@ import org.awaitility.Awaitility;
 import org.hamcrest.Matchers;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
 @QuarkusTest
 @QuarkusTestResource(Aws2TestResource.class)
-@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+") // TODO
-                                                                               
   // https://github.com/apache/camel-quarkus/issues/2216
 class Aws2DdbTest {
 
     private static final Logger LOG = Logger.getLogger(Aws2DdbTest.class);
diff --git 
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaIT.java
 
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaIT.java
index e573cef..835ae79 100644
--- 
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaIT.java
+++ 
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.quarkus.component.aws2.lambda.it;
 import io.quarkus.test.junit.NativeImageTest;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-//TODO disabled because of https://github.com/apache/camel-quarkus/issues/2216
+//TODO disabled on Localstack, see 
https://github.com/apache/camel-quarkus/issues/2595
 @EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+")
 @NativeImageTest
 class Aws2LambdaIT extends Aws2LambdaTest {
diff --git 
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
 
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
index 48e0548..c68b608 100644
--- 
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
+++ 
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
@@ -35,7 +35,7 @@ import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-//TODO disabled because of https://github.com/apache/camel-quarkus/issues/2216
+//TODO disabled on Localstack, see 
https://github.com/apache/camel-quarkus/issues/2595
 @EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+")
 @QuarkusTest
 @QuarkusTestResource(Aws2TestResource.class)
@@ -83,13 +83,30 @@ class Aws2LambdaTest {
                 .statusCode(200)
                 .body("$", Matchers.hasItem(functionName));
 
-        RestAssured.given()
-                .contentType(ContentType.JSON)
-                .body("{ \"firstName\": \"" + name + "\"}")
-                .post("/aws2-lambda/invoke/" + functionName)
-                .then()
-                .statusCode(200)
-                .body("greetings", Matchers.is("Hello " + name));
+        /* Sometimes this does not succeed immediately */
+        Awaitility.await()
+                .pollDelay(200, TimeUnit.MILLISECONDS)
+                .pollInterval(500, TimeUnit.MILLISECONDS)
+                .atMost(120, TimeUnit.SECONDS)
+                .until(
+                        () -> {
+                            ExtractableResponse<?> response = 
RestAssured.given()
+                                    .contentType(ContentType.JSON)
+                                    .body("{ \"firstName\": \"" + name + "\"}")
+                                    .post("/aws2-lambda/invoke/" + 
functionName)
+                                    .then()
+                                    .extract();
+                            System.out.println("Function " + functionName + " 
returned " + response.statusCode()
+                                    + "; will retry until timeout");
+                            switch (response.statusCode()) {
+                            case 200:
+                                final String greetings = 
response.jsonPath().getString("greetings");
+                                return greetings;
+                            default:
+                                return null;
+                            }
+                        },
+                        Matchers.is("Hello " + name));
 
         RestAssured.given()
                 .delete("/aws2-lambda/delete/" + functionName)
diff --git 
a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesIT.java
 
b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesIT.java
index 42fae34..7bac6fb 100644
--- 
a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesIT.java
+++ 
b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesIT.java
@@ -19,7 +19,8 @@ package org.apache.camel.quarkus.component.aws2.ses.it;
 import io.quarkus.test.junit.NativeImageTest;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-//TODO disabled because of https://github.com/apache/camel-quarkus/issues/2216
+/* Disabled on Localstack because Localstack does not send e-mails which we do 
assume in our tests
+ * See 
https://github.com/localstack/localstack/issues/339#issuecomment-341727758 */
 @EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+")
 @EnabledIfEnvironmentVariable(named = "MAILSLURP_API_KEY", matches = 
"[a-zA-Z0-9]+")
 @NativeImageTest
diff --git 
a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
 
b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
index 2dc0b16..5756bc2 100644
--- 
a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
+++ 
b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
@@ -49,7 +49,8 @@ import software.amazon.awssdk.services.ses.SesClient;
 import 
software.amazon.awssdk.services.ses.model.DeleteVerifiedEmailAddressRequest;
 import software.amazon.awssdk.services.ses.model.VerifyEmailAddressRequest;
 
-//TODO disabled because of https://github.com/apache/camel-quarkus/issues/2216
+/* Disabled on Localstack because Localstack does not send e-mails which we do 
assume in our tests
+ * See 
https://github.com/localstack/localstack/issues/339#issuecomment-341727758 */
 @EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+")
 @EnabledIfEnvironmentVariable(named = "MAILSLURP_API_KEY", matches = 
"[a-zA-Z0-9]+")
 @QuarkusTest
diff --git 
a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsIT.java
 
b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsIT.java
index efe8d68..83315cf 100644
--- 
a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsIT.java
+++ 
b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsIT.java
@@ -17,10 +17,8 @@
 package org.apache.camel.quarkus.component.aws2.sqs.it;
 
 import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
 @NativeImageTest
-@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+") // TODO https://github.com/apache/camel-quarkus/issues/2216
 class Aws2SqsSnsIT extends Aws2SqsSnsTest {
 
 }
diff --git 
a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java
 
b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java
index d55b8d5..1363775 100644
--- 
a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java
+++ 
b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java
@@ -31,14 +31,11 @@ import org.eclipse.microprofile.config.ConfigProvider;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
 import static org.hamcrest.core.Is.is;
 
 @QuarkusTest
 @QuarkusTestResource(Aws2TestResource.class)
-@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = 
"[a-zA-Z0-9]+") // TODO
-                                                                               
   // https://github.com/apache/camel-quarkus/issues/2216
 class Aws2SqsSnsTest {
 
     @Test
diff --git 
a/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
 
b/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
index 3c23d88..5e25e3c 100644
--- 
a/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
+++ 
b/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java
@@ -66,18 +66,9 @@ public class Aws2TestEnvContext {
                     properties.put("camel.component.aws2-" + s + 
".secret-key", secretKey);
                     properties.put("camel.component.aws2-" + s + ".region", 
region);
 
-                    switch (service) {
-                    case S3:
-                    case KINESIS:
-                    case FIREHOSE:
-                        properties.put("camel.component.aws2-" + s + 
".override-endpoint", "true");
-                        properties.put("camel.component.aws2-" + s + 
".uri-endpoint-override",
-                                ls.getEndpointOverride(service).toString());
-                        break;
-                    default:
-                        // TODO 
https://github.com/apache/camel-quarkus/issues/2216
-                        break;
-                    }
+                    properties.put("camel.component.aws2-" + s + 
".override-endpoint", "true");
+                    properties.put("camel.component.aws2-" + s + 
".uri-endpoint-override",
+                            ls.getEndpointOverride(service).toString());
                 }
             }
         });
diff --git 
a/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
 
b/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
index ab44ac5..a4fecb2 100644
--- 
a/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
+++ 
b/integration-tests-support/aws2/src/main/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
@@ -69,7 +69,7 @@ public final class Aws2TestResource implements 
QuarkusTestResourceLifecycleManag
                     .distinct()
                     .toArray(Service[]::new);
 
-            LocalStackContainer localstack = new 
LocalStackContainer(DockerImageName.parse("localstack/localstack:0.12.6"))
+            LocalStackContainer localstack = new 
LocalStackContainer(DockerImageName.parse("localstack/localstack:0.12.11"))
                     .withServices(services);
             localstack.start();
 

Reply via email to