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

Reinstate VaultConfigCassandraTests

Browse Source 
Closes gh-380.
This commit is contained in:
Mark Paluch
2020-03-19 11:34:15 +01:00
parent 5fe5c96adb
commit cf16437e2b
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
View File

@@ -20,10 +20,12 @@ import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
import com.datastax.oss.driver.api.core.CqlSession;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -33,13 +35,9 @@ import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assume.assumeTrue;
// FIXME: 3.0.0
//import com.datastax.driver.core.Cluster;
//import com.datastax.driver.core.PlainTextAuthProvider;
//import com.datastax.driver.core.Session;
/**
* Integration tests using the cassandra secret backend. In case this test should fail
* because of SSL make sure you run the test within the
@@ -72,8 +70,8 @@ public class VaultConfigCassandraTests {
@Value("${spring.data.cassandra.password}")
String password;
// @Autowired
// Cluster cluster;
@Autowired
CqlSession cqlSession;
/**
* Initialize the cassandra secret backend.
@@ -110,25 +108,18 @@ public class VaultConfigCassandraTests {
}
@Test
public void shouldConnectUsingCluster() {
// this.cluster.connect().close();
}
@Test
public void shouldUseAuthenticationSet() {
// assertThat(this.cluster.getConfiguration().getProtocolOptions().getAuthProvider())
// .isInstanceOf(PlainTextAuthProvider.class);
public void shouldUseAuthenticatedSession() {
assertThat(this.cqlSession.getMetadata().getKeyspace("system")).isNotEmpty();
}
@Test
public void shouldConnectUsingCassandraClient() {
// try (Cluster cluster = Cluster.builder().addContactPoint(CASSANDRA_HOST)
// .withAuthProvider(new PlainTextAuthProvider(this.username, this.password))
// .withoutJMXReporting().build()) {
// Session session = cluster.connect();
// session.close();
// }
try (CqlSession session = CqlSession.builder().withLocalDatacenter("dc1")
.addContactPoint(new InetSocketAddress(CASSANDRA_HOST, CASSANDRA_PORT))
.withAuthCredentials(this.username, this.password).build()) {
assertThat(session.getMetadata().getKeyspace("system")).isNotEmpty();
}
}
@SpringBootApplication

1
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
View File

@@ -48,6 +48,7 @@ public class VaultBootstrapPropertySourceConfigurationTests {
public void shouldConfigureExpiryTimeouts() {
this.contextRunner.withUserConfiguration(MockConfiguration.class)
.withAllowBeanDefinitionOverriding(true)
.withPropertyValues("spring.cloud.vault.generic.enabled=false",
"spring.cloud.vault.config.lifecycle.expiry-threshold=5m",
"spring.cloud.vault.config.lifecycle.min-renewal=6m",

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
View File

@@ -48,7 +48,8 @@ public class VaultReactiveBootstrapConfigurationTests {
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(
AutoConfigurations.of(VaultReactiveBootstrapConfiguration.class));
AutoConfigurations.of(VaultReactiveBootstrapConfiguration.class))
.withAllowBeanDefinitionOverriding(true);
@Test
public void shouldConfigureTemplate() {