Upgrade to Apache Cassandra 3.11.4

Closes gh-282
This commit is contained in:
Mark Paluch
2019-02-13 15:12:28 +01:00
parent a9498efcaa
commit 7ab399e278
4 changed files with 567 additions and 202 deletions

View File

@@ -32,10 +32,10 @@ before_install:
install:
- mkdir -p download
- test -f download/apache-cassandra-2.2.8-bin.tar.gz || wget https://archive.apache.org/dist/cassandra/2.2.8/apache-cassandra-2.2.8-bin.tar.gz -O download/apache-cassandra-2.2.8-bin.tar.gz
- tar xzf download/apache-cassandra-2.2.8-bin.tar.gz
- cp -f spring-cloud-vault-config-databases/src/test/resources/cassandra.yaml apache-cassandra-2.2.8/conf
- apache-cassandra-2.2.8/bin/cassandra
- test -f download/apache-cassandra-3.11.4-bin.tar.gz || wget https://archive.apache.org/dist/cassandra/3.11.4/apache-cassandra-3.11.4-bin.tar.gz -O download/apache-cassandra-3.11.4-bin.tar.gz
- tar xzf download/apache-cassandra-3.11.4-bin.tar.gz
- cp -f spring-cloud-vault-config-databases/src/test/resources/cassandra.yaml apache-cassandra-3.11.4/conf
- apache-cassandra-3.11.4/bin/cassandra
- src/test/bash/create_certificates.sh
- src/test/bash/install_vault.sh
- src/test/bash/install_consul.sh
@@ -51,12 +51,12 @@ before_script:
- |-
mongo admin --eval "db.createUser({user: 'springvault', pwd:'springvault', roles:['root']});"
- sleep 30 # wait until Cassandra is up
- apache-cassandra-2.2.8/bin/cqlsh localhost -u cassandra -p cassandra -e "CREATE USER 'springvault' WITH PASSWORD 'springvault' SUPERUSER"
- apache-cassandra-3.11.4/bin/cqlsh localhost -u cassandra -p cassandra -e "CREATE USER 'springvault' WITH PASSWORD 'springvault' SUPERUSER"
script: mvn clean verify -Pspring,java8
after_script:
- apache-cassandra-2.2.8/bin/nodetool stopdaemon
- apache-cassandra-3.11.4/bin/nodetool stopdaemon
- pkill vault
- pkill consul

View File

@@ -78,10 +78,11 @@ public class CassandraSecretIntegrationTests extends IntegrationTestSupport {
VaultOperations vaultOperations = this.vaultRule.prepare().getVaultOperations();
Map<String, String> connection = new HashMap<>();
Map<String, Object> connection = new HashMap<>();
connection.put("hosts", CASSANDRA_HOST);
connection.put("username", CASSANDRA_USERNAME);
connection.put("password", CASSANDRA_PASSWORD);
connection.put("protocol_version", 3);
vaultOperations.write(
String.format("%s/config/connection", this.cassandra.getBackend()),

View File

@@ -92,10 +92,11 @@ public class VaultConfigCassandraTests {
VaultOperations vaultOperations = vaultRule.prepare().getVaultOperations();
Map<String, String> connection = new HashMap<>();
Map<String, Object> connection = new HashMap<>();
connection.put("hosts", CASSANDRA_HOST);
connection.put("username", CASSANDRA_USERNAME);
connection.put("password", CASSANDRA_PASSWORD);
connection.put("protocol_version", 3);
vaultOperations.write(String.format("%s/config/connection", "cassandra"),
connection);