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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a7051debef0 CAMEL-21375 - Camel-AWS-Secrets-Manager: Support
Properties Function with Localstack in Spring Boot (#1265)
a7051debef0 is described below
commit a7051debef01569cb46523507e9d0b4062599737
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Oct 23 12:25:03 2024 +0200
CAMEL-21375 - Camel-AWS-Secrets-Manager: Support Properties Function with
Localstack in Spring Boot (#1265)
* CAMEL-21375 - Camel-AWS-Secrets-Manager: Support Properties Function with
Localstack in Spring Boot
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
* CAMEL-21375 - Camel-AWS-Secrets-Manager: Support Properties Function with
Localstack in Spring Boot
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../src/main/docs/spring-boot.json | 13 +++++++++++
.../boot/vault/AwsVaultAutoConfiguration.java | 2 ++
.../vault/AwsVaultConfigurationProperties.java | 27 ++++++++++++++++++++++
.../boot/vault/AwsVaultConfigurationTest.java | 5 +++-
4 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index b357c22774f..f13f2d3bdff 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1695,6 +1695,13 @@
"sourceType":
"org.apache.camel.spring.boot.vault.AwsVaultConfigurationProperties",
"defaultValue": false
},
+ {
+ "name": "camel.vault.aws.override-endpoint",
+ "type": "java.lang.Boolean",
+ "description": "Set the need for overriding the endpoint. This option
needs to be used in combination with the uriEndpointOverride option",
+ "sourceType":
"org.apache.camel.spring.boot.vault.AwsVaultConfigurationProperties",
+ "defaultValue": false
+ },
{
"name": "camel.vault.aws.profile-credentials-provider",
"type": "java.lang.Boolean",
@@ -1746,6 +1753,12 @@
"description": "In case of usage of SQS notification this field will
specified the Queue URL to use",
"sourceType":
"org.apache.camel.spring.boot.vault.AwsVaultConfigurationProperties"
},
+ {
+ "name": "camel.vault.aws.uri-endpoint-override",
+ "type": "java.lang.String",
+ "description": "Set the overriding uri endpoint. This option needs to be
used in combination with overrideEndpoint option",
+ "sourceType":
"org.apache.camel.spring.boot.vault.AwsVaultConfigurationProperties"
+ },
{
"name": "camel.vault.aws.use-sqs-notification",
"type": "java.lang.Boolean",
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultAutoConfiguration.java
index cb39065122e..d544687b21d 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultAutoConfiguration.java
@@ -44,6 +44,8 @@ public class AwsVaultAutoConfiguration {
answer.setSecrets(config.getSecrets());
answer.setUseSqsNotification(config.isUseSqsNotification());
answer.setSqsQueueUrl(config.getSqsQueueUrl());
+ answer.setUriEndpointOverride(config.getUriEndpointOverride());
+ answer.setOverrideEndpoint(config.isOverrideEndpoint());
return answer;
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationProperties.java
index 363bdb064f2..ecf5f11fd43 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationProperties.java
@@ -77,6 +77,17 @@ public class AwsVaultConfigurationProperties {
*/
private String sqsQueueUrl;
+ /**
+ * Set the need for overriding the endpoint. This option needs to be used
in combination with the
+ * uriEndpointOverride option
+ */
+ private boolean overrideEndpoint;
+
+ /**
+ * Set the overriding uri endpoint. This option needs to be used in
combination with overrideEndpoint option
+ */
+ private String uriEndpointOverride;
+
public String getAccessKey() {
return accessKey;
}
@@ -164,4 +175,20 @@ public class AwsVaultConfigurationProperties {
public void setSqsQueueUrl(String sqsQueueUrl) {
this.sqsQueueUrl = sqsQueueUrl;
}
+
+ public boolean isOverrideEndpoint() {
+ return overrideEndpoint;
+ }
+
+ public void setOverrideEndpoint(boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
+
+ public String getUriEndpointOverride() {
+ return uriEndpointOverride;
+ }
+
+ public void setUriEndpointOverride(String uriEndpointOverride) {
+ this.uriEndpointOverride = uriEndpointOverride;
+ }
}
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java
index 133d7016d9a..d3a3a6ed63d 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.Assert;
@DirtiesContext
@CamelSpringBootTest
@@ -32,7 +33,7 @@ import org.springframework.test.annotation.DirtiesContext;
"camel.vault.aws.secretKey=mySecretKey",
"camel.vault.aws.region=myRegion",
"camel.vault.aws.defaultCredentialsProvider=false",
"camel.vault.aws.refreshPeriod=60000",
"camel.vault.aws.refreshEnabled=false",
"camel.vault.aws.secrets=supersecret",
- "camel.vault.aws.profile-credentials-provider=true",
"camel.vault.aws.profile-name=test",
"camel.vault.aws.use-sqs-notification=true",
"camel.vault.aws.sqs-queue-url=http://sqs-2"; })
+ "camel.vault.aws.profile-credentials-provider=true",
"camel.vault.aws.profile-name=test",
"camel.vault.aws.use-sqs-notification=true",
"camel.vault.aws.sqs-queue-url=http://sqs-2";,
"camel.vault.aws.override-endpoint=true",
"camel.vault.aws.uri-endpoint-override=http://localhost:8080"; })
public class AwsVaultConfigurationTest {
@Autowired
@@ -51,5 +52,7 @@ public class AwsVaultConfigurationTest {
Assertions.assertEquals(true,
camelContext.getVaultConfiguration().aws().isProfileCredentialsProvider());
Assertions.assertEquals(true,
camelContext.getVaultConfiguration().aws().isUseSqsNotification());
Assertions.assertEquals("http://sqs-2";,
camelContext.getVaultConfiguration().aws().getSqsQueueUrl());
+
Assertions.assertTrue(camelContext.getVaultConfiguration().aws().isOverrideEndpoint());
+ Assertions.assertEquals("http://localhost:8080";,
camelContext.getVaultConfiguration().aws().getUriEndpointOverride());
}
}
