You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/11/23 10:15:46 UTC
[camel] branch master updated: Migrates the camel-aws2-sts tests to
the shared test infra (#4658)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new fb0a0d9 Migrates the camel-aws2-sts tests to the shared test infra (#4658)
fb0a0d9 is described below
commit fb0a0d9cc4187937f6b390dbb6c7369f6af415fe
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Mon Nov 23 11:15:30 2020 +0100
Migrates the camel-aws2-sts tests to the shared test infra (#4658)
---
components/camel-aws2-sts/pom.xml | 22 ++++++++-
.../aws2/sts/localstack/Aws2StsBaseTest.java | 54 ++++------------------
test-infra/camel-test-infra-aws-v2/pom.xml | 6 +++
.../test/infra/aws2/clients/AWSSDKClientUtils.java | 5 ++
...rvice.java => AWSSTSLocalContainerService.java} | 27 ++---------
.../infra/aws2/services/AWSServiceFactory.java | 4 ++
.../camel/test/infra/aws2/services/Service.java | 3 +-
7 files changed, 50 insertions(+), 71 deletions(-)
diff --git a/components/camel-aws2-sts/pom.xml b/components/camel-aws2-sts/pom.xml
index 87e9336..76a7dcc 100644
--- a/components/camel-aws2-sts/pom.xml
+++ b/components/camel-aws2-sts/pom.xml
@@ -67,9 +67,29 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- test infra -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-infra-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-infra-aws-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers-junit5</artifactId>
+ <artifactId>camel-test-infra-aws-v2</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/localstack/Aws2StsBaseTest.java b/components/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/localstack/Aws2StsBaseTest.java
index ec1cca0..eb8b8e1 100644
--- a/components/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/localstack/Aws2StsBaseTest.java
+++ b/components/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/localstack/Aws2StsBaseTest.java
@@ -16,61 +16,25 @@
*/
package org.apache.camel.component.aws2.sts.localstack;
-import java.net.URI;
-
import org.apache.camel.CamelContext;
import org.apache.camel.component.aws2.sts.STS2Component;
-import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.junit5.Wait;
+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.AWSServiceFactory;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
-import org.testcontainers.containers.GenericContainer;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sts.StsClient;
+import org.junit.jupiter.api.extension.RegisterExtension;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class Aws2StsBaseTest extends ContainerAwareTestSupport {
-
- public static final String CONTAINER_IMAGE = "localstack/localstack:0.12.2";
- public static final String CONTAINER_NAME = "sts";
-
- @Override
- protected GenericContainer<?> createContainer() {
- return localstackContainer();
- }
-
- public static GenericContainer localstackContainer() {
- return new GenericContainer(CONTAINER_IMAGE)
- .withNetworkAliases(CONTAINER_NAME)
- .withEnv("SERVICES", "sts")
- .withExposedPorts(4566)
- .waitingFor(Wait.forListeningPort())
- .waitingFor(Wait.forLogMessageContaining("Ready.", 1));
- }
-
- public String getEventbridgeUrl() {
- return String.format(
- "%s:%d",
- getContainerHost(CONTAINER_NAME),
- getContainerPort(CONTAINER_NAME, 4566));
- }
-
- public StsClient getStsClient() {
- StsClient stsClient = StsClient
- .builder()
- .endpointOverride(URI.create("http://" + getEventbridgeUrl()))
- .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy")))
- .region(Region.EU_WEST_1)
- .build();
- return stsClient;
- }
+public class Aws2StsBaseTest extends CamelTestSupport {
+ @RegisterExtension
+ public static AWSService service = AWSServiceFactory.createSTSService();
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
STS2Component stsComponent = context.getComponent("aws2-sts", STS2Component.class);
- stsComponent.getConfiguration().setStsClient(getStsClient());
+ stsComponent.getConfiguration().setStsClient(AWSSDKClientUtils.newSTSClient());
return context;
}
}
diff --git a/test-infra/camel-test-infra-aws-v2/pom.xml b/test-infra/camel-test-infra-aws-v2/pom.xml
index aa4c09f..04643dd 100644
--- a/test-infra/camel-test-infra-aws-v2/pom.xml
+++ b/test-infra/camel-test-infra-aws-v2/pom.xml
@@ -116,6 +116,12 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
+ <artifactId>sts</artifactId>
+ <version>${aws-java-sdk2-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
<version>${aws-java-sdk2-version}</version>
</dependency>
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 cd3f3ee..5185eff 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
@@ -39,6 +39,7 @@ import software.amazon.awssdk.services.lambda.LambdaClient;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.sns.SnsClient;
import software.amazon.awssdk.services.sqs.SqsClient;
+import software.amazon.awssdk.services.sts.StsClient;
public final class AWSSDKClientUtils {
private static final Logger LOG = LoggerFactory.getLogger(AWSSDKClientUtils.class);
@@ -164,4 +165,8 @@ public final class AWSSDKClientUtils {
public static LambdaClient newLambdaClient() {
return newClient("Lambda", LambdaClient::builder, LambdaClient.class);
}
+
+ public static StsClient newSTSClient() {
+ return newClient("STS", StsClient::builder, StsClient.class);
+ }
}
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/AWSSTSLocalContainerService.java
similarity index 62%
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/AWSSTSLocalContainerService.java
index 990ddc3..74cf2b3 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/AWSSTSLocalContainerService.java
@@ -17,29 +17,8 @@
package org.apache.camel.test.infra.aws2.services;
-public enum Service {
- CLOUD_WATCH("cloudwatch"),
- EC2("ec2"),
- EVENT_BRIDGE("eventbridge"),
- IAM("iam"),
- KINESIS("kinesis"),
- KMS("kms"),
- LAMBDA("lambda"),
- S3("s3"),
- SQS("sqs"),
- SNS("sns");
-
- 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 AWSSTSLocalContainerService extends AWSLocalContainerService {
+ public AWSSTSLocalContainerService() {
+ super(Service.STS);
}
}
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 c428102..191ccaa 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
@@ -96,4 +96,8 @@ public final class AWSServiceFactory {
public static AWSService createLambdaService() {
return createService("AWS Lambda", AWSLambdaLocalContainerService::new);
}
+
+ public static AWSService createSTSService() {
+ return createService("AWS STS", AWSSTSLocalContainerService::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 990ddc3..2e2dcac 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
@@ -26,8 +26,9 @@ public enum Service {
KMS("kms"),
LAMBDA("lambda"),
S3("s3"),
+ SNS("sns"),
SQS("sqs"),
- SNS("sns");
+ STS("sts");
private final String serviceName;