Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #769

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Update deps #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scylla-cql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ categories = ["database"]
license = "MIT OR Apache-2.0"

[dependencies]
scylla-macros = { version = "0.2.0", path = "../scylla-macros"}
scylla-macros = { version = "0.2.0", path = "../scylla-macros" }
byteorder = "1.3.4"
bytes = "1.0.1"
num_enum = "0.5"
Expand All @@ -22,12 +22,12 @@ thiserror = "1.0"
bigdecimal = "0.2.0"
num-bigint = "0.3"
chrono = { version = "0.4", default-features = false }
lz4_flex = { version = "0.9.2" }
lz4_flex = { version = "0.11.1" }
async-trait = "0.1.57"
serde = { version = "1.0", optional = true }

[dev-dependencies]
criterion = "0.3"
criterion = "0.5"

[[bench]]
name = "benchmark"
Expand Down
5 changes: 2 additions & 3 deletions scylla-proxy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0"
defaults = []

[dependencies]
scylla-cql = { version = "0.0.7", path = "../scylla-cql"}
scylla-cql = { version = "0.0.7", path = "../scylla-cql" }
byteorder = "1.3.4"
bytes = "1.2.0"
futures = "0.3.6"
Expand All @@ -29,6 +29,5 @@ rand = "0.8.5"

[dev-dependencies]
assert_matches = "1.5.0"
ntest = "0.8.1"
ntest = "0.9.0"
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
env_logger = "0.9"
16 changes: 8 additions & 8 deletions scylla/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ cloud = ["ssl", "scylla-cql/serde", "dep:serde_yaml", "dep:serde", "dep:url", "d
secret = ["scylla-cql/secret"]

[dependencies]
scylla-macros = { version = "0.2.0", path = "../scylla-macros"}
scylla-cql = { version = "0.0.7", path = "../scylla-cql"}
scylla-macros = { version = "0.2.0", path = "../scylla-macros" }
scylla-cql = { version = "0.0.7", path = "../scylla-cql" }
byteorder = "1.3.4"
bytes = "1.0.1"
futures = "0.3.6"
Expand All @@ -32,7 +32,7 @@ snap = "1.0"
uuid = { version = "1.0", features = ["v4"] }
rand = "0.8.3"
thiserror = "1.0"
itertools = "0.10.0"
itertools = "0.11.0"
bigdecimal = "0.2.0"
num-bigint = "0.3"
tracing = "0.1.36"
Expand All @@ -43,20 +43,20 @@ arc-swap = "1.3.0"
dashmap = "5.2"
strum = "0.23"
strum_macros = "0.23"
lz4_flex = { version = "0.9.2" }
lz4_flex = { version = "0.11.1" }
smallvec = "1.8.0"
async-trait = "0.1.56"
serde = { version = "1.0", features = ["derive"], optional = true }
serde_yaml = { version = "0.9.14", optional = true }
url = { version = "2.3.1", optional = true }
base64 = { version = "0.13.1", optional = true }
base64 = { version = "0.21.1", optional = true }
rand_pcg = "0.3.1"
socket2 = { version = "0.5.3", features = ["all"] }

[dev-dependencies]
scylla-proxy = { version = "0.0.3", path = "../scylla-proxy"}
ntest = "0.8.1"
criterion = "0.3"
scylla-proxy = { version = "0.0.3", path = "../scylla-proxy" }
ntest = "0.9.0"
criterion = "0.5"
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
assert_matches = "1.5.0"
rand_chacha = "0.3.1"
Expand Down
18 changes: 15 additions & 3 deletions scylla/src/cloud/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ pub(crate) struct Context {

mod deserialize {
use super::CloudConfigError;
use base64::{engine::general_purpose, Engine as _};
use scylla_cql::{frame::types::SerialConsistency, Consistency};
use std::{collections::HashMap, fs::File, io::Read, path::Path};

Expand Down Expand Up @@ -299,7 +300,7 @@ mod deserialize {
path: Option<&str>, // path to data in file
) -> Result<Box<[u8]>, CloudConfigError> {
let pem = if let Some(data) = data {
base64::decode(data)?
general_purpose::STANDARD.decode(data)?
} else if let Some(path) = path {
let mut buf = vec![];
File::open(path)
Expand Down Expand Up @@ -554,6 +555,7 @@ mod deserialize {
use super::super::CloudConfig;
use super::RawCloudConfig;
use assert_matches::assert_matches;
use base64::{engine::general_purpose, Engine as _};
use openssl::x509::X509;
use scylla_cql::frame::types::SerialConsistency;
use scylla_cql::Consistency;
Expand Down Expand Up @@ -821,7 +823,12 @@ mod deserialize {

assert_eq!(
auth_info.cert,
X509::from_pem(&base64::decode(TEST_CA.as_bytes()).unwrap()).unwrap()
X509::from_pem(
&general_purpose::STANDARD
.decode(TEST_CA.as_bytes())
.unwrap()
)
.unwrap()
);
// comparison of PKey<Private> is not possible, so auth_info.key won't be tested here.

Expand All @@ -831,7 +838,12 @@ mod deserialize {
let datacenter = validated_config.datacenters.get("eu-west-1").unwrap();
assert_eq!(
datacenter.certificate_authority,
X509::from_pem(&base64::decode(TEST_CA.as_bytes()).unwrap()).unwrap()
X509::from_pem(
&general_purpose::STANDARD
.decode(TEST_CA.as_bytes())
.unwrap()
)
.unwrap()
);
assert_eq!(datacenter.server.as_str(), "127.0.1.12:9142");
assert_eq!(datacenter.node_domain, "cql.my-cluster-id.scylla.com");
Expand Down