From 56e27e173f4a5146f29984e5af1c521c37143edc Mon Sep 17 00:00:00 2001 From: Mouhsin Elmajdouby Date: Wed, 25 Dec 2024 14:24:41 +0100 Subject: [PATCH] restructure HashiCorp package to support dedicated and other types of vault --- .../hashicorp/dedicated/HashiVaultResourceFactory.java | 6 +++--- .../dedicated/authentication/HashiCredentials.java | 2 +- .../authentication/HashicorpAuthenticationMethod.java | 2 +- .../authentication/HashicorpCredentialsFactory.java | 4 ++-- .../dedicated/configuration/HashiJsonVaultProvider.java | 8 ++++---- .../HashiVaultSecretsManagerConfigurationProvider.java | 4 ++-- .../configuration/HashicorpConfigurationParameters.java | 6 +++--- .../secrets/HashiVaultSecretsManagerFactory.java | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/HashiVaultResourceFactory.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/HashiVaultResourceFactory.java index 2eb035d1..5c8861f3 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/HashiVaultResourceFactory.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/HashiVaultResourceFactory.java @@ -1,9 +1,9 @@ -package oracle.jdbc.provider.hashicorp; +package oracle.jdbc.provider.hashicorp.dedicated; import oracle.jdbc.provider.factory.Resource; import oracle.jdbc.provider.factory.ResourceFactory; -import oracle.jdbc.provider.hashicorp.authentication.HashiCredentials; -import oracle.jdbc.provider.hashicorp.authentication.HashicorpCredentialsFactory; +import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashiCredentials; +import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashicorpCredentialsFactory; import oracle.jdbc.provider.parameter.ParameterSet; /** diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashiCredentials.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashiCredentials.java index 541e04c5..e8e86eaa 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashiCredentials.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashiCredentials.java @@ -1,4 +1,4 @@ -package oracle.jdbc.provider.hashicorp.authentication; +package oracle.jdbc.provider.hashicorp.dedicated.authentication; /** * Simple credentials object for HashiCorp Vault that holds a token. diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpAuthenticationMethod.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpAuthenticationMethod.java index c541109e..bbcead61 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpAuthenticationMethod.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpAuthenticationMethod.java @@ -1,4 +1,4 @@ -package oracle.jdbc.provider.hashicorp.authentication; +package oracle.jdbc.provider.hashicorp.dedicated.authentication; /** * A method of authentication using HashiCorp Vault. diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpCredentialsFactory.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpCredentialsFactory.java index c200c5b9..5bcd65e5 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpCredentialsFactory.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpCredentialsFactory.java @@ -1,8 +1,8 @@ -package oracle.jdbc.provider.hashicorp.authentication; +package oracle.jdbc.provider.hashicorp.dedicated.authentication; import oracle.jdbc.provider.factory.Resource; import oracle.jdbc.provider.factory.ResourceFactory; -import oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory; +import oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory; import oracle.jdbc.provider.parameter.Parameter; import oracle.jdbc.provider.parameter.ParameterSet; diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiJsonVaultProvider.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiJsonVaultProvider.java index ac27a812..bb6307eb 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiJsonVaultProvider.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiJsonVaultProvider.java @@ -1,7 +1,7 @@ -package oracle.jdbc.provider.hashicorp.configuration; +package oracle.jdbc.provider.hashicorp.dedicated.configuration; import oracle.jdbc.provider.configuration.JsonSecretUtil; -import oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory; +import oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory; import oracle.jdbc.provider.parameter.ParameterSet; import oracle.jdbc.spi.OracleConfigurationJsonSecretProvider; import oracle.sql.json.OracleJsonObject; @@ -10,8 +10,8 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; -import static oracle.jdbc.provider.hashicorp.configuration.HashiVaultSecretsManagerConfigurationProvider.PARAMETER_SET_PARSER; -import static oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory.FIELD_NAME; +import static oracle.jdbc.provider.hashicorp.dedicated.configuration.HashiVaultSecretsManagerConfigurationProvider.PARAMETER_SET_PARSER; +import static oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory.FIELD_NAME; public class HashiJsonVaultProvider implements OracleConfigurationJsonSecretProvider { diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiVaultSecretsManagerConfigurationProvider.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiVaultSecretsManagerConfigurationProvider.java index c816275a..b182fc64 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiVaultSecretsManagerConfigurationProvider.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiVaultSecretsManagerConfigurationProvider.java @@ -1,7 +1,7 @@ -package oracle.jdbc.provider.hashicorp.configuration; +package oracle.jdbc.provider.hashicorp.dedicated.configuration; import oracle.jdbc.driver.OracleConfigurationJsonProvider; -import oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory; +import oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory; import oracle.jdbc.provider.parameter.ParameterSet; import oracle.jdbc.provider.parameter.ParameterSetParser; import oracle.jdbc.util.OracleConfigurationCache; diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashicorpConfigurationParameters.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashicorpConfigurationParameters.java index 81416a89..0aa814ab 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashicorpConfigurationParameters.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashicorpConfigurationParameters.java @@ -1,7 +1,7 @@ -package oracle.jdbc.provider.hashicorp.configuration; +package oracle.jdbc.provider.hashicorp.dedicated.configuration; -import oracle.jdbc.provider.hashicorp.authentication.HashicorpAuthenticationMethod; -import oracle.jdbc.provider.hashicorp.authentication.HashicorpCredentialsFactory; +import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashicorpAuthenticationMethod; +import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashicorpCredentialsFactory; import oracle.jdbc.provider.parameter.ParameterSetParser; /** diff --git a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/secrets/HashiVaultSecretsManagerFactory.java b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/secrets/HashiVaultSecretsManagerFactory.java index c94e8bae..a6e328e2 100644 --- a/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/secrets/HashiVaultSecretsManagerFactory.java +++ b/ojdbc-provider-hashicorp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/secrets/HashiVaultSecretsManagerFactory.java @@ -1,10 +1,10 @@ -package oracle.jdbc.provider.hashicorp.secrets; +package oracle.jdbc.provider.hashicorp.dedicated.secrets; import oracle.jdbc.provider.cache.CachedResourceFactory; import oracle.jdbc.provider.factory.Resource; import oracle.jdbc.provider.factory.ResourceFactory; -import oracle.jdbc.provider.hashicorp.HashiVaultResourceFactory; -import oracle.jdbc.provider.hashicorp.authentication.HashiCredentials; +import oracle.jdbc.provider.hashicorp.dedicated.HashiVaultResourceFactory; +import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashiCredentials; import oracle.jdbc.provider.parameter.Parameter; import oracle.jdbc.provider.parameter.ParameterSet; import oracle.sql.json.OracleJsonFactory;