Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework JasyptSecureExtensionConfigTest configuration for native mode #5752

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Rework JasyptSecureExtensionConfigTest configuration for native mode #5752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
946ea23
Rework JasyptSecureExtensionConfigTest configuration for native mode
jamesnetherton Feb 14, 2024
9ef061f
Enable JasyptSecureExtensionConfigTest.secureDirectComponentTimeout
jamesnetherton Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion integration-tests/jasypt/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
2 changes: 0 additions & 2 deletions ...test/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
}
2 changes: 0 additions & 2 deletions ...st/java/org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
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.api.Test;

import static org.hamcrest.Matchers.is;
Expand All @@ -36,7 +35,6 @@ void secureDatabaseCredentials() throws InterruptedException {
.body(is("camel"));
}

@Disabled("https://github.com/apache/camel-quarkus/issues/5675")
@Test
void secureDirectComponentTimeout() throws InterruptedException {
RestAssured.given()
Expand Down
1 change: 0 additions & 1 deletion .../org/apache/camel/quarkus/component/jasypt/it/JasyptSecureExtensionConfigTestProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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==)",
Expand Down
Loading