From 700ba5083f2f8630cf84790649a571151823eecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Thu, 24 Aug 2023 22:28:34 +0200 Subject: [PATCH] Adapt QuickStarts for remote Docker agent on same network --- .../src/main/resources/application.properties | 4 ++-- .../processor/QuoteProcessorTest.java | 7 +++++-- security-jdbc-quickstart/pom.xml | 10 ---------- .../src/main/resources/application.properties | 8 +++++--- .../security/jdbc/JdbcSecurityRealmTest.java | 19 ------------------- 5 files changed, 12 insertions(+), 36 deletions(-) diff --git a/mqtt-quickstart/src/main/resources/application.properties b/mqtt-quickstart/src/main/resources/application.properties index df17886f72..fdc6ed02e6 100644 --- a/mqtt-quickstart/src/main/resources/application.properties +++ b/mqtt-quickstart/src/main/resources/application.properties @@ -3,13 +3,13 @@ # Configure the MQTT sink (we write to it) mp.messaging.outgoing.topic-price.connector=smallrye-mqtt mp.messaging.outgoing.topic-price.topic=prices -mp.messaging.outgoing.topic-price.host=localhost +mp.messaging.outgoing.topic-price.host=${MQTT_HOST:localhost} mp.messaging.outgoing.topic-price.port=1883 mp.messaging.outgoing.topic-price.auto-generated-client-id=true # Configure the MQTT source (we read from it) mp.messaging.incoming.prices.connector=smallrye-mqtt mp.messaging.incoming.prices.topic=prices -mp.messaging.incoming.prices.host=localhost +mp.messaging.incoming.prices.host=${MQTT_HOST:localhost} mp.messaging.incoming.prices.port=1883 mp.messaging.incoming.prices.auto-generated-client-id=true diff --git a/rabbitmq-quickstart/rabbitmq-quickstart-processor/src/test/java/org/acme/rabbitmq/processor/QuoteProcessorTest.java b/rabbitmq-quickstart/rabbitmq-quickstart-processor/src/test/java/org/acme/rabbitmq/processor/QuoteProcessorTest.java index 55ab1cbed0..309f5b4490 100644 --- a/rabbitmq-quickstart/rabbitmq-quickstart-processor/src/test/java/org/acme/rabbitmq/processor/QuoteProcessorTest.java +++ b/rabbitmq-quickstart/rabbitmq-quickstart-processor/src/test/java/org/acme/rabbitmq/processor/QuoteProcessorTest.java @@ -19,6 +19,7 @@ import com.rabbitmq.client.DeliverCallback; import org.acme.rabbitmq.model.Quote; +import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusTest; @@ -26,6 +27,8 @@ @QuarkusTest public class QuoteProcessorTest { + @ConfigProperty(name = "rabbitmq-host") String host; + @ConfigProperty(name = "rabbitmq-port") int port; ObjectMapper objectMapper = new ObjectMapper(); @Test @@ -63,8 +66,8 @@ void testProcessor() throws Exception { Channel getChannel() throws Exception { ConnectionFactory connectionFactory = new ConnectionFactory(); - connectionFactory.setHost("localhost"); - connectionFactory.setPort(5672); + connectionFactory.setHost(host); + connectionFactory.setPort(port); connectionFactory.setUsername("guest"); connectionFactory.setPassword("guest"); connectionFactory.setChannelRpcTimeout((int) SECONDS.toMillis(3)); diff --git a/security-jdbc-quickstart/pom.xml b/security-jdbc-quickstart/pom.xml index 35b16643b9..e624d9da64 100644 --- a/security-jdbc-quickstart/pom.xml +++ b/security-jdbc-quickstart/pom.xml @@ -49,16 +49,6 @@ rest-assured test - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - postgresql - test - diff --git a/security-jdbc-quickstart/src/main/resources/application.properties b/security-jdbc-quickstart/src/main/resources/application.properties index cd02e27524..a34e2a28d3 100644 --- a/security-jdbc-quickstart/src/main/resources/application.properties +++ b/security-jdbc-quickstart/src/main/resources/application.properties @@ -1,7 +1,7 @@ quarkus.datasource.db-kind=postgresql -quarkus.datasource.username=quarkus -quarkus.datasource.password=quarkus -quarkus.datasource.jdbc.url=jdbc:postgresql:elytron_security_jdbc +%prod.quarkus.datasource.username=quarkus +%prod.quarkus.datasource.password=quarkus +%prod.quarkus.datasource.jdbc.url=jdbc:postgresql:elytron_security_jdbc quarkus.security.jdbc.enabled=true quarkus.security.jdbc.principal-query.sql=SELECT u.password, u.role FROM test_user u WHERE u.username=? @@ -9,3 +9,5 @@ quarkus.security.jdbc.principal-query.clear-password-mapper.enabled=true quarkus.security.jdbc.principal-query.clear-password-mapper.password-index=1 quarkus.security.jdbc.principal-query.attribute-mappings.0.index=2 quarkus.security.jdbc.principal-query.attribute-mappings.0.to=groups + +%test.quarkus.datasource.devservices.init-script-path=test_user.sql diff --git a/security-jdbc-quickstart/src/test/java/org/acme/security/jdbc/JdbcSecurityRealmTest.java b/security-jdbc-quickstart/src/test/java/org/acme/security/jdbc/JdbcSecurityRealmTest.java index 3a1ee84e1c..d5f5474117 100644 --- a/security-jdbc-quickstart/src/test/java/org/acme/security/jdbc/JdbcSecurityRealmTest.java +++ b/security-jdbc-quickstart/src/test/java/org/acme/security/jdbc/JdbcSecurityRealmTest.java @@ -9,32 +9,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; import io.quarkus.test.junit.QuarkusTest; -@Testcontainers @QuarkusTest @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class JdbcSecurityRealmTest { - @Container - public static final PostgreSQLContainer DATABASE = new PostgreSQLContainer<>() - .withDatabaseName("elytron_security_jdbc") - .withUsername("quarkus") - .withPassword("quarkus") - .withExposedPorts(5432) - .withCreateContainerCmdModifier(cmd -> cmd - .withHostName("localhost") - .withPortBindings(new PortBinding(Ports.Binding.bindPort(5432), new ExposedPort(5432)))) - .withInitScript("test_user.sql"); - @Test @Order(1) void shouldAccessPublicWhenAnonymous() {