This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1f59c15f9dba29ceee69d8b722f36c0fb2957698
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jul 14 10:51:08 2022 +0200
CAMEL-17688 - Support ability to load properties from Vault/Secrets cloud
services - Hashicorp Vault
---
.../HashicorpVaultPropertiesSourceTestIT.java | 60 +++++++++++++---------
1 file changed, 35 insertions(+), 25 deletions(-)
diff --git
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceTestIT.java
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceTestIT.java
index 1675ce2f6bd..fd2a43122d4 100644
---
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceTestIT.java
+++
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceTestIT.java
@@ -41,7 +41,7 @@ public class HashicorpVaultPropertiesSourceTestIT extends
CamelTestSupport {
});
context.start();
- getMockEndpoint("mock:bar").expectedBodiesReceived("{id=21}");
+ getMockEndpoint("mock:bar").expectedBodiesReceived("{id=21,
password=password, username=admin}");
template.sendBody("direct:start", "Hello World");
@@ -86,23 +86,25 @@ public class HashicorpVaultPropertiesSourceTestIT extends
CamelTestSupport {
});
context.start();
- getMockEndpoint("mock:bar").expectedBodiesReceived("pippo", "pippo");
+ getMockEndpoint("mock:bar").expectedBodiesReceived("admin",
"password");
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
assertMockEndpointsSatisfied();
}
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_SECRET_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_REGION", matches =
".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_TOKEN_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_ENGINE_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_HOST_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_PORT_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_SCHEME_ENV",
matches = ".*")
@Test
public void testSecretNotFoundFunction() {
Exception exception = assertThrows(FailedToCreateRouteException.class,
() -> {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("direct:start").setBody(simple("{{aws:testExample}}")).to("mock:bar");
+
from("direct:start").setBody(simple("{{hashicorp:testExample}}")).to("mock:bar");
}
});
context.start();
@@ -115,16 +117,18 @@ public class HashicorpVaultPropertiesSourceTestIT extends
CamelTestSupport {
});
}
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_SECRET_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_REGION", matches =
".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_TOKEN_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_ENGINE_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_HOST_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_PORT_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_SCHEME_ENV",
matches = ".*")
@Test
public void testComplexNoSubkeyPropertiesFunction() {
Exception exception = assertThrows(FailedToCreateRouteException.class,
() -> {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("direct:username").setBody(simple("{{aws:database_sample/not_existent}}")).to("mock:bar");
+
from("direct:username").setBody(simple("{{hashicorp:database_sample/not_existent}}")).to("mock:bar");
}
});
context.start();
@@ -136,16 +140,18 @@ public class HashicorpVaultPropertiesSourceTestIT extends
CamelTestSupport {
});
}
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_SECRET_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_REGION", matches =
".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_TOKEN_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_ENGINE_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_HOST_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_PORT_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_SCHEME_ENV",
matches = ".*")
@Test
public void testComplexCustomPropertiesDefaultValueFunction() throws
Exception {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("direct:username").setBody(simple("{{aws:postgresql/additional1:admin}}")).to("mock:bar");
-
from("direct:password").setBody(simple("{{aws:postgresql/additional2:secret}}")).to("mock:bar");
+
from("direct:username").setBody(simple("{{hashicorp:hello/additional1:admin}}")).to("mock:bar");
+
from("direct:password").setBody(simple("{{hashicorp:hello/additional2:secret}}")).to("mock:bar");
}
});
context.start();
@@ -157,16 +163,18 @@ public class HashicorpVaultPropertiesSourceTestIT extends
CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_SECRET_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_REGION", matches =
".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_TOKEN_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_ENGINE_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_HOST_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_PORT_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_SCHEME_ENV",
matches = ".*")
@Test
public void testComplexCustomPropertiesDefaultValueExceptionFunction()
throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("direct:username").setBody(simple("{{aws:test-3/additional1:admin}}")).to("mock:bar");
-
from("direct:password").setBody(simple("{{aws:test-3/additional2:secret}}")).to("mock:bar");
+
from("direct:username").setBody(simple("{{hashicorp:test-3/additional1:admin}}")).to("mock:bar");
+
from("direct:password").setBody(simple("{{hashicorp:test-3/additional2:secret}}")).to("mock:bar");
}
});
context.start();
@@ -178,17 +186,19 @@ public class HashicorpVaultPropertiesSourceTestIT extends
CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_SECRET_KEY",
matches = ".*")
- @EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_REGION", matches =
".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_TOKEN_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_ENGINE_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_HOST_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_PORT_ENV",
matches = ".*")
+ @EnabledIfEnvironmentVariable(named = "CAMEL_HASHICORP_VAULT_SCHEME_ENV",
matches = ".*")
@Test
public void testComplexCustomPropertiesExceptionFunction() {
Exception exception = assertThrows(FailedToCreateRouteException.class,
() -> {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("direct:username").setBody(simple("{{aws:test-3/additional1}}")).to("mock:bar");
-
from("direct:password").setBody(simple("{{aws:test-3/additional2}}")).to("mock:bar");
+
from("direct:username").setBody(simple("{{hashicorp:test-3/additional1}}")).to("mock:bar");
+
from("direct:password").setBody(simple("{{hashicorp:test-3/additional2}}")).to("mock:bar");
}
});
context.start();
