Remove spring.cloud.vault.generic configuration properties.
Spring Cloud Vault uses now a single mechanism for key-value backend configuration. Properties at spring.cloud.vault.generic.* are no longer supported. All associated functionality is now solely available by configuring the corresponding spring.cloud.vault.kv.* properties. The support classes GenericSecretBackendMetadata and VaultGenericBackendProperties were removed in favor of KeyValueSecretBackendMetadata respective VaultKeyValueBackendProperties. spring.cloud.vault.kv.enabled is now enabled by default to preserve spring.cloud.vault.generic.enabled behavior. Closes gh-395
This commit is contained in:
@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.cloud.vault.config.GenericSecretBackendMetadata;
|
||||
import org.springframework.cloud.vault.config.KeyValueSecretBackendMetadata;
|
||||
import org.springframework.cloud.vault.config.SecretBackendMetadata;
|
||||
import org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory;
|
||||
import org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfigurationTests.CustomBootstrapConfiguration;
|
||||
@@ -57,7 +57,7 @@ public class VaultConfigDatabaseBootstrapConfigurationTests
|
||||
|
||||
SecretBackendMetadata metadata = this.factory.createMetadata(this.properties);
|
||||
|
||||
assertThat(metadata).isInstanceOf(GenericSecretBackendMetadata.class);
|
||||
assertThat(metadata).isInstanceOf(KeyValueSecretBackendMetadata.class);
|
||||
assertThat(metadata.getPath()).isEqualTo(this.properties.getRole());
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ public class VaultConfigDatabaseBootstrapConfigurationTests
|
||||
@Override
|
||||
public SecretBackendMetadata createMetadata(
|
||||
DatabaseSecretProperties backendDescriptor) {
|
||||
return GenericSecretBackendMetadata
|
||||
return KeyValueSecretBackendMetadata
|
||||
.create(backendDescriptor.getRole());
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user