Update to serde_yaml 0.9 (via renaming Null -> NullSink) (#1015)

shotover · Feb 7, 2023 · 2932326 · 2932326
1 parent bf89a42
commit 2932326
Show file tree

Hide file tree

Showing 21 changed files with 145 additions and 171 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/src/transforms.md b/docs/src/transforms.md
@@ -33,7 +33,7 @@ Future transforms won't be added to the public API while in alpha. But in these
 | [ConsistentScatter](#consistentscatter) | ✅ | Alpha |
 | [DebugPrinter](#debugprinter) | ❌ | Alpha |
 | [DebugReturner](#debugreturner) | ✅ | Alpha |
-| [Null](#null) | ✅ | Beta |
+| [NullSink](#NullSink) | ✅ | Beta |
 | [ParallelMap](#parallelmap) | ✅ | Alpha |
 | [Protect](#protect) | ❌ | Alpha |
 | [QueryCounter](#querycounter) | ❌ | Alpha |
@@ -267,12 +267,12 @@ Delay the transform chain at the position that this transform sits at.
 ```
 -->
 
-### Null
+### NullSink
 
 This transform will drop any messages it receives and return an empty response.
 
 ```yaml
-- Null
+- NullSink
 ```
 
 ### ParallelMap
@@ -531,7 +531,7 @@ The response from the down-chain transform is returned back up-chain but various
  # SubchainOnMismatch:
  # - QueryTypeFilter:
  # filter: Read
- # - Null
+ # - NullSink
 
  # Timeout for sending to the sub chain in microseconds
  timeout_micros: 1000
@@ -542,7 +542,7 @@ The response from the down-chain transform is returned back up-chain but various
  chain:
  - QueryTypeFilter:
  filter: Read
- - Null
+ - NullSink
 ```
 
 This transfrom emits a metrics [counter](user-guide/observability.md#counter) named `tee_dropped_messages` and the label `chain` as `Tee`.

diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml
@@ -48,7 +48,7 @@ backtrace = "0.3.66"
 cql3-parser = { version = "0.3.1", git = "https://github.com/rukai/rust-cql3-parser", branch = "identifier_ref" }
 serde = { version = "1.0.111", features = ["derive"] }
 serde_json = "1.0"
-serde_yaml = "0.8.21"
+serde_yaml = "0.9.17"
 bincode = "1.3.1"
 num = { version = "0.4.0", features = ["serde"] }
 uuid = { version = "1.0.0", features = ["serde", "v4"] }

diff --git a/shotover-proxy/benches/benches/chain.rs b/shotover-proxy/benches/benches/chain.rs
@@ -11,7 +11,7 @@ use shotover_proxy::transforms::cassandra::peers_rewrite::CassandraPeersRewrite;
 use shotover_proxy::transforms::chain::{TransformChain, TransformChainBuilder};
 use shotover_proxy::transforms::debug::returner::{DebugReturner, Response};
 use shotover_proxy::transforms::filter::QueryTypeFilter;
-use shotover_proxy::transforms::null::Null;
+use shotover_proxy::transforms::null::NullSink;
 use shotover_proxy::transforms::protect::{KeyManagerConfig, ProtectConfig};
 use shotover_proxy::transforms::redis::cluster_ports_rewrite::RedisClusterPortsRewrite;
 use shotover_proxy::transforms::redis::timestamp_tagging::RedisTimestampTagger;
@@ -25,7 +25,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
  {
  let chain = TransformChainBuilder::new(
- vec![TransformBuilder::Null(Null::default())],
+ vec![TransformBuilder::NullSink(NullSink::default())],
  "bench".to_string(),
  );
  let wrapper = Wrapper::new_with_chain_name(
@@ -34,7 +34,7 @@ fn criterion_benchmark(c: &mut Criterion) {
  "127.0.0.1:6379".parse().unwrap(),
  );
 
- group.bench_function("null", |b| {
+ group.bench_function("NullSink", |b| {
  b.to_async(&rt).iter_batched(
  || BenchInput {
  chain: chain.clone().build(),
@@ -147,7 +147,7 @@ fn criterion_benchmark(c: &mut Criterion) {
  let chain = TransformChainBuilder::new(
  vec![
  TransformBuilder::RedisClusterPortsRewrite(RedisClusterPortsRewrite::new(2004)),
- TransformBuilder::Null(Null::default()),
+ TransformBuilder::NullSink(NullSink::default()),
  ],
  "bench".to_string(),
  );
@@ -185,7 +185,7 @@ fn criterion_benchmark(c: &mut Criterion) {
  .get_transform(),
  )
  .unwrap(),
- TransformBuilder::Null(Null::default()),
+ TransformBuilder::NullSink(NullSink::default()),
  ],
  "bench".to_string(),
  );
@@ -222,7 +222,7 @@ fn criterion_benchmark(c: &mut Criterion) {
  let chain = TransformChainBuilder::new(
  vec![
  TransformBuilder::CassandraPeersRewrite(CassandraPeersRewrite::new(9042)),
- TransformBuilder::Null(Null::default()),
+ TransformBuilder::NullSink(NullSink::default()),
  ],
  "bench".into(),
  );
@@ -293,7 +293,7 @@ fn criterion_benchmark(c: &mut Criterion) {
  .get_transform(),
  )
  .unwrap(),
- TransformBuilder::Null(Null::default()),
+ TransformBuilder::NullSink(NullSink::default()),
  ],
  "bench".into(),
  );

diff --git a/shotover-proxy/config/topology.yaml b/shotover-proxy/config/topology.yaml
@@ -18,10 +18,10 @@ chain_config:
  # For a list of possible transforms: https://docs.shotover.io/transforms/#transforms_1
  - DebugPrinter
 
- # A Null transform, drops all messages it receives.
+ # A NullSink transform, drops all messages it receives.
  # You will want to replace this with a sink transform to send the message to a database.
  # For a list of possible transforms: https://docs.shotover.io/transforms/#transforms_1
- - Null
+ - NullSink
 
 # A list of mappings from source name -> transform chain name.
 source_to_chain_mapping:

diff --git a/shotover-proxy/example-configs/null-cassandra/topology.yaml b/shotover-proxy/example-configs/null-cassandra/topology.yaml
@@ -5,6 +5,6 @@ sources:
  listen_addr: "127.0.0.1:9042"
 chain_config:
  main_chain:
- - Null
+ - NullSink
 source_to_chain_mapping:
  cassandra_prod: main_chain
diff --git a/shotover-proxy/example-configs/null-redis/topology.yaml b/shotover-proxy/example-configs/null-redis/topology.yaml
@@ -7,6 +7,6 @@ chain_config:
  redis_chain:
  - QueryCounter:
  name: redis-chain
- - Null
+ - NullSink
 source_to_chain_mapping:
  redis_prod: redis_chain