Skip to content

Commit f7447b7

Browse files
authored
Merge pull request cfpb#1113 from jmarin/cassandra-authentication
Add authentication for cassandra journal and snapshot stores
2 parents c71447c + 448a533 commit f7447b7

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

persistence-model/src/main/resources/application.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ cassandra-journal {
7777
connect-retries = 10
7878
connect-retry-delay = 5s
7979
reconnect-max-delay = 60s
80+
authentication.username = ""
81+
authentication.username = ${?CASSANDRA_CLUSTER_USERNAME}
82+
authentication.password = ""
83+
authentication.password = ${?CASSANDRA_CLUSTER_PASSWORD}
8084
}
8185

8286
cassandra-snapshot-store {
@@ -90,6 +94,10 @@ cassandra-snapshot-store {
9094
connect-retries = 10
9195
connect-retry-delay = 5s
9296
reconnect-max-delay = 60s
97+
authentication.username = ""
98+
authentication.username = ${?CASSANDRA_CLUSTER_USERNAME}
99+
authentication.password = ""
100+
authentication.password = ${?CASSANDRA_CLUSTER_PASSWORD}
93101
}
94102

95103
cassandra-query-journal {

query/src/main/resources/application.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ cassandra {
6969
port = ${?CASSANDRA_CLUSTER_PORT}
7070
keyspace = "hmda_query"
7171
keyspace = ${?CASSANDRA_QUERY_KEYSPACE}
72+
username = ""
73+
username = ${?CASSANDRA_CLUSTER_USERNAME}
74+
password = ""
75+
password = ${?CASSANDRA_CLUSTER_PASSWORD}
7276
retries = 60
7377
retry-interval = 1000
7478
}

query/src/main/scala/hmda/query/CassandraConfig.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ object CassandraConfig {
77
val cassandraHost = config.getString("cassandra.host")
88
val cassandraPort = config.getInt("cassandra.port")
99
val cassandraKeyspace = config.getString("cassandra.keyspace")
10+
val cassandraUsername = config.getString("cassandra.username")
11+
val cassandraPassword = config.getString("cassandra.password")
1012
val numberOfRetries = config.getInt("cassandra.retries")
1113
val retryInterval = config.getLong("cassandra.retry-interval")
1214
}

query/src/main/scala/hmda/query/repository/CassandraRepository.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ trait CassandraRepository[A] {
4545
.builder
4646
.addContactPoint(cassandraHost)
4747
.withPort(cassandraPort)
48+
.withCredentials(cassandraUsername, cassandraPassword)
4849
.withReconnectionPolicy(new ExponentialReconnectionPolicy(100L, 200000L))
4950
.build
5051
.connect()

0 commit comments

Comments
 (0)