Fix cassandra_cpp rpc_address warning (#860)

shotover · Oct 14, 2022 · 10acaa6 · 10acaa6
1 parent a6ebd95
commit 10acaa6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/shotover-proxy/example-configs/docker-images/cassandra-3.11.13/cassandra.yaml b/shotover-proxy/example-configs/docker-images/cassandra-3.11.13/cassandra.yaml
@@ -692,7 +692,7 @@ start_rpc: false
 # set broadcast_rpc_address to a value other than 0.0.0.0.
 #
 # For security reasons, you should not expose this port to the internet.  Firewall it if needed.
-rpc_address: localhost
+#rpc_address: localhost
 
 # Set rpc_address OR rpc_interface, not both. Interfaces must correspond
 # to a single address, IP aliasing is not supported.

diff --git a/shotover-proxy/example-configs/docker-images/cassandra-4.0.6/cassandra.yaml b/shotover-proxy/example-configs/docker-images/cassandra-4.0.6/cassandra.yaml
@@ -748,7 +748,7 @@ native_transport_allow_older_protocols: true
 # set broadcast_rpc_address to a value other than 0.0.0.0.
 #
 # For security reasons, you should not expose this port to the internet.  Firewall it if needed.
-rpc_address: localhost
+#rpc_address: localhost
 
 # Set rpc_address OR rpc_interface, not both. Interfaces must correspond
 # to a single address, IP aliasing is not supported.

diff --git a/shotover-proxy/example-configs/docker-images/cassandra-tls-4.0.6/cassandra.yaml b/shotover-proxy/example-configs/docker-images/cassandra-tls-4.0.6/cassandra.yaml
@@ -748,7 +748,7 @@ native_transport_allow_older_protocols: true
 # set broadcast_rpc_address to a value other than 0.0.0.0.
 #
 # For security reasons, you should not expose this port to the internet.  Firewall it if needed.
-rpc_address: localhost
+#rpc_address: localhost
 
 # Set rpc_address OR rpc_interface, not both. Interfaces must correspond
 # to a single address, IP aliasing is not supported.

diff --git a/shotover-proxy/tests/cassandra_int_tests/cluster_multi_rack.rs b/shotover-proxy/tests/cassandra_int_tests/cluster_multi_rack.rs
@@ -115,7 +115,8 @@ async fn test_rewrite_system_local(connection: &CassandraConnection) {
         // rack is non-deterministic because we dont know which shotover node this will be
         ResultValue::Any,
         ResultValue::Varchar("4.0.6".into()),
-        ResultValue::Inet("0.0.0.0".parse().unwrap()),
+        // rpc_address is non deterministic so we cant assert on it
+        ResultValue::Any,
         ResultValue::Int(9042),
         // schema_version is non deterministic so we cant assert on it.
         ResultValue::Any,

diff --git a/shotover-proxy/tests/cassandra_int_tests/cluster_single_rack_v3.rs b/shotover-proxy/tests/cassandra_int_tests/cluster_single_rack_v3.rs
@@ -74,7 +74,8 @@ async fn test_rewrite_system_local(connection: &CassandraConnection) {
         ResultValue::Varchar("org.apache.cassandra.dht.Murmur3Partitioner".into()),
         ResultValue::Varchar("rack1".into()),
         ResultValue::Varchar("3.11.13".into()),
-        ResultValue::Inet("0.0.0.0".parse().unwrap()),
+        // rpc_address is non deterministic so we cant assert on it
+        ResultValue::Any,
         // schema_version is non deterministic so we cant assert on it.
         ResultValue::Any,
         // thrift_version isnt used anymore so I dont really care what it maps to

diff --git a/shotover-proxy/tests/cassandra_int_tests/cluster_single_rack_v4.rs b/shotover-proxy/tests/cassandra_int_tests/cluster_single_rack_v4.rs
@@ -184,7 +184,8 @@ async fn test_rewrite_system_local(connection: &CassandraConnection) {
         ResultValue::Varchar("org.apache.cassandra.dht.Murmur3Partitioner".into()),
         ResultValue::Varchar("rack1".into()),
         ResultValue::Varchar("4.0.6".into()),
-        ResultValue::Inet("0.0.0.0".parse().unwrap()),
+        // rpc_address is non deterministic so we cant assert on it
+        ResultValue::Any,
         ResultValue::Int(9042),
         // schema_version is non deterministic so we cant assert on it.
         ResultValue::Any,