This is an automated email from the ASF dual-hosted git repository.
pvillard31 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 57ce066e784 NIFI-16327 Added Vault Client Customizer for namespace
header (#11707)
57ce066e784 is described below
commit 57ce066e784adc36d71d0c95cd83cb62843e713d
Author: David Handermann <[email protected]>
AuthorDate: Tue Sep 22 04:14:06 2026 -0500
NIFI-16327 Added Vault Client Customizer for namespace header (#11707)
---
.../nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
index 190684aafd7..613f41184b9 100644
---
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
+++
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
@@ -25,6 +25,7 @@ import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.support.ResourcePropertySource;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.vault.client.RestTemplateFactory;
+import org.springframework.vault.client.VaultClientCustomizer;
import org.springframework.vault.config.AbstractVaultConfiguration;
import org.springframework.vault.config.EnvironmentVaultConfiguration;
import
org.springframework.vault.core.VaultKeyValueOperationsSupport.KeyValueBackend;
@@ -69,6 +70,7 @@ public class HashiCorpVaultConfiguration extends
EnvironmentVaultConfiguration {
private static final String HTTPS = "https";
private static final String CLIENT_HTTP_REQUEST_FACTORY_WRAPPER_BEAN =
"clientHttpRequestFactoryWrapper";
+ private static final String VAULT_CLIENT_CUSTOMIZER_BEAN =
"vaultClientCustomizer";
private final SslConfiguration sslConfiguration;
private final ClientOptions clientOptions;
@@ -129,6 +131,12 @@ public class HashiCorpVaultConfiguration extends
EnvironmentVaultConfiguration {
this.applicationContext = new HashiCorpVaultApplicationContext(env);
this.setApplicationContext(applicationContext);
+ final String namespace = getNamespace();
+ if (namespace != null && !namespace.isEmpty()) {
+ final VaultClientCustomizer vaultClientCustomizer = builder ->
builder.defaultNamespace(namespace);
+
applicationContext.getBeanFactory().registerSingleton(VAULT_CLIENT_CUSTOMIZER_BEAN,
vaultClientCustomizer);
+ }
+
sslConfiguration =
env.getProperty(VaultConfigurationKey.URI.key).contains(HTTPS)
? super.sslConfiguration() : SslConfiguration.unconfigured();