[camel-quarkus] branch main updated: AWS Aws2DdbQuarkusClientTest fails with real AWS #3174

[jamesnetherton]

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

jamesnetherton 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 3083d86  AWS Aws2DdbQuarkusClientTest fails with real AWS #3174
3083d86 is described below

commit 3083d8647d2e84f80df2d994cd46f60f0afa9a4b
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Fri Oct 8 13:37:57 2021 +0200

    AWS Aws2DdbQuarkusClientTest fails with real AWS #3174
---
 .../component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java        | 10 +++++++---
 .../camel/quarkus/test/support/aws2/Aws2TestResource.java      | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git 
a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
 
b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
index 652ee00..dbc1f5f 100644
--- 
a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
+++ 
b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
@@ -25,6 +25,7 @@ import java.util.stream.Stream;
 
 import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
 import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer;
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.testcontainers.containers.localstack.LocalStackContainer.Service;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -85,9 +86,12 @@ public class Aws2DdbTestEnvCustomizer implements 
Aws2TestEnvCustomizer {
         }
 
         Map<String, String> envContextProperties = envContext.getProperies();
-        String accessKey = 
envContextProperties.get("camel.component.aws2-ddb.access-key");
-        String secretKey = 
envContextProperties.get("camel.component.aws2-ddb.secret-key");
-        String region = 
envContextProperties.get("camel.component.aws2-ddb.region");
+        String accessKey = 
envContextProperties.getOrDefault("camel.component.aws2-ddb.access-key",
+                System.getenv(Aws2TestResource.AWS_ACCESS_KEY));
+        String secretKey = 
envContextProperties.getOrDefault("camel.component.aws2-ddb.secret-key",
+                System.getenv(Aws2TestResource.AWS_SECRET_KEY));
+        String region = 
envContextProperties.getOrDefault("camel.component.aws2-ddb.region",
+                System.getenv(Aws2TestResource.AWS_REGION));
 
         
envContext.property("quarkus.dynamodb.aws.credentials.static-provider.access-key-id",
 accessKey);
         
envContext.property("quarkus.dynamodb.aws.credentials.static-provider.secret-access-key",
 secretKey);
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 9864311..0fa040f 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
@@ -37,14 +37,18 @@ import software.amazon.awssdk.core.SdkClient;
 public final class Aws2TestResource implements 
QuarkusTestResourceLifecycleManager {
     private static final Logger LOG = 
LoggerFactory.getLogger(Aws2TestResource.class);
 
+    public static final String AWS_ACCESS_KEY = "AWS_ACCESS_KEY";
+    public static final String AWS_SECRET_KEY = "AWS_SECRET_KEY";
+    public static final String AWS_REGION = "AWS_REGION";
+
     private Aws2TestEnvContext envContext;
 
     @SuppressWarnings("resource")
     @Override
     public Map<String, String> start() {
-        final String realKey = System.getenv("AWS_ACCESS_KEY");
-        final String realSecret = System.getenv("AWS_SECRET_KEY");
-        final String realRegion = System.getenv("AWS_REGION");
+        final String realKey = System.getenv(AWS_ACCESS_KEY);
+        final String realSecret = System.getenv(AWS_SECRET_KEY);
+        final String realRegion = System.getenv(AWS_REGION);
         final boolean realCredentialsProvided = realKey != null && realSecret 
!= null && realRegion != null;
         final boolean startMockBackend = 
MockBackendUtils.startMockBackend(false);
         final boolean usingMockBackend = startMockBackend && 
!realCredentialsProvided;