You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2025/11/21 21:20:38 UTC
(nifi) branch main updated: NIFI-15242 Reverted property renaming in HashiCorpVaultClientService (#10555)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 6bc8d53453 NIFI-15242 Reverted property renaming in HashiCorpVaultClientService (#10555)
6bc8d53453 is described below
commit 6bc8d53453a7f96a96ca54c2cce2a1e9449a45ef
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Fri Nov 21 16:20:32 2025 -0500
NIFI-15242 Reverted property renaming in HashiCorpVaultClientService (#10555)
Signed-off-by: David Handermann <ex...@apache.org>
---
.../hashicorp/HashiCorpVaultClientService.java | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultClientService.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultClientService.java
index c4787c3539..02290a3d36 100644
--- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultClientService.java
+++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultClientService.java
@@ -46,7 +46,6 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
.build();
PropertyDescriptor VAULT_URI = new PropertyDescriptor.Builder()
- .name("Vault URI")
.name("vault.uri")
.displayName("Vault URI")
.description("The URI of the HashiCorp Vault server (e.g., http://localhost:8200). Required if not specified in the " +
@@ -58,7 +57,8 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
.build();
PropertyDescriptor VAULT_AUTHENTICATION = new PropertyDescriptor.Builder()
- .name("Vault Authentication")
+ .name("vault.authentication")
+ .displayName("Vault Authentication")
.description("Vault authentication method, as described in the Spring Vault Environment Configuration documentation " +
"(https://docs.spring.io/spring-vault/docs/2.3.x/reference/html/#vault.core.environment-vault-configuration).")
.required(true)
@@ -68,7 +68,8 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
.build();
PropertyDescriptor SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
- .name("SSL Context Service")
+ .name("vault.ssl.context.service")
+ .displayName("SSL Context Service")
.description("The SSL Context Service used to provide client certificate information for TLS/SSL connections to the " +
"HashiCorp Vault server.")
.required(false)
@@ -77,7 +78,8 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
.build();
PropertyDescriptor VAULT_PROPERTIES_FILES = new PropertyDescriptor.Builder()
- .name("Vault Properties Files")
+ .name("vault.properties.files")
+ .displayName("Vault Properties Files")
.description("A comma-separated list of files containing HashiCorp Vault configuration properties, as described in the Spring Vault " +
"Environment Configuration documentation (https://docs.spring.io/spring-vault/docs/2.3.x/reference/html/#vault.core.environment-vault-configuration). " +
"All of the Spring property keys and authentication-specific property keys are supported.")
@@ -87,7 +89,8 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
.build();
PropertyDescriptor CONNECTION_TIMEOUT = new PropertyDescriptor.Builder()
- .name("Connection Timeout")
+ .name("vault.connection.timeout")
+ .displayName("Connection Timeout")
.description("The connection timeout for the HashiCorp Vault client")
.required(true)
.defaultValue("5 sec")
@@ -95,7 +98,8 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
.build();
PropertyDescriptor READ_TIMEOUT = new PropertyDescriptor.Builder()
- .name("Read Timeout")
+ .name("vault.read.timeout")
+ .displayName("Read Timeout")
.description("The read timeout for the HashiCorp Vault client")
.required(true)
.defaultValue("15 sec")
@@ -111,11 +115,5 @@ public interface HashiCorpVaultClientService extends ControllerService, Verifiab
@Override
default void migrateProperties(PropertyConfiguration config) {
config.renameProperty("configuration-strategy", CONFIGURATION_STRATEGY.getName());
- config.renameProperty("vault.uri", VAULT_URI.getName());
- config.renameProperty("vault.authentication", VAULT_AUTHENTICATION.getName());
- config.renameProperty("vault.ssl.context.service", SSL_CONTEXT_SERVICE.getName());
- config.renameProperty("vault.properties.files", VAULT_PROPERTIES_FILES.getName());
- config.renameProperty("vault.connection.timeout", CONNECTION_TIMEOUT.getName());
- config.renameProperty("vault.read.timeout", READ_TIMEOUT.getName());
}
}