Skip to content

Commit

Permalink
task: Dependency maintenance (#479)
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswk authored Jul 12, 2024
1 parent 1f6217b commit fa2f974
Show file tree
Hide file tree
Showing 15 changed files with 612 additions and 503 deletions.
756 changes: 431 additions & 325 deletions Cargo.lock

Large diffs are not rendered by default.

64 changes: 33 additions & 31 deletions examples/server.crt
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
-----BEGIN CERTIFICATE-----
MIIFnzCCA4cCFCUGGh4r5q0rSDgWacZfimC2/HoMMA0GCSqGSIb3DQEBCwUAMIGL
MQswCQYDVQQGEwJaQTEMMAoGA1UECAwDS1pOMQ8wDQYDVQQHDAZQbGFjZXMxEDAO
BgNVBAoMB1VubGVhc2gxFDASBgNVBAsMC2RldmVsb3BtZW50MRIwEAYDVQQDDAls
b2NhbGhvc3QxITAfBgkqhkiG9w0BCQEWEnRlYW1AZ2V0dW5sZWFzaC5pbzAeFw0y
MzA0MTcxMDUyMThaFw00MzA0MTIxMDUyMThaMIGLMQswCQYDVQQGEwJaQTEMMAoG
A1UECAwDS1pOMQ8wDQYDVQQHDAZQbGFjZXMxEDAOBgNVBAoMB1VubGVhc2gxFDAS
BgNVBAsMC2RldmVsb3BtZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QxITAfBgkqhkiG
9w0BCQEWEnRlYW1AZ2V0dW5sZWFzaC5pbzCCAiIwDQYJKoZIhvcNAQEBBQADggIP
ADCCAgoCggIBALujqEdzGN/M5RhUbkdnOhIo4oJ3lzDX2Pkn2hkWAitBsr4FIUA+
12O1H00J9QP9kNydF+xDu0aAiAjN2rm9pzNQ+0KkzjWR2E7CPTo8ZMqR4u31EWG5
2dPqEQdmvRvp/kPv71ldz8JlrFn9MqSWY6KrKhEiFiz208OlKg0VN/FWLx6fkqMX
D2dLy+6t5k7yhNU2hgZ2fImYYD9l7KaD8rM8TLzwqcSM2M2OwrRfDMI4eaMwD9jl
I/qIpa+sgZlSxnABwet02PugpZ1eVbJKrezSWx1qNI2KeWywVizhdTlckVoa14nW
hk9qdblY2gH+IENjeRKog7Nr7VcGSakwzuDqGS1QqsadL8n/czzUxRTEBX/wRAPZ
ND/obLxSHNMYKsnKn0xMa3cBbbyu2zj+cdwWaE3/7q4UZ8X2VCVStl+6IjmgaStV
xNmHvkNRD4SL0UliKtNPFUTSGZxMeGbqLjPbRL7rgCfcxpLxj+5d09yYLZesy2zG
/fMxxUVKFvPaBd8QDf6DoDlAReB6ebNa1AKozBQEz2l50lIB9BneZfY+S55ovfpI
EHwRGTQbWy/q24ZM/UXMLa6O9OBeAN82v03zkrtd2/DAGHvFZYacoCnZEGmX+RsH
sqf//iMKJ1tpN3Gi4krmtiE2nm+XREgmgCP+KmGlFeA2bDLtpdZFr5JtAgMBAAEw
DQYJKoZIhvcNAQELBQADggIBADEKJnMpbsUA4NuM9MtpCykmo2ZPCcYjHKo8Ymjj
WOkoHQ078CiK7QUQQgIBWGtqZ0Z323qPpGddr7xYX0D3PzON2qM6i6Y4CKhSWIo1
dRdmeLfkLsUwY6pEClF6h53d6G87k2raLAc77+W+rEiS7PS4pm7AdEjyfqeUhcnC
JbFwDC8kVjR/3+0/4MGYaYSKbUwe+20O927UIiShVaoruiJJ9JaH1YnIDCNOzekj
4/Gd/mnlqitJuyRSuVSAI6S+YkfaLeAXyrYIJsNrQpoShblXEYMc/C39rCHvNU2C
V/xBABkXOmOX48DeMaZ26I1q8xmIDewAs2iCtJtaN3nX5ioY7C09UDYH57wCdxF6
oL78p2IQxL4FJhn7bmtKUWWXDct1Bbiikhrmyckz2VwvoVWrh+gaekPRXGvAtC7c
YRBLbQGthAR/uZrsYdFTYkQc1Y0Ntxrs+jbqljce2yQprcne6JKjqIeAfxN8Cvt6
ZUkV6MECckgMVbt9Aw9fiM0CNWKb1mj7myHMOXf6zr2HzHKC4J9pY0Pv7al9p4Fq
aztOQBJAj9DkA6UqrCYFh4HnhV7QDzkzp4/h8VylrQ+cii0wpwz1kkCTGvYeKwdc
dZieoT+78V+PRtmb8Ch4Wh/7oHxm5uYNU3be/gjwNnSoHO3FYTO3P0e2H1mhhPGJ
eZFS
MIIF/TCCA+WgAwIBAgIUUX+IXWVu79m3m35EXwarUVXGUk8wDQYJKoZIhvcNAQEL
BQAwgY0xCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARPU2xvMQ0wCwYDVQQHDARPc2xv
MRgwFgYDVQQKDA9Ccmlja3MgU29mdHdhcmUxEDAOBgNVBAsMB1VubGVhc2gxEjAQ
BgNVBAMMCWxvY2FsaG9zdDEgMB4GCSqGSIb3DQEJARYRc3NsQGdldHVubGVhc2gu
aW8wHhcNMjQwNzExMTIzODU0WhcNMzQwNzA5MTIzODU0WjCBjTELMAkGA1UEBhMC
Tk8xDTALBgNVBAgMBE9TbG8xDTALBgNVBAcMBE9zbG8xGDAWBgNVBAoMD0JyaWNr
cyBTb2Z0d2FyZTEQMA4GA1UECwwHVW5sZWFzaDESMBAGA1UEAwwJbG9jYWxob3N0
MSAwHgYJKoZIhvcNAQkBFhFzc2xAZ2V0dW5sZWFzaC5pbzCCAiIwDQYJKoZIhvcN
AQEBBQADggIPADCCAgoCggIBAIPsit+rpR++QrpJpzlk1sbte8SlpRo0BGE+Lmbp
Mu8arQAQrcJUg7xzfYy7LNLjR8rNIJw6ev0567Y6i8Kck25PLaN3lz3CuLeYNRi1
v1TbJgOSu+xHuCQjNR6oo+xq8OXL5tgWXgMrXqiHzS/wG02L/NBHs6SPy98Q7it/
7zIKmqfI2uDEBGRsISt47irtWbzuFQoq88KYHm+icRpYv8bJi1cHgyCFKrQ8zEMI
Vw8UBHaEisTdVYTmXLWdkJv5RwEpBv3/vNKru64DhTirQ9fDnh22xNOMJO5l32WM
AN7udWYcoA7c0J+fGgUCK0FqVwNiu/MYbtlHSbaT4Jn0a3MeQ/JbpzCWlqLJhVVF
PO83/iLUQaPBL4JiSCptA27cVgJL8KvmwIb8gTZDCTdAU5vyDPqEakgjEX8f+YlM
CMwwEdiNRooSueLyAQumEXCBqTh4gT5Mfj8U6taF3Df3xts5fpheXB9uFhIHegvC
gZ/3DKGyVOxa28wubrCwPPmpBg3FG0dXG+ekTqHfEZKvFjVhRt6m7RYC7vVK8fb3
Wgvj6KYNUotWJYOsVhV6ZsxZ5ISZPxP6dZEKkPSQokr2rNMcArxFp061OcUeRO+Y
Suikq9kIzHNmQJPg/rrxism321STpbwsz3rPnwcakNAMlscD/AkVgDGqvS+EaVPJ
iu+bAgMBAAGjUzBRMB0GA1UdDgQWBBR2S6k0sTDuwZHAelLzdcxRfQ9xOzAfBgNV
HSMEGDAWgBR2S6k0sTDuwZHAelLzdcxRfQ9xOzAPBgNVHRMBAf8EBTADAQH/MA0G
CSqGSIb3DQEBCwUAA4ICAQAoSkBOK+e40zgTl4scE5e1+LN46Yu/2rs2meSWsnhv
HcFbfn4+e3zgVn0aiUk1BdFfp+4hnbokHroROLPwQPeRa0kKbuquTY8OquUUetoK
emnaCty7FEoI+EBdKw0ashsGBCOX3NdTmAtxSrlPJBi7jxkXSyz1mn+j8d8Lksje
age07eva/gsY2ba2gPISSHkokA8ZJf6v4AjhR7M3iTRzR7MLbuqvTXi4QvTkLVKN
LTtVz5oAfdSszdBYeKpjjdlSYMDG3bLkUbwS6dh762mO8eGvlpqLO6h80rWRpCWb
uYtpYdxDo4r6GdfrhWT5eRUbobD1RO+gs62jvOeSwbqrewQ7ziewuMbcC+kadhuB
LtkMnu9TaMeYGCfnwZT710lNCcT/pyICRv9pW66YU9dmXo6xh+hoXWj9x+zuAif/
yy+uHg7gjYEwO8295z9EFJY0uStIgwh09rPSn5jWzQsncv9eITISJDYxqRUCEM8J
cNjQmbQLSkx0f+oUMMf5hJ8IC7wGkz7mGyfAP/3FBz+PBuuyI/qmHPjfHGNlGih3
PmqKzS93N65/gI8a3ZPRe2IJxrYEBRZQyIcCbQY5Num67okngatgLAkLud3Vu7iN
/d8ml9rqgTPxCtt4SHF6Xvo4e447I8uhIT0gFa10y81f4jjzxXd6BV8kJNheJFpb
Xg==
-----END CERTIFICATE-----
100 changes: 50 additions & 50 deletions examples/server.key
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
-----BEGIN PRIVATE KEY-----
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
RfVjCJn+jnI3UV8MzyE+ii2n5dNTvOY3
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
/rHOea9qTpjy1EaLEl/gPVbLLpQQ4Q==
-----END PRIVATE KEY-----
67 changes: 35 additions & 32 deletions server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ eula = false

[dependencies]
actix-cors = "0.7.0"
actix-http = { version = "3.6.0", features = ["compress-zstd", "rustls-0_22"] }
actix-middleware-etag = "0.3.0"
actix-http = "3.8.0"
actix-middleware-etag = "0.4.1"
actix-service = "2.0.2"
actix-web = { version = "4.5.1", features = ["rustls-0_22", "compress-zstd"] }
ahash = "0.8.10"
anyhow = "1.0.80"
async-trait = "0.1.80"
anyhow = "1.0.86"
async-trait = "0.1.81"
actix-web = { version = "4.8.0", features = ["rustls-0_23", "compress-zstd"] }
ahash = "0.8.11"
chrono = { version = "0.4.38", features = ["serde"] }
cidr = "0.2.2"
clap = { version = "4.5.4", features = ["derive", "env"] }
clap-markdown = "0.1.3"
dashmap = "5.5.3"
cidr = "0.2.3"
clap = { version = "4.5.9", features = ["derive", "env"] }
clap-markdown = "0.1.4"
dashmap = "6.0.1"
futures = "0.3.30"
futures-core = "0.3.30"
iter_tools = "0.15.0"
itertools = "0.12.1"
iter_tools = "0.19.0"
itertools = "0.13.0"
lazy_static = "1.4.0"
num_cpus = "1.16.0"
opentelemetry = { version = "0.21.0", features = ["trace", "metrics"] }
opentelemetry-prometheus = "0.14.1"
opentelemetry-semantic-conventions = "0.13.0"
opentelemetry_sdk = { version = "0.21.2", features = [
opentelemetry = { version = "0.23.0", features = ["trace", "metrics"] }
opentelemetry-prometheus = "0.16.0"
opentelemetry-semantic-conventions = "0.15.0"
opentelemetry_sdk = { version = "0.23.0", features = [
"metrics",
"serde",
"serde_json",
Expand All @@ -52,26 +52,29 @@ opentelemetry_sdk = { version = "0.21.2", features = [
prometheus = { version = "0.13.4", features = ["process"] }
prometheus-static-metric = "0.5.1"
rand = "0.8.5"
redis = { version = "0.25.3", features = [
redis = { version = "0.25.4", features = [
"tokio-comp",
"tokio-rustls-comp",
"cluster",
] }
reqwest = { version = "0.11.27", default-features = false, features = [
"rustls",
reqwest = { version = "0.12.5", default-features = false, features = [
"json",
"rustls-tls",
"native-tls",
] }
rustls = "0.22.2"
rustls = { version = "0.23.11", default-features = false, features = [
"logging",
"ring",
"std",
] }
rustls-pemfile = "2.1.2"
rustls-pki-types = "1.6.0"
rustls-pki-types = "1.7.0"
semver = "1.0.23"
serde = { version = "1.0.200", features = ["derive"] }
serde_json = "1.0.116"
serde_qs = { version = "0.12.0", features = ["actix4", "tracing"] }
shadow-rs = { version = "0.27.1" }
tokio = { version = "1.36.0", features = [
serde = { version = "1.0.204", features = ["derive"] }
serde_json = "1.0.120"
serde_qs = { version = "0.13.0", features = ["actix4", "tracing"] }
shadow-rs = { version = "0.29.0" }
tokio = { version = "1.38.0", features = [
"macros",
"rt-multi-thread",
"tracing",
Expand All @@ -83,18 +86,18 @@ ulid = "1.1.2"
unleash-types = { version = "0.12", features = ["openapi", "hashes"] }
unleash-yggdrasil = { version = "0.12.0" }
utoipa = { version = "4.2.3", features = ["actix_extras", "chrono"] }
utoipa-swagger-ui = { version = "7.0.1", features = ["actix-web"] }
utoipa-swagger-ui = { version = "7.1.0", features = ["actix-web"] }
[dev-dependencies]
actix-http = "3.6.0"
actix-http = "3.8.0"
actix-http-test = "3.2.0"
actix-service = "2.0.2"
env_logger = "0.11.3"
maplit = "1.0.2"
rand = "0.8.5"
test-case = "3.3.1"
testcontainers = "0.16.7"
testcontainers-modules = { version = "0.4.2", features = ["redis"] }
tracing-test = "0.2.4"
testcontainers = "0.20.0"
testcontainers-modules = { version = "0.8.0", features = ["redis"] }
tracing-test = "0.2.5"

[build-dependencies]
shadow-rs = "0.27.1"
shadow-rs = "0.29.0"
10 changes: 6 additions & 4 deletions server/src/client_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ mod tests {
use crate::http::unleash_client::UnleashClient;
use crate::middleware;
use crate::tests::{features_from_disk, upstream_server};
use actix_http::Request;
use actix_http::{Request, StatusCode};
use actix_web::{
http::header::ContentType,
test,
Expand All @@ -278,7 +278,6 @@ mod tests {
};
use chrono::{DateTime, Duration, TimeZone, Utc};
use maplit::hashmap;
use reqwest::StatusCode;
use ulid::Ulid;
use unleash_types::client_features::{
ClientFeature, Constraint, Operator, Strategy, StrategyVariant,
Expand Down Expand Up @@ -578,7 +577,7 @@ mod tests {
client_app.instance_id = Some("test_instance".into());
let req = make_register_post_request(client_app.clone()).await;
let res = test::call_service(&app, req).await;
assert_eq!(res.status(), StatusCode::ACCEPTED);
assert_eq!(res.status(), actix_http::StatusCode::ACCEPTED);
assert_eq!(metrics_cache.applications.len(), 1);
let application_key = ApplicationKey {
app_name: client_app.app_name.clone(),
Expand Down Expand Up @@ -642,7 +641,10 @@ mod tests {
.send()
.await;
assert!(status.is_ok());
assert_eq!(status.unwrap().status(), StatusCode::FORBIDDEN);
assert_eq!(
status.unwrap().status().as_u16(),
StatusCode::FORBIDDEN.as_u16()
);
let client = UnleashClient::new(srv.url("/").as_str(), None).unwrap();
let successful = client
.send_bulk_metrics_to_client_endpoint(MetricsBatch::default(), &token.token)
Expand Down
10 changes: 6 additions & 4 deletions server/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub const TRUST_PROXY_PARSE_ERROR: &str =
pub enum FeatureError {
AccessDenied,
NotFound,
Retriable(StatusCode),
Retriable(reqwest::StatusCode),
}

#[derive(Debug, Serialize)]
Expand Down Expand Up @@ -100,7 +100,7 @@ pub enum EdgeError {
FeatureNotFound(String),
PersistenceError(String),
EdgeMetricsError,
EdgeMetricsRequestError(StatusCode, Option<UnleashBadRequest>),
EdgeMetricsRequestError(reqwest::StatusCode, Option<UnleashBadRequest>),
EdgeTokenError,
EdgeTokenParseError,
InvalidBackupFile(String, String),
Expand All @@ -116,7 +116,7 @@ pub enum EdgeError {
TlsError,
TokenParseError(String),
ContextParseError,
TokenValidationError(StatusCode),
TokenValidationError(reqwest::StatusCode),
}

impl Error for EdgeError {}
Expand Down Expand Up @@ -238,7 +238,9 @@ impl ResponseError for EdgeError {
EdgeError::ClientCertificateError(_) => StatusCode::INTERNAL_SERVER_ERROR,
EdgeError::FrontendNotYetHydrated(_) => StatusCode::NETWORK_AUTHENTICATION_REQUIRED,
EdgeError::ContextParseError => StatusCode::BAD_REQUEST,
EdgeError::EdgeMetricsRequestError(status_code, _) => *status_code,
EdgeError::EdgeMetricsRequestError(status_code, _) => {
StatusCode::from_u16(status_code.as_u16()).unwrap()
}
EdgeError::HealthCheckError(_) => StatusCode::INTERNAL_SERVER_ERROR,
EdgeError::ReadyCheckError(_) => StatusCode::INTERNAL_SERVER_ERROR,
EdgeError::ClientHydrationFailed(_) => StatusCode::INTERNAL_SERVER_ERROR,
Expand Down
8 changes: 4 additions & 4 deletions server/src/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod tests {
segments: None,
};

let map = DashMap::default();
let map: DashMap<String, ClientFeatures> = DashMap::default();
map.insert(feature_name.clone(), client_features.clone());

let features = map.get(&feature_name).unwrap();
Expand Down Expand Up @@ -136,7 +136,7 @@ mod tests {
segments: None,
};

let map = DashMap::default();
let map: DashMap<String, ClientFeatures> = DashMap::default();
let map_key = "some-key".to_string();

map.insert(map_key.clone(), client_features);
Expand Down Expand Up @@ -171,7 +171,7 @@ mod tests {
segments: None,
};

let map = DashMap::default();
let map: DashMap<String, ClientFeatures> = DashMap::default();
let map_key = "some-feature".to_string();

map.insert(map_key.clone(), client_features);
Expand Down Expand Up @@ -223,7 +223,7 @@ mod tests {
segments: None,
};

let map = DashMap::default();
let map: DashMap<String, ClientFeatures> = DashMap::default();
let map_key = "some-key".to_string();

map.insert(map_key.clone(), client_features);
Expand Down
Loading

0 comments on commit fa2f974

Please sign in to comment.