SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Retain Vault JSON data type in property source.

Browse Source 
Closes gh-189.
This commit is contained in:
Mark Paluch
2018-01-17 15:55:09 +01:00
parent 3490cabbde
commit 5dd65c8fcd
14 changed files with 82 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java
View File

@@ -15,10 +15,6 @@
*/
package org.springframework.cloud.vault.config.databases;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
@@ -34,6 +30,10 @@ import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
/**
* Integration tests for {@link VaultConfigTemplate} using the cassandra secret backend.
* This test requires a running Cassandra instance, see {@link #CASSANDRA_HOST} and other
@@ -97,9 +97,9 @@ public class CassandraSecretIntegrationTests extends IntegrationTestSupport {
}
@Test
public void shouldCreateCredentialsCorrectly() throws Exception {
public void shouldCreateCredentialsCorrectly() {
Map<String, String> secretProperties = configOperations
Map<String, Object> secretProperties = configOperations
.read(forDatabase(cassandra)).getData();
assertThat(secretProperties).containsKeys("spring.data.cassandra.username",

13
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java
View File

@@ -15,10 +15,6 @@
*/
package org.springframework.cloud.vault.config.databases;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.HashMap;
@@ -36,6 +32,10 @@ import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.Version;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
/**
* Integration tests for {@link VaultConfigTemplate} using the mongodb secret backend.
* This test requires a running MongoDB instance, see {@link #ROOT_CREDENTIALS}.
@@ -89,9 +89,10 @@ public class MongoSecretIntegrationTests extends IntegrationTestSupport {
}
@Test
public void shouldCreateCredentialsCorrectly() throws Exception {
public void shouldCreateCredentialsCorrectly() {
Map<String, String> secretProperties = configOperations.read(forDatabase(mongodb))
Map<String, Object> secretProperties = configOperations
.read(forDatabase(mongodb))
.getData();
assertThat(secretProperties).containsKeys("spring.data.mongodb.username",

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java
View File

@@ -31,9 +31,9 @@ import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.Version;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assume.assumeTrue;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
/**
* Integration tests for {@link VaultConfigTemplate} using the {@code database} secret
@@ -95,9 +95,9 @@ public class MySqlDatabaseSecretIntegrationTests extends IntegrationTestSupport
}
@Test
public void shouldCreateCredentialsCorrectly() throws Exception {
public void shouldCreateCredentialsCorrectly() {
Map<String, String> secretProperties = configOperations.read(forDatabase(mySql))
Map<String, Object> secretProperties = configOperations.read(forDatabase(mySql))
.getData();
assertThat(secretProperties).containsKeys("spring.datasource.username",

13
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java
View File

@@ -15,16 +15,13 @@
*/
package org.springframework.cloud.vault.config.databases;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
import org.springframework.cloud.vault.config.VaultProperties;
@@ -33,6 +30,10 @@ import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
/**
* Integration tests for {@link VaultConfigTemplate} using the mysql secret backend. This
* test requires a running MySQL instance, see {@link #ROOT_CREDENTIALS}.
@@ -82,9 +83,9 @@ public class MySqlSecretIntegrationTests extends IntegrationTestSupport {
}
@Test
public void shouldCreateCredentialsCorrectly() throws Exception {
public void shouldCreateCredentialsCorrectly() {
Map<String, String> secretProperties = configOperations.read(forDatabase(mySql))
Map<String, Object> secretProperties = configOperations.read(forDatabase(mySql))
.getData();
assertThat(secretProperties).containsKeys("spring.datasource.username",

14
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java
View File

@@ -15,16 +15,13 @@
*/
package org.springframework.cloud.vault.config.databases;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
import org.springframework.cloud.vault.config.VaultProperties;
@@ -33,6 +30,10 @@ import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*;
import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.*;
/**
* Integration tests for
* {@link org.springframework.cloud.vault.config.VaultConfigTemplate} using the postgresql
@@ -91,13 +92,12 @@ public class PostgreSqlSecretIntegrationTests extends IntegrationTestSupport {
}
@Test
public void shouldCreateCredentialsCorrectly() throws Exception {
public void shouldCreateCredentialsCorrectly() {
Map<String, String> secretProperties = configOperations
Map<String, Object> secretProperties = configOperations
.read(forDatabase(postgreSql)).getData();
assertThat(secretProperties).containsKeys("spring.datasource.username",
"spring.datasource.password");
}
}