Skip to content

Commit ff0b1c0

Browse files
committed
Remove websocket support
1 parent 15a58b0 commit ff0b1c0

File tree

17 files changed

+21
-706
lines changed

17 files changed

+21
-706
lines changed

Cargo.lock

Lines changed: 0 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ debug = true
2727
# * out of rack routing checks?
2828
scylla = { version = "=1.4.0", features = ["openssl-010"] }
2929
bytes = { version = "1.11.1", features = ["serde"] }
30-
tokio = { version = "1.44.2", features = ["full"] }
30+
tokio = { version = "1.44.2", features = ["full", "net"] }
3131
tokio-util = { version = "0.7.7", features = ["codec"] }
3232
itertools = "0.14.0"
3333
openssl = { version = "0.10.72", features = ["vendored"] }

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Any breaking changes to the `topology.yaml` or `shotover` rust API should be documented here.
44
This assists us in knowing when to make the next release a breaking release and assists users with making upgrades to new breaking releases.
55

6+
## 0.8.0
7+
8+
* Removed websocket support
9+
610
## 0.6.0
711

812
Redis has been renamed to Valkey.

docs/src/sources.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ Cassandra:
3939
# The transport that cassandra communication will occur over.
4040
# TCP is the only Cassandra protocol conforming transport.
4141
transport: Tcp
42-
43-
# alternatively:
44-
#
45-
# Use the Cassandra protocol over WebSockets using a Shotover compatible driver.
46-
# transport: WebSocket
4742

4843
chain:
4944
Transform1

shotover-proxy/tests/cassandra_int_tests/mod.rs

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
use crate::{CONNECTION_REFUSED_OS_ERROR, shotover_process};
22
use cassandra_protocol::frame::message_error::{ErrorBody, ErrorType};
3-
use cassandra_protocol::types::cassandra_type::CassandraType;
43
use cdrs_tokio::frame::events::{
54
SchemaChange, SchemaChangeOptions, SchemaChangeTarget, SchemaChangeType, ServerEvent,
65
};
7-
use fred::rustls::crypto::aws_lc_rs::default_provider;
86
use futures::Future;
97
use futures::future::join_all;
108
use pretty_assertions::assert_eq;
@@ -23,8 +21,7 @@ use test_helpers::connection::cassandra::Compression;
2321
use test_helpers::connection::cassandra::ProtocolVersion;
2422
use test_helpers::connection::cassandra::{
2523
CassandraConnection, CassandraConnectionBuilder, CassandraDriver, CassandraDriver::Cdrs,
26-
CassandraDriver::Java, CassandraDriver::Scylla, CqlWsSession, ResultValue, assert_query_result,
27-
run_query,
24+
CassandraDriver::Java, CassandraDriver::Scylla, ResultValue, assert_query_result, run_query,
2825
};
2926
use test_helpers::connection::valkey_connection::ValkeyConnectionCreator;
3027
use test_helpers::docker_compose::docker_compose;
@@ -1072,63 +1069,6 @@ async fn test_protocol_v5_compression_encode(#[case] driver: CassandraDriver) {
10721069
}
10731070
}
10741071

1075-
#[tokio::test(flavor = "multi_thread")]
1076-
async fn passthrough_websockets() {
1077-
let _docker_compose =
1078-
docker_compose("tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml");
1079-
1080-
let shotover =
1081-
shotover_process("tests/test-configs/cassandra/passthrough-websocket/topology.yaml")
1082-
.start()
1083-
.await;
1084-
1085-
let mut session = CqlWsSession::new("ws://0.0.0.0:9042").await;
1086-
let rows = session.query("SELECT bootstrapped FROM system.local").await;
1087-
assert_eq!(rows, vec![vec![CassandraType::Varchar("COMPLETED".into())]]);
1088-
1089-
shotover.shutdown_and_then_consume_events(&[]).await;
1090-
}
1091-
1092-
#[cfg(feature = "alpha-transforms")]
1093-
#[tokio::test(flavor = "multi_thread")]
1094-
async fn encode_websockets() {
1095-
let _docker_compose =
1096-
docker_compose("tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml");
1097-
1098-
let shotover =
1099-
shotover_process("tests/test-configs/cassandra/passthrough-websocket/topology-encode.yaml")
1100-
.start()
1101-
.await;
1102-
1103-
let mut session = CqlWsSession::new("ws://0.0.0.0:9042").await;
1104-
let rows = session.query("SELECT bootstrapped FROM system.local").await;
1105-
assert_eq!(rows, vec![vec![CassandraType::Varchar("COMPLETED".into())]]);
1106-
1107-
shotover.shutdown_and_then_consume_events(&[]).await;
1108-
}
1109-
1110-
#[tokio::test(flavor = "multi_thread")]
1111-
async fn passthrough_tls_websockets() {
1112-
test_helpers::cert::generate_cassandra_test_certs();
1113-
let _docker_compose = docker_compose(
1114-
"tests/test-configs/cassandra/passthrough-websocket-tls/docker-compose.yaml",
1115-
);
1116-
1117-
let shotover =
1118-
shotover_process("tests/test-configs/cassandra/passthrough-websocket-tls/topology.yaml")
1119-
.start()
1120-
.await;
1121-
1122-
let ca_cert = "tests/test-configs/cassandra/tls/certs/localhost_CA.crt";
1123-
1124-
default_provider().install_default().ok();
1125-
let mut session = CqlWsSession::new_tls("wss://0.0.0.0:9042", ca_cert).await;
1126-
let rows = session.query("SELECT bootstrapped FROM system.local").await;
1127-
assert_eq!(rows, vec![vec![CassandraType::Varchar("COMPLETED".into())]]);
1128-
1129-
shotover.shutdown_and_then_consume_events(&[]).await;
1130-
}
1131-
11321072
#[apply(all_cassandra_drivers)]
11331073
#[tokio::test(flavor = "multi_thread")]
11341074
async fn cassandra_5_passthrough(#[case] driver: CassandraDriver) {

shotover-proxy/tests/test-configs/cassandra/passthrough-websocket-tls/docker-compose.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

shotover-proxy/tests/test-configs/cassandra/passthrough-websocket-tls/topology.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/docker-compose.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/topology-encode.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

shotover-proxy/tests/test-configs/cassandra/passthrough-websocket/topology.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)