diff --git a/docs/modules/ROOT/pages/migration-guide/3.17.0.adoc b/docs/modules/ROOT/pages/migration-guide/3.17.0.adoc new file mode 100644 index 000000000000..87676713cd9f --- /dev/null +++ b/docs/modules/ROOT/pages/migration-guide/3.17.0.adoc @@ -0,0 +1,11 @@ += Camel Quarkus 3.17.0 Migration Guide + +The following guide outlines how to adapt your code to changes that were made in Camel Quarkus 3.17.0. + +== Reduced support when using Quarkus Amazon Services extensions with Camel Quarkus AWS2 extensions + +Historically, the Camel Quarkus project tested & verified that using https://docs.quarkiverse.io/quarkus-amazon-services/1.x/index.html[Quarkus Amazon Services] extensions in conjunction with Camel Quarkus AWS2 extensions worked successfully. + +From Camel Quarkus 3.17.0, this verification step ceases to exist and the Camel Quarkus AWS2 extension documentation no longer makes reference to Quarkus Amazon Services. + +If you want to leverage AWS support on Camel Quarkus, the recommended approach is to use the https://quarkus.io/extensions/?search-regex=camel-quarkus-aws2[camel-quarkus-aws2] extensions without Quarkus Amazon Services. diff --git a/docs/modules/ROOT/pages/migration-guide/index.adoc b/docs/modules/ROOT/pages/migration-guide/index.adoc index 7e28b46daee8..e8a74ccdd437 100644 --- a/docs/modules/ROOT/pages/migration-guide/index.adoc +++ b/docs/modules/ROOT/pages/migration-guide/index.adoc @@ -4,6 +4,7 @@ We do frequent releases, a release almost every month, and even though we strive Listed here are guides on how to migrate between major versions and anything of significance to watch for when upgrading from minor versions. +* xref:migration-guide/3.17.0.adoc[Camel Quarkus 3.16.x to Camel Quarkus 3.17.0 migration guide] * xref:migration-guide/3.15.0.adoc[Camel Quarkus 3.14.x to Camel Quarkus 3.15.0 migration guide] * xref:migration-guide/3.2.0.adoc[Camel Quarkus 2.x to Camel Quarkus 3.2.0 migration guide] * xref:migration-guide/2.11.0.adoc[Camel Quarkus 2.10.0 to Camel Quarkus 2.11.0 migration guide] diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc index baa3e8dc169b..4f0fea239333 100644 --- a/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc @@ -52,37 +52,3 @@ endif::[] This extension auto-enables SSL support in native mode. Hence you do not need to add `quarkus.ssl.native=true` to your `application.properties` yourself. See also https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. - -[id="extensions-aws2-ddb-additional-camel-quarkus-configuration"] -== Additional Camel Quarkus configuration - -[id="extensions-aws2-ddb-optional-integration-with-quarkus-amazon-dynamodb"] -=== Optional integration with Quarkus Amazon DynamoDB - -If desired, it is possible to use the Quarkus Amazon DynamoDB extension in conjunction with Camel Quarkus AWS 2 DynamoDB. -Note that this is fully optional and not mandatory at all. -Please follow the https://quarkus.io/guides/amazon-dynamodb#configuring-dynamodb-clients[Quarkus documentation] but beware of the following caveats: - -1. The client type `apache` has to be selected by configuring the following property: -+ -[source,properties] ----- -quarkus.dynamodb.sync-client.type=apache ----- - -2. The `DynamoDbClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime. -You can reach that e.g. by adding a dummy bean injecting `DynamoDbClient`: -+ -[source,java] ----- -import jakarta.enterprise.context.ApplicationScoped; -import io.quarkus.arc.Unremovable; -import software.amazon.awssdk.services.dynamodb.DynamoDbClient; - -@ApplicationScoped -@Unremovable -class UnremovableDynamoDbClient { - @Inject - DynamoDbClient dynamoDbClient; -} ----- diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc index b6cbd946908f..5ce4d06275f3 100644 --- a/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc @@ -51,37 +51,3 @@ endif::[] This extension auto-enables SSL support in native mode. Hence you do not need to add `quarkus.ssl.native=true` to your `application.properties` yourself. See also https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. - -[id="extensions-aws2-s3-additional-camel-quarkus-configuration"] -== Additional Camel Quarkus configuration - -[id="extensions-aws2-s3-optional-integration-with-quarkus-amazon-s3"] -=== Optional integration with Quarkus Amazon S3 - -If desired, it is possible to use the Quarkus Amazon S3 extension in conjunction with Camel Quarkus AWS 2 S3 Storage Service. -Note that this is fully optional and not mandatory at all. -Please follow the https://quarkus.io/guides/amazon-s3#configuring-s3-clients[Quarkus documentation] but beware of the following caveats: - -1. The client type `apache` has to be selected by configuring the following property: -+ -[source,properties] ----- -quarkus.s3.sync-client.type=apache ----- - -2. The `S3Client` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime. -You can reach that e.g. by adding a dummy bean injecting `S3Client`: -+ -[source,java] ----- -import jakarta.enterprise.context.ApplicationScoped; -import io.quarkus.arc.Unremovable; -import software.amazon.awssdk.services.s3.S3Client; - -@ApplicationScoped -@Unremovable -class UnremovableS3Client { - @Inject - S3Client s3Client; -} ----- diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc index 8496acf7475e..3a630b4767a6 100644 --- a/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc @@ -51,37 +51,3 @@ endif::[] This extension auto-enables SSL support in native mode. Hence you do not need to add `quarkus.ssl.native=true` to your `application.properties` yourself. See also https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. - -[id="extensions-aws2-ses-additional-camel-quarkus-configuration"] -== Additional Camel Quarkus configuration - -[id="extensions-aws2-ses-optional-integration-with-quarkus-amazon-ses"] -=== Optional integration with Quarkus Amazon SES - -If desired, it is possible to use the Quarkus Amazon SES extension in conjunction with Camel Quarkus AWS 2 Simple Email Service (SES). -Note that this is fully optional and not mandatory at all. -Please follow the https://quarkus.io/guides/amazon-ses#configuring-ses-clients[Quarkus documentation] but beware of the following caveats: - -1. The client type `apache` has to be selected by configuring the following property: -+ -[source,properties] ----- -quarkus.ses.sync-client.type=apache ----- - -2. The `SesClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime. -You can reach that e.g. by adding a dummy bean injecting `SesClient`: -+ -[source,java] ----- -import jakarta.enterprise.context.ApplicationScoped; -import io.quarkus.arc.Unremovable; -import software.amazon.awssdk.services.ses.SesClient; - -@ApplicationScoped -@Unremovable -class UnremovableSesClient { - @Inject - SesClient sesClient; -} ----- diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc index 412ce8d51b6d..2d3982e8097b 100644 --- a/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc @@ -51,37 +51,3 @@ endif::[] This extension auto-enables SSL support in native mode. Hence you do not need to add `quarkus.ssl.native=true` to your `application.properties` yourself. See also https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. - -[id="extensions-aws2-sns-additional-camel-quarkus-configuration"] -== Additional Camel Quarkus configuration - -[id="extensions-aws2-sns-optional-integration-with-quarkus-amazon-sns"] -=== Optional integration with Quarkus Amazon SNS - -If desired, it is possible to use the Quarkus Amazon SNS extension in conjunction with Camel Quarkus AWS 2 Simple Notification System (SNS). -Note that this is fully optional and not mandatory at all. -Please follow the https://quarkus.io/guides/amazon-sns#configuring-sns-clients[Quarkus documentation] but beware of the following caveats: - -1. The client type `apache` has to be selected by configuring the following property: -+ -[source,properties] ----- -quarkus.sns.sync-client.type=apache ----- - -2. The `SnsClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime. -You can reach that e.g. by adding a dummy bean injecting `SnsClient`: -+ -[source,java] ----- -import jakarta.enterprise.context.ApplicationScoped; -import io.quarkus.arc.Unremovable; -import software.amazon.awssdk.services.sns.SnsClient; - -@ApplicationScoped -@Unremovable -class UnremovableSnsClient { - @Inject - SnsClient snsClient; -} ----- diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc index c9efb6c376f3..b101511ecce4 100644 --- a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc @@ -51,37 +51,3 @@ endif::[] This extension auto-enables SSL support in native mode. Hence you do not need to add `quarkus.ssl.native=true` to your `application.properties` yourself. See also https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. - -[id="extensions-aws2-sqs-additional-camel-quarkus-configuration"] -== Additional Camel Quarkus configuration - -[id="extensions-aws2-sqs-optional-integration-with-quarkus-amazon-sqs"] -=== Optional integration with Quarkus Amazon SQS - -If desired, it is possible to use the Quarkus Amazon SQS extension in conjunction with Camel Quarkus AWS 2 Simple Queue Service (SQS). -Note that this is fully optional and not mandatory at all. -Please follow the https://quarkus.io/guides/amazon-sqs#configuring-sqs-clients[Quarkus documentation] but beware of the following caveats: - -1. The client type `apache` has to be selected by configuring the following property: -+ -[source,properties] ----- -quarkus.sqs.sync-client.type=apache ----- - -2. The `SqsClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime. -You can reach that e.g. by adding a dummy bean injecting `SqsClient`: -+ -[source,java] ----- -import jakarta.enterprise.context.ApplicationScoped; -import io.quarkus.arc.Unremovable; -import software.amazon.awssdk.services.sqs.SqsClient; - -@ApplicationScoped -@Unremovable -class UnremovableSqsClient { - @Inject - SqsClient sqsClient; -} ----- diff --git a/extensions/aws2-ddb/runtime/pom.xml b/extensions/aws2-ddb/runtime/pom.xml index a75efa15bbec..ff23962f0ee4 100644 --- a/extensions/aws2-ddb/runtime/pom.xml +++ b/extensions/aws2-ddb/runtime/pom.xml @@ -34,8 +34,6 @@ 1.0.0 1.0.0 Amazon - DynamoDB - software.amazon.awssdk.services.dynamodb.DynamoDbClient diff --git a/extensions/aws2-s3/runtime/pom.xml b/extensions/aws2-s3/runtime/pom.xml index f08ab118bb45..49fe0e7d2d29 100644 --- a/extensions/aws2-s3/runtime/pom.xml +++ b/extensions/aws2-s3/runtime/pom.xml @@ -33,8 +33,6 @@ 1.0.0 1.0.0 Amazon - S3 - software.amazon.awssdk.services.s3.S3Client diff --git a/extensions/aws2-ses/runtime/pom.xml b/extensions/aws2-ses/runtime/pom.xml index eb52478b7046..3640683571fd 100644 --- a/extensions/aws2-ses/runtime/pom.xml +++ b/extensions/aws2-ses/runtime/pom.xml @@ -33,8 +33,6 @@ 1.0.0 1.0.0 Amazon - SES - software.amazon.awssdk.services.ses.SesClient diff --git a/extensions/aws2-sns/runtime/pom.xml b/extensions/aws2-sns/runtime/pom.xml index 857d19c3e888..ab174c5e8c7f 100644 --- a/extensions/aws2-sns/runtime/pom.xml +++ b/extensions/aws2-sns/runtime/pom.xml @@ -33,8 +33,6 @@ 1.0.0 1.0.0 Amazon - SNS - software.amazon.awssdk.services.sns.SnsClient diff --git a/extensions/aws2-sqs/runtime/pom.xml b/extensions/aws2-sqs/runtime/pom.xml index 5c739fba44dd..733e1c12f418 100644 --- a/extensions/aws2-sqs/runtime/pom.xml +++ b/extensions/aws2-sqs/runtime/pom.xml @@ -33,8 +33,6 @@ 1.0.0 1.0.0 Amazon - SQS - software.amazon.awssdk.services.sqs.SqsClient diff --git a/integration-test-groups/aws2-quarkus-client/README.adoc b/integration-test-groups/aws2-quarkus-client/README.adoc deleted file mode 100644 index 7fe070120800..000000000000 --- a/integration-test-groups/aws2-quarkus-client/README.adoc +++ /dev/null @@ -1,48 +0,0 @@ -= Camel Quarkus AWS 2 with Quarkus AWS 2 client extensions isolated integration tests - -=== Localstack - -The tests able to run against Localstack are run against Localstack by default. - -The SES test is ignored unless `MAILSLURP_API_KEY` variable is set. - -=== Real AWS API - -To run the tests against the real AWS API, you need to - -* Export Your - https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys[AWS credentials] - (access key ID and secret access key) -* Export our preferred - https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions[AWS region]. -* For SES, you additionally need a https://app.mailslurp.com/[MailSlurp account] and API key - (the free dev account should be enough) - -[source,shell] ----- -export AWS_ACCESS_KEY= -export AWS_SECRET_KEY= -export AWS_REGION=eu-central-1 -# for SES -export MAILSLURP_API_KEY= ----- - -or - -* Set default credentials and Region for your environment (https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/setup.html#setup-credentials[documentation]) -* Export our preferred -https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions[AWS region]. -* Export a flag forcing clients to use default credentials. -* For SES, you additionally need a https://app.mailslurp.com/[MailSlurp account] and API key -(the free dev account should be enough) - -[source,shell] ----- -export AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=true -export AWS_REGION=eu-central-1 -# for SES -export MAILSLURP_API_KEY= ----- - -You may want to `export CAMEL_QUARKUS_START_MOCK_BACKEND=false` to force testing against -the real AWS API. diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml deleted file mode 100644 index 0dc95320f8f1..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-aws2-ddb-quarkus-client - Camel Quarkus :: Integration Tests :: AWS 2 DynamoDB Quarkus Client - Integration tests for Camel Quarkus AWS 2 DynamoDB extension with the Quarkus AWS DynamoDB client - - - QuarkusClient - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-ddb - - - io.quarkiverse.amazonservices - quarkus-amazon-dynamodb - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - test-jar - test - - - org.awaitility - awaitility - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - generate-sources - - add-source - - - - ${basedir}/target/src/main/java - - - - - add-test-sources - generate-sources - - add-test-source - - - - ${basedir}/target/src/test/java - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - group-sources - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties, **/*Stream* - ${test.class.name.prefix} - - - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-ddb-deployment - ${project.version} - pom - test - - - * - * - - - - - - - skip-testcontainers-tests - - - skip-testcontainers-tests - - - - true - - - - - diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientResource.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientResource.java deleted file mode 100644 index 2f1e64569502..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientResource.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.ddb.it; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.CamelContext; -import org.apache.camel.component.aws2.ddb.Ddb2Endpoint; -import org.apache.camel.component.aws2.ddb.Ddb2Operations; -import org.eclipse.microprofile.config.inject.ConfigProperty; -import software.amazon.awssdk.services.dynamodb.DynamoDbClient; - -@Path("/aws2-ddb-quarkus-client") -@ApplicationScoped -public class Aws2DdbQuarkusClientResource { - - @Inject - CamelContext context; - - @Inject - DynamoDbClient dynamoDB; - - @ConfigProperty(name = "aws-ddb.table-name") - String tableName; - - @Path("/verify/client") - @GET - @Produces(MediaType.TEXT_PLAIN) - public boolean quarkusManagesDynamoDbClient() { - Ddb2Endpoint endpoint = context.getEndpoint(componentUri(Ddb2Operations.GetItem), Ddb2Endpoint.class); - DynamoDbClient camelDynamoDbClient = endpoint.getConfiguration().getAmazonDDBClient(); - return camelDynamoDbClient != null && camelDynamoDbClient.equals(dynamoDB); - } - - private String componentUri(Ddb2Operations op) { - return componentUri(Aws2DdbResource.Table.basic, op); - } - - private String componentUri(Aws2DdbResource.Table table, Ddb2Operations op) { - return "aws2-ddb://" + this.tableName + "?operation=" + op; - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/resources/application.properties deleted file mode 100644 index b90cd2e6b563..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -quarkus.dynamodb.sync-client.type=apache -quarkus.devservices.enabled=false diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientIT.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientIT.java deleted file mode 100644 index aed731dd0e3b..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientIT.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.ddb.it; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class Aws2DdbQuarkusClientIT extends Aws2DdbQuarkusClientTest { - -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java deleted file mode 100644 index 4f15d502acb0..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.ddb.it; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; -import org.junit.jupiter.api.Test; - -import static org.hamcrest.CoreMatchers.is; - -@QuarkusTest -@QuarkusTestResource(Aws2TestResource.class) -class Aws2DdbQuarkusClientTest { - - @Test - public void quarkusManagesDynamoDbClient() { - RestAssured.get("/aws2-ddb-quarkus-client/verify/client") - .then() - .statusCode(200) - .body(is("true")); - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTestEnvCustomizer.java deleted file mode 100644 index 77602b68aab0..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTestEnvCustomizer.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.ddb.it; - -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; -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.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; -import software.amazon.awssdk.services.dynamodb.DynamoDbClient; -import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; -import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; -import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; -import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest; -import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; -import software.amazon.awssdk.services.dynamodb.model.KeyType; -import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; -import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; -import software.amazon.awssdk.services.dynamodb.model.StreamSpecification; -import software.amazon.awssdk.services.dynamodb.model.StreamViewType; -import software.amazon.awssdk.services.dynamodb.waiters.DynamoDbWaiter; - -public class Aws2DdbQuarkusClientTestEnvCustomizer implements Aws2TestEnvCustomizer { - - @Override - public Service[] localstackServices() { - return new Service[] { Service.DYNAMODB, Service.DYNAMODB_STREAMS }; - } - - @Override - public void customize(Aws2TestEnvContext envContext) { - - //remove camel properties for client creation to ensure that client is not created by camel component - envContext.removeClient(localstackServices()); - - final String tableName = "camel-quarkus-" + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); - envContext.property("aws-ddb.table-name", tableName); - - final String tableNameOperations = "camel-quarkus-operations-" - + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); - envContext.property("aws-ddb.operations-table-name", tableNameOperations); - - final String tableNameStreams = "camel-quarkus-streams-" - + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); - envContext.property("aws-ddb.stream-table-name", tableNameStreams); - - List tableNames = Stream.of(tableName, tableNameStreams, tableNameOperations).collect(Collectors.toList()); - - final DynamoDbClient client = envContext.client(Service.DYNAMODB, DynamoDbClient::builder); - { - final String keyColumn = "key"; - - for (String table : tableNames) { - client.createTable( - createTableRequest(table, keyColumn) - .build()); - } - - for (String table : tableNames) { - try (DynamoDbWaiter dbWaiter = client.waiter()) { - dbWaiter.waitUntilTableExists(DescribeTableRequest.builder() - .tableName(table) - .build()); - } - - envContext.closeable(() -> client.deleteTable(DeleteTableRequest.builder().tableName(table).build())); - } - } - - Map envContextProperties = envContext.getProperties(); - - if (envContext.isUseDefaultCredentialsProvider()) { - envContext.property("quarkus.dynamodb.aws.credentials.type", "default"); - } else { - envContext.property("quarkus.dynamodb.aws.credentials.static-provider.access-key-id", envContext.getAccessKey()); - envContext.property("quarkus.dynamodb.aws.credentials.static-provider.secret-access-key", - envContext.getSecretKey()); - envContext.property("quarkus.dynamodb.aws.credentials.type", "static"); - } - envContext.property("quarkus.dynamodb.aws.region", envContext.getRegion()); - - // Propagate localstack environment config to Quarkus AWS if required - Optional overrideEndpoint = envContextProperties - .keySet() - .stream() - .filter(key -> key.endsWith("uri-endpoint-override")) - .findFirst(); - - if (overrideEndpoint.isPresent()) { - String endpoint = envContextProperties.get(overrideEndpoint.get()); - envContext.property("quarkus.dynamodb.endpoint-override", endpoint); - } - } - - private CreateTableRequest.Builder createTableRequest(String tableName, String keyColumn) { - CreateTableRequest.Builder builder = CreateTableRequest.builder() - .attributeDefinitions(AttributeDefinition.builder() - .attributeName(keyColumn) - .attributeType(ScalarAttributeType.S) - .build()) - .keySchema(KeySchemaElement.builder() - .attributeName(keyColumn) - .keyType(KeyType.HASH) - .build()) - .provisionedThroughput(ProvisionedThroughput.builder() - .readCapacityUnits(10L) - .writeCapacityUnits(10L) - .build()); - if (tableName.contains("streams")) { - builder.streamSpecification(StreamSpecification.builder() - .streamEnabled(true) - .streamViewType(StreamViewType.NEW_AND_OLD_IMAGES) - .build()); - } - - return builder.tableName(tableName); - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer deleted file mode 100644 index 9c0371db12aa..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.apache.camel.quarkus.component.aws2.ddb.it.Aws2DdbQuarkusClientTestEnvCustomizer \ No newline at end of file diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml deleted file mode 100644 index 87732d331a55..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-aws2-s3-quarkus-client - Camel Quarkus :: Integration Tests :: AWS 2 S3 Quarkus Client - Integration tests for Camel Quarkus AWS 2 S3 extension with the Quarkus AWS S3 client - - - QuarkusClient - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-s3 - - - org.apache.camel.quarkus - camel-quarkus-aws2-kms - - - io.quarkiverse.amazonservices - quarkus-amazon-s3 - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - test-jar - test - - - org.awaitility - awaitility - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - generate-sources - - add-source - - - - ${basedir}/target/src/main/java - - - - - add-test-sources - generate-sources - - add-test-source - - - - ${basedir}/target/src/test/java - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - group-sources - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3 - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-kms-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-s3-deployment - ${project.version} - pom - test - - - * - * - - - - - - - skip-testcontainers-tests - - - skip-testcontainers-tests - - - - true - - - - - diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientInvoker.java deleted file mode 100644 index 7234f134375c..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientInvoker.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.s3.it; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import software.amazon.awssdk.services.s3.S3Client; - -@ApplicationScoped -public class Aws2S3QuarkusClientInvoker { - - @Inject - S3Client s3; - -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/resources/application.properties deleted file mode 100644 index 4b987f798176..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/resources/application.properties +++ /dev/null @@ -1,22 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- -# -# Quarkus :: S3 Client options -# -quarkus.s3.sync-client.type=apache -quarkus.s3.checksum-validation=false -quarkus.devservices.enabled=false diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientTestEnvCustomizer.java deleted file mode 100644 index a554ee7d6c17..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientTestEnvCustomizer.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.s3.it; - -import java.util.Map; -import java.util.Optional; - -import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; - -public class Aws2S3QuarkusClientTestEnvCustomizer extends Aws2S3TestEnvCustomizer { - - @Override - public Service[] localstackServices() { - return super.localstackServices(); - } - - @Override - public void customize(Aws2TestEnvContext envContext) { - super.customize(envContext); - - //remove camel properties for client creation to ensure that client is not created by camel component - envContext.removeClient(localstackServices()); - - Map envContextProperties = envContext.getProperties(); - - if (envContext.isUseDefaultCredentialsProvider()) { - envContext.property("quarkus.s3.aws.credentials.type", "default"); - } else { - envContext.property("quarkus.s3.aws.credentials.static-provider.access-key-id", envContext.getAccessKey()); - envContext.property("quarkus.s3.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey()); - envContext.property("quarkus.s3.aws.credentials.type", "static"); - } - envContext.property("quarkus.s3.aws.region", envContext.getRegion()); - - // Propagate localstack environment config to Quarkus AWS if required - Optional overrideEndpoint = envContextProperties - .keySet() - .stream() - .filter(key -> key.endsWith("uri-endpoint-override")) - .findFirst(); - - if (overrideEndpoint.isPresent()) { - String endpoint = envContextProperties.get(overrideEndpoint.get()); - envContext.property("quarkus.s3.endpoint-override", endpoint); - } - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer deleted file mode 100644 index 055bf8425f5f..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.apache.camel.quarkus.component.aws2.s3.it.Aws2S3QuarkusClientTestEnvCustomizer diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml deleted file mode 100644 index 7617bdb53916..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-aws2-ses-quarkus-client - Camel Quarkus :: Integration Tests :: Simple Email Service (SES) Quarkus Client - Integration tests for Camel Quarkus AWS Simple Email Service (SES) extension with the Quarkus AWS SES client - - - QuarkusClient - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-ses - - - io.quarkiverse.amazonservices - quarkus-amazon-ses - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - test-jar - test - - - org.awaitility - awaitility - test - - - org.seleniumhq.selenium - htmlunit-driver - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - generate-sources - - add-source - - - - ${basedir}/target/src/main/java - - - - - add-test-sources - generate-sources - - add-test-source - - - - ${basedir}/target/src/test/java - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - group-sources - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-ses-deployment - ${project.version} - pom - test - - - * - * - - - - - - - skip-testcontainers-tests - - - skip-testcontainers-tests - - - - true - - - - - diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientInvoker.java deleted file mode 100644 index 40be5a8f1b82..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientInvoker.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.ses.it; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import software.amazon.awssdk.services.ses.SesClient; - -@ApplicationScoped -public class Aws2SesQuarkusClientInvoker { - - @Inject - SesClient ses; -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/resources/application.properties deleted file mode 100644 index 705900152111..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/resources/application.properties +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -mailslurp.api.key=${MAILSLURP_API_KEY} - -quarkus.ses.sync-client.type=apache -quarkus.devservices.enabled=false diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientTestEnvCustomizer.java deleted file mode 100644 index 581ec5d15eee..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientTestEnvCustomizer.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.ses.it; - -import java.util.Map; -import java.util.Optional; - -import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; - -public class Aws2SesQuarkusClientTestEnvCustomizer extends Aws2SesTestEnvCustomizer { - - @Override - public Service[] localstackServices() { - return super.localstackServices(); - } - - @Override - public void customize(Aws2TestEnvContext envContext) { - - super.customize(envContext); - - //remove camel properties for client creation to ensure that client is not created by camel component - envContext.removeClient(localstackServices()); - - Map envContextProperties = envContext.getProperties(); - - if (envContext.isUseDefaultCredentialsProvider()) { - envContext.property("quarkus.ses.aws.credentials.type", "default"); - } else { - envContext.property("quarkus.ses.aws.credentials.static-provider.access-key-id", envContext.getAccessKey()); - envContext.property("quarkus.ses.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey()); - envContext.property("quarkus.ses.aws.credentials.type", "static"); - } - envContext.property("quarkus.ses.aws.region", envContext.getRegion()); - - // Propagate localstack environment config to Quarkus AWS if required - Optional overrideEndpoint = envContextProperties - .keySet() - .stream() - .filter(key -> key.endsWith("uri-endpoint-override")) - .findFirst(); - - if (overrideEndpoint.isPresent()) { - String endpoint = envContextProperties.get(overrideEndpoint.get()); - envContext.property("quarkus.ses.endpoint-override", endpoint); - } - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer deleted file mode 100644 index 5483ca8df31f..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.apache.camel.quarkus.component.aws2.ses.it.Aws2SesQuarkusClientTestEnvCustomizer \ No newline at end of file diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml deleted file mode 100644 index 13cbaaa55044..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-aws2-sqs-sns-quarkus-client - Camel Quarkus :: Integration Tests :: AWS 2 SQS and SNS Quarkus Client - Integration tests for SQS and SNS extensions with the Quarkus AWS clients - - - QuarkusClient - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sqs - - - org.apache.camel.quarkus - camel-quarkus-aws2-sns - - - io.quarkiverse.amazonservices - quarkus-amazon-sqs - - - io.quarkiverse.amazonservices - quarkus-amazon-sns - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - test-jar - test - - - org.seleniumhq.selenium - htmlunit-driver - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - generate-sources - - add-source - - - - ${basedir}/target/src/main/java - - - - - add-test-sources - generate-sources - - add-test-source - - - - ${basedir}/target/src/test/java - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - group-sources - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sqs-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sns-deployment - ${project.version} - pom - test - - - * - * - - - - - - - skip-testcontainers-tests - - - skip-testcontainers-tests - - - - true - - - - - diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientInvoker.java deleted file mode 100644 index 3052de02322e..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientInvoker.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.sns.it; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import software.amazon.awssdk.services.sns.SnsClient; -import software.amazon.awssdk.services.sqs.SqsClient; - -@ApplicationScoped -public class Aws2SnsQuarkusClientInvoker { - - @Inject - SqsClient sqs; - - @Inject - SnsClient sns; -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/resources/application.properties deleted file mode 100644 index 6e65c73e2b95..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/resources/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -quarkus.sns.sync-client.type=apache -quarkus.sqs.sync-client.type=apache -quarkus.devservices.enabled=false diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientTestEnvCustomizer.java deleted file mode 100644 index 50c39fe9044c..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientTestEnvCustomizer.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.sns.it; - -import java.util.Map; -import java.util.Optional; - -import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; - -public class Aws2SnsQuarkusClientTestEnvCustomizer extends Aws2SqsSnsTestEnvCustomizer { - - @Override - public Service[] localstackServices() { - return super.localstackServices(); - } - - @Override - public void customize(Aws2TestEnvContext envContext) { - - super.customize(envContext); - - //remove camel properties for client creation to ensure that client is not created by camel component - envContext.removeClient(localstackServices()); - - Map envContextProperties = envContext.getProperties(); - - if (envContext.isUseDefaultCredentialsProvider()) { - envContext.property("quarkus.sns.aws.credentials.type", "default"); - } else { - envContext.property("quarkus.sns.aws.credentials.static-provider.access-key-id", envContext.getAccessKey()); - envContext.property("quarkus.sns.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey()); - envContext.property("quarkus.sns.aws.credentials.type", "static"); - } - envContext.property("quarkus.sns.aws.region", envContext.getRegion()); - - if (envContext.isUseDefaultCredentialsProvider()) { - envContext.property("quarkus.sqs.aws.credentials.type", "default"); - } else { - envContext.property("quarkus.sqs.aws.credentials.static-provider.access-key-id", envContext.getAccessKey()); - envContext.property("quarkus.sqs.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey()); - envContext.property("quarkus.sqs.aws.credentials.type", "static"); - } - envContext.property("quarkus.sqs.aws.region", envContext.getRegion()); - - // Propagate localstack environment config to Quarkus AWS if required - Optional overrideEndpoint = envContextProperties - .keySet() - .stream() - .filter(key -> key.endsWith("uri-endpoint-override")) - .findFirst(); - - if (overrideEndpoint.isPresent()) { - String endpoint = envContextProperties.get(overrideEndpoint.get()); - envContext.property("quarkus.sns.endpoint-override", endpoint); - envContext.property("quarkus.sqs.endpoint-override", endpoint); - } - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer deleted file mode 100644 index c663c03de2b1..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.apache.camel.quarkus.component.aws2.sns.it.Aws2SnsQuarkusClientTestEnvCustomizer \ No newline at end of file diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml deleted file mode 100644 index 4b80802df051..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-aws2-sqs-quarkus-client - Camel Quarkus :: Integration Tests :: AWS 2 SQS Quarkus Client - Integration tests for SQS extensions with the Quarkus AWS clients - - - QuarkusClient - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sqs - - - io.quarkiverse.amazonservices - quarkus-amazon-sqs - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - test-jar - test - - - org.awaitility - awaitility - test - - - org.seleniumhq.selenium - htmlunit-driver - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - generate-sources - - add-source - - - - ${basedir}/target/src/main/java - - - - - add-test-sources - generate-sources - - add-test-source - - - - ${basedir}/target/src/test/java - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - group-sources - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sqs-deployment - ${project.version} - pom - test - - - * - * - - - - - - - skip-testcontainers-tests - - - skip-testcontainers-tests - - - - true - - - - - diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java deleted file mode 100644 index 35eec12964d6..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.sqs.it; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import software.amazon.awssdk.services.sqs.SqsClient; - -@ApplicationScoped -public class Aws2SqsQuarkusClientInvoker { - - @Inject - SqsClient sqs; - -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/resources/application.properties deleted file mode 100644 index 08a0ad9dbd8f..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -quarkus.sqs.sync-client.type=apache -quarkus.devservices.enabled=false diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java deleted file mode 100644 index 7f09e41f607d..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.sqs.it; - -import java.util.Map; -import java.util.Optional; - -import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; - -public class Aws2SqsQuarkusClientTestEnvCustomizer extends Aws2SqsTestEnvCustomizer { - - @Override - public Service[] localstackServices() { - return super.localstackServices(); - } - - @Override - public void customize(Aws2TestEnvContext envContext) { - - super.customize(envContext); - - //remove camel properties for client creation to ensure that client is not created by camel component - envContext.removeClient(localstackServices()); - - Map envContextProperties = envContext.getProperties(); - - if (envContext.isUseDefaultCredentialsProvider()) { - envContext.property("quarkus.sqs.aws.credentials.type", "default"); - } else { - envContext.property("quarkus.sqs.aws.credentials.static-provider.access-key-id", envContext.getAccessKey()); - envContext.property("quarkus.sqs.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey()); - envContext.property("quarkus.sqs.aws.credentials.type", "static"); - } - envContext.property("quarkus.sqs.aws.region", envContext.getRegion()); - - // Propagate localstack environment config to Quarkus AWS if required - Optional overrideEndpoint = envContextProperties - .keySet() - .stream() - .filter(key -> key.endsWith("uri-endpoint-override")) - .findFirst(); - - if (overrideEndpoint.isPresent()) { - String endpoint = envContextProperties.get(overrideEndpoint.get()); - envContext.property("quarkus.sqs.endpoint-override", endpoint); - } - } -} diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer deleted file mode 100644 index ffc9a76cb1b3..000000000000 --- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.apache.camel.quarkus.component.aws2.sqs.it.Aws2SqsQuarkusClientTestEnvCustomizer \ No newline at end of file diff --git a/integration-test-groups/aws2-quarkus-client/pom.xml b/integration-test-groups/aws2-quarkus-client/pom.xml deleted file mode 100644 index 5cfc7a84fe4a..000000000000 --- a/integration-test-groups/aws2-quarkus-client/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-integration-test-groups - 3.17.0-SNAPSHOT - - - camel-quarkus-integration-tests-aws2-quarkus-client - pom - - Camel Quarkus :: AWS 2 Quarkus Client Integration Tests - Camel Quarkus AWS 2 Integration Tests Using Quarkus AWS extensions - - - false - - - - - aws2-ddb - aws2-s3 - aws2-ses - aws2-sqs - aws2-sqs-sns - - - diff --git a/integration-test-groups/pom.xml b/integration-test-groups/pom.xml index 24fa81d8669c..17623791b9f3 100644 --- a/integration-test-groups/pom.xml +++ b/integration-test-groups/pom.xml @@ -39,7 +39,6 @@ aws2 - aws2-quarkus-client azure compression cxf-soap diff --git a/integration-tests/aws2-quarkus-client-grouped/.gitignore b/integration-tests/aws2-quarkus-client-grouped/.gitignore deleted file mode 100644 index 6119608b193c..000000000000 --- a/integration-tests/aws2-quarkus-client-grouped/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ - -# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy -/src/ diff --git a/integration-tests/aws2-quarkus-client-grouped/README.adoc b/integration-tests/aws2-quarkus-client-grouped/README.adoc deleted file mode 100644 index 4332a51214f5..000000000000 --- a/integration-tests/aws2-quarkus-client-grouped/README.adoc +++ /dev/null @@ -1,8 +0,0 @@ -== Camel Quarkus AWS 2 With Quarkus AW2 Client extensions grouped integration tests - -This module allows executing all tests from `integration-test-groups/aws2-quarkus-client/*` grouped together. -See the https://camel.apache.org/camel-quarkus/latest/contributor-guide/extension-testing.html#_grouping[Grouping section] of the Contributor guide for more details. - -=== Mock backend vs. real service - -Please refer to link:../../integration-test-groups/aws2-quarkus-client/README.adoc[integration-test-groups/aws2-quarkus-client/README.adoc] for more details. diff --git a/integration-tests/aws2-quarkus-client-grouped/pom.xml b/integration-tests/aws2-quarkus-client-grouped/pom.xml deleted file mode 100644 index 30a5a9f77457..000000000000 --- a/integration-tests/aws2-quarkus-client-grouped/pom.xml +++ /dev/null @@ -1,402 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-aws2-quarkus-client-grouped - Camel Quarkus :: Integration Tests :: AWS2 Quarkus Client Grouped - AWS 2 tests from ../integration-test-groups/aws2-quarkus-client merged together - - - GroupedQuarkusClient - - - - - - io.quarkiverse.amazonservices - quarkus-amazon-dynamodb - - - io.quarkiverse.amazonservices - quarkus-amazon-s3 - - - io.quarkiverse.amazonservices - quarkus-amazon-ses - - - io.quarkiverse.amazonservices - quarkus-amazon-sns - - - io.quarkiverse.amazonservices - quarkus-amazon-sqs - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - org.apache.camel.quarkus - camel-quarkus-aws2-ddb - - - org.apache.camel.quarkus - camel-quarkus-aws2-kms - - - org.apache.camel.quarkus - camel-quarkus-aws2-s3 - - - org.apache.camel.quarkus - camel-quarkus-aws2-ses - - - org.apache.camel.quarkus - camel-quarkus-aws2-sns - - - org.apache.camel.quarkus - camel-quarkus-aws2-sqs - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.awaitility - awaitility - test - - - org.seleniumhq.selenium - htmlunit-driver - test - - - org.apache.camel.quarkus - camel-quarkus-integration-tests-support-aws2 - test-jar - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - generate-sources - - add-source - - - - ${basedir}/target/src/main/java - - - - - add-test-sources - generate-sources - - add-test-source - - - - ${basedir}/target/src/test/java - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - group-sources - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2-quarkus-client - ${project.basedir} - src/main/resources/application.properties,src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer - ${test.class.name.prefix} - - - - - copy-client-test-sources-ses - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - copy-client-test-sources-ddb - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties,**/*Stream* - ${test.class.name.prefix} - - - - - copy-client-test-sources-s3 - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3 - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - copy-client-test-sources-sqs - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - copy-client-test-sources-sqs-sns - - execute - - generate-sources - - - - - - ${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns - ${project.basedir} - **/*TestEnvCustomizer,**/*application.properties - ${test.class.name.prefix} - - - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-ddb-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-kms-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-s3-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-ses-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sns-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-aws2-sqs-deployment - ${project.version} - pom - test - - - * - * - - - - - - - skip-testcontainers-tests - - - skip-testcontainers-tests - - - - true - - - - - diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 65cdeee604b1..44adecb9b9b8 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -60,7 +60,6 @@ aws2 aws2-grouped - aws2-quarkus-client-grouped azure-grouped base64 bean-validator diff --git a/pom.xml b/pom.xml index 62d2fdcb86ed..d47005860f03 100644 --- a/pom.xml +++ b/pom.xml @@ -940,7 +940,6 @@ integration-tests-jvm/pom.xml integration-test-groups/pom.xml integration-test-groups/aws2/pom.xml - integration-test-groups/aws2-quarkus-client/pom.xml integration-test-groups/azure/pom.xml integration-test-groups/compression/pom.xml integration-test-groups/foundation/pom.xml @@ -985,15 +984,6 @@ ${basedir}/integration-tests/aws2-grouped/pom.xml - - - ${basedir}/integration-test-groups/aws2-quarkus-client - - */pom.xml - - - ${basedir}/integration-tests/aws2-quarkus-client-grouped/pom.xml - ${basedir}/integration-test-groups/azure diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java index 923d3f8d6f8b..ce797b5c3c31 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java @@ -95,9 +95,7 @@ public static CamelQuarkusExtension read(Path runtimePomXmlPath) { unlisted, deprecated, deps == null ? Collections.emptyList() : Collections.unmodifiableList(deps), - kind, - props.getProperty("cq.quarkus.aws.client.baseName"), - props.getProperty("cq.quarkus.aws.client.fqClassName")); + kind); } catch (IOException | XmlPullParserException e) { throw new RuntimeException("Could not read " + runtimePomXmlPath, e); } @@ -118,8 +116,6 @@ public static CamelQuarkusExtension read(Path runtimePomXmlPath) { private final boolean unlisted; private final boolean deprecated; private final Kind kind; - private final String quarkusAwsClientBaseName; - private final String quarkusAwsClientFqClassName; public CamelQuarkusExtension( Path runtimePomXmlPath, @@ -136,9 +132,7 @@ public CamelQuarkusExtension( boolean unlisted, boolean deprecated, List dependencies, - Kind kind, - String quarkusAwsClientBaseName, - String quarkusAwsClientFqClassName) { + Kind kind) { super(); this.runtimePomXmlPath = runtimePomXmlPath; this.camelComponentArtifactId = camelComponentArtifactId; @@ -155,8 +149,6 @@ public CamelQuarkusExtension( this.deprecated = deprecated; this.dependencies = dependencies; this.kind = kind; - this.quarkusAwsClientBaseName = quarkusAwsClientBaseName; - this.quarkusAwsClientFqClassName = quarkusAwsClientFqClassName; } public String getVersion() { @@ -222,13 +214,4 @@ public boolean isDeprecated() { public Kind getKind() { return kind; } - - public Optional getQuarkusAwsClientBaseName() { - return Optional.ofNullable(quarkusAwsClientBaseName); - } - - public Optional getQuarkusAwsClientFqClassName() { - return Optional.ofNullable(quarkusAwsClientFqClassName); - } - } diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java index f29f2e3e870f..d4084480117e 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java @@ -132,8 +132,6 @@ public void execute() throws MojoExecutionException, MojoFailureException { final Path multiModuleProjectDirectoryPath = multiModuleProjectDirectory.toPath(); final CamelQuarkusExtension ext = CamelQuarkusExtension.read(runtimeModuleDir.resolve("pom.xml")); - final Path quarkusAwsClientTestsDir = multiModuleProjectDirectoryPath - .resolve("integration-test-groups/aws2-quarkus-client"); final Path pomRelPath = multiModuleProjectDirectoryPath.relativize(runtimeModuleDir).resolve("pom.xml"); if (ext.getJvmSince().isEmpty()) { @@ -191,14 +189,6 @@ public void execute() throws MojoExecutionException, MojoFailureException { model.put("activatesTransferException", ext.isNativeSupported() && detectComponentOrEndpointOption(catalog, ext.getRuntimeArtifactIdBase(), "transferException")); - model.put( - "quarkusAwsClient", - getQuarkusAwsClient( - quarkusAwsClientTestsDir, - ext.getRuntimeArtifactIdBase(), - ext.getQuarkusAwsClientBaseName(), - ext.getQuarkusAwsClientFqClassName(), - ext.getRuntimePomXmlPath())); model.put("activatesQuarkusLangChain4jBom", ext.getRuntimeArtifactId().contains("langchain4j")); final List configOptions = listConfigOptions( runtimeModuleDir, diff --git a/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc b/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc index d36cee6d3f31..7709f6707143 100644 --- a/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc +++ b/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc @@ -123,7 +123,7 @@ In order to ensure alignment across all Quarkus and LangChain4j related dependen Note that the import order is paramount when using maven `dependencyManagement`. As such, one might need to import the `quarkus-langchain4j-bom` before other related Camel and Quarkus boms. [/#if] -[#if configuration?? || quarkusAwsClient?? || configOptions?size != 0 ] +[#if configuration?? || configOptions?size != 0 ] [id="extensions-[=artifactIdBase]-additional-camel-quarkus-configuration"] == Additional Camel Quarkus configuration @@ -131,39 +131,6 @@ As such, one might need to import the `quarkus-langchain4j-bom` before other rel [=configuration] [/#if] -[#if quarkusAwsClient??] - -[id="extensions-[=artifactIdBase]-optional-integration-with-[=quarkusAwsClient.extensionNameIdHeading]"] -=== Optional integration with [=quarkusAwsClient.extensionName] - -If desired, it is possible to use the [=quarkusAwsClient.extensionName] extension in conjunction with Camel Quarkus [=name]. -Note that this is fully optional and not mandatory at all. -Please follow the [=quarkusAwsClient.configurationUrl][Quarkus documentation] but beware of the following caveats: - -1. The client type `apache` has to be selected by configuring the following property: -+ -[source,properties] ----- -[=quarkusAwsClient.configBase].sync-client.type=apache ----- - -2. The `[=quarkusAwsClient.clientClassSimpleName]` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime. -You can reach that e.g. by adding a dummy bean injecting `[=quarkusAwsClient.clientClassSimpleName]`: -+ -[source,java] ----- -import jakarta.enterprise.context.ApplicationScoped; -import io.quarkus.arc.Unremovable; -import [=quarkusAwsClient.clientClassFqName]; - -@ApplicationScoped -@Unremovable -class Unremovable[=quarkusAwsClient.clientClassSimpleName] { - @Inject - [=quarkusAwsClient.clientClassSimpleName] [=quarkusAwsClient.clientFieldName]; -} ----- -[/#if] [#if configOptions?size != 0 ] [width="100%",cols="80,5,15",options="header"] diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 4f9b4fd6207b..c95b679ad1c0 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -169,7 +169,6 @@ group-09: - xpath group-10: - as2 - - aws2-quarkus-client-grouped - braintree - consul - digitalocean