This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new a82824e72a Test configuration secured by Jasypt with custom profiles
a82824e72a is described below
commit a82824e72ac56b28796edf676a91b7f658fcdd31
Author: James Netherton <[email protected]>
AuthorDate: Mon Feb 19 08:23:57 2024 +0000
Test configuration secured by Jasypt with custom profiles
Fixes #5665
---
integration-tests/jasypt/src/main/resources/application.properties | 5 ++---
.../quarkus/component/jasypt/it/JasyptAlternateConfigProfileIT.java | 2 --
.../component/jasypt/it/JasyptAlternateConfigProfileTest.java | 2 --
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/integration-tests/jasypt/src/main/resources/application.properties
b/integration-tests/jasypt/src/main/resources/application.properties
index 2755c84988..71fa9e9bfc 100644
--- a/integration-tests/jasypt/src/main/resources/application.properties
+++ b/integration-tests/jasypt/src/main/resources/application.properties
@@ -40,9 +40,8 @@ timer.delay.secret = ENC(fmdsyY2xfsVnz1JL5gvL8A==)
timer.repeatCount.secret = ENC(e8n9auBwOA3XuGNZONICkw==)
# Custom profile secret (value translates to: Hello Custom Profile
-# 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)}
+%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
diff --git
a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileIT.java
b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileIT.java
index df8808a3e8..cb553cff6f 100644
---
a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileIT.java
+++
b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileIT.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/5665";)
@QuarkusIntegrationTest
class JasyptAlternateConfigProfileIT extends JasyptAlternateConfigProfileTest {
}
diff --git
a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileTest.java
b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileTest.java
index 538a19aa2b..50247b307b 100644
---
a/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileTest.java
+++
b/integration-tests/jasypt/src/test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptAlternateConfigProfileTest.java
@@ -19,13 +19,11 @@ package org.apache.camel.quarkus.component.jasypt.it;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import static org.hamcrest.Matchers.is;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5665";)
@QuarkusTest
@TestProfile(JasyptAlternateConfigProfileTestProfile.class)
class JasyptAlternateConfigProfileTest {
