This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1d0eb655f90695fcd43cddebc354cabcbd3a7323 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Wed Feb 14 10:17:18 2024 +0000 Rework JasyptSecureExtensionConfigTest configuration for native mode --- integration-tests/jasypt/src/main/resources/application.properties | 7 ++++++- .../quarkus/component/jasypt/it/JasyptSecureExtensionConfigIT.java | 2 -- .../jasypt/it/JasyptSecureExtensionConfigTestProfile.java | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-tests/jasypt/src/main/resources/application.properties b/integration-tests/jasypt/src/main/resources/application.properties index 4a46b926f6..2755c84988 100644 --- a/integration-tests/jasypt/src/main/resources/application.properties +++ b/integration-tests/jasypt/src/main/resources/application.properties @@ -19,7 +19,6 @@ # jbang org.apache.camel:camel-jasypt:4.3.0 -c encrypt -p my-password -i "some content to encrypt" quarkus.native.resources.includes = secret.properties -quarkus.datasource.devservices.enabled = false camel.main.routes-include-pattern = routes/jasypt-routes.xml,routes/jasypt-routes.yaml @@ -44,3 +43,9 @@ timer.repeatCount.secret = ENC(e8n9auBwOA3XuGNZONICkw==) # TODO: https://github.com/apache/camel-quarkus/issues/5665 #%custom-profile.greeting.secret = ENC(O8w+UtMRj52Z8PKgJg2tRsE7zFH954LH0GJIayMpr5s=) #%custom-profile.greeting.expression.secret = ${camel-jasypt::ENC(GKJfy64eBDzxUuQCfArd6OjnAaW/oM9e)} + +# Overridden with encrypted values in JasyptSecureExtensionConfigTestProfile +quarkus.datasource.devservices.username = camel +quarkus.datasource.devservices.password = c4m31s3cr3t +quarkus.datasource.username = test-username +quarkus.datasource.password = test-password diff --git a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigIT.java b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigIT.java index d0094d1d55..804126f08e 100644 --- a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigIT.java +++ b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.jasypt.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/5675") @QuarkusIntegrationTest class JasyptSecureExtensionConfigIT extends JasyptSecureExtensionConfigTest { } diff --git a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigTestProfile.java b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigTestProfile.java index 4d6d91bbae..38172767bb 100644 --- a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigTestProfile.java +++ b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigTestProfile.java @@ -26,7 +26,6 @@ public class JasyptSecureExtensionConfigTestProfile implements QuarkusTestProfil @Override public Map<String, String> getConfigOverrides() { return Map.of( - "quarkus.datasource.devservices.enabled", "true", // camel "quarkus.datasource.devservices.username", "ENC(ehEx3VxgoFVuReSFsgyUrw==)",