From af3422f33e225d2c3928d798a3dff572d6105181 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 2 Oct 2023 13:34:29 -0700 Subject: [PATCH 1/2] chore: tag 1.68.3 --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++ Cargo.lock | 18 +++++++------- Cargo.toml | 66 +++++++++++++++++++++++++++++++++------------------- 3 files changed, 86 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 117f12f12..21195c9f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,38 @@ + +## 1.68.3 (2023-10-02) + +#### Breaking Changes + +* Run GCM through FCMv1 HTTP API (#455) ([b2282277](https://github.com/mozilla-services/autopush-rs/commit/b2282277e7e751f5e513d65dda1ab2d2635e7299), breaks [#](https://github.com/mozilla-services/autopush-rs/issues/)) + +#### Features + +* Run GCM through FCMv1 HTTP API (#455) ([b2282277](https://github.com/mozilla-services/autopush-rs/commit/b2282277e7e751f5e513d65dda1ab2d2635e7299), breaks [#](https://github.com/mozilla-services/autopush-rs/issues/)) + +#### Bug Fixes + +* re-enable slog's envlogger (#452) ([e76b1198](https://github.com/mozilla-services/autopush-rs/commit/e76b11987400888bae17fdf61e7dff3edaa7743d)) +* AutopushUser fails with WebSocketConnectionClosedException ([5f8efb2d](https://github.com/mozilla-services/autopush-rs/commit/5f8efb2db9550b8960c6052c69e1103ab8681041)) + +#### Test + +* calibrate load tests ([1b5c5f99](https://github.com/mozilla-services/autopush-rs/commit/1b5c5f99a503ff5a70f009651ad4c47d39c6468e)) +* add subscribe and unsubscribe tasks to AutopushUser ([07d988dd](https://github.com/mozilla-services/autopush-rs/commit/07d988dd11a79d053eb93237f8de977490c5c510)) + + + +## 1.68.2 (2023-09-27) + + +#### Bug Fixes + +* Use `warn!()` to supplement sentry errors, since they don't show up regularly. (#449) ([4eaa9a06](https://github.com/mozilla-services/autopush-rs/commit/4eaa9a06a8197e31f103d9e0ce18f6aa550526b7)) + +#### Chore + +* tag 1.68.1 (#448) ([b55bbe76](https://github.com/mozilla-services/autopush-rs/commit/b55bbe7680be5e0601353321653fbefa9a9e737b)) + + ## 1.68.1 (2023-09-27) diff --git a/Cargo.lock b/Cargo.lock index 3cba60f3c..c505bae79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -522,7 +522,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "autoconnect" -version = "1.68.0" +version = "1.68.3" dependencies = [ "actix", "actix-cors", @@ -567,7 +567,7 @@ dependencies = [ [[package]] name = "autoconnect_common" -version = "1.68.0" +version = "1.68.3" dependencies = [ "actix-web", "autopush_common", @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "autoconnect_settings" -version = "1.68.0" +version = "1.68.3" dependencies = [ "autoconnect_common", "autopush_common", @@ -605,7 +605,7 @@ dependencies = [ [[package]] name = "autoconnect_web" -version = "1.68.0" +version = "1.68.3" dependencies = [ "actix-codec", "actix-http", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "autoconnect_ws" -version = "1.68.0" +version = "1.68.3" dependencies = [ "actix-http", "actix-rt", @@ -659,7 +659,7 @@ dependencies = [ [[package]] name = "autoconnect_ws_sm" -version = "1.68.0" +version = "1.68.3" dependencies = [ "actix-rt", "actix-web", @@ -682,7 +682,7 @@ dependencies = [ [[package]] name = "autoendpoint" -version = "1.68.0" +version = "1.68.3" dependencies = [ "a2", "actix-cors", @@ -738,7 +738,7 @@ dependencies = [ [[package]] name = "autopush" -version = "1.68.0" +version = "1.68.3" dependencies = [ "autopush_common", "base64 0.21.4", @@ -791,7 +791,7 @@ dependencies = [ [[package]] name = "autopush_common" -version = "1.68.0" +version = "1.68.3" dependencies = [ "actix-http", "actix-rt", diff --git a/Cargo.toml b/Cargo.toml index 841b6cf41..9a1562bd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,19 +1,19 @@ [workspace] members = [ - "autopush-common", - "autopush", - "autoendpoint", - "autoconnect", - "autoconnect/autoconnect-common", - "autoconnect/autoconnect-settings", - "autoconnect/autoconnect-web", - "autoconnect/autoconnect-ws", - "autoconnect/autoconnect-ws/autoconnect-ws-sm", + "autopush-common", + "autopush", + "autoendpoint", + "autoconnect", + "autoconnect/autoconnect-common", + "autoconnect/autoconnect-settings", + "autoconnect/autoconnect-web", + "autoconnect/autoconnect-ws", + "autoconnect/autoconnect-ws/autoconnect-ws-sm", ] resolver = "2" [workspace.package] -version = "1.68.0" +version = "1.68.3" authors = [ "Ben Bangert ", "JR Conlin ", @@ -45,32 +45,50 @@ ctor = "0.2" docopt = "1.1" env_logger = "0.10" fernet = "0.2.0" -futures = {version="0.3", features=["compat"]} -futures-util = {version="0.3", features=["async-await", "compat", "sink", "io"]} +futures = { version = "0.3", features = ["compat"] } +futures-util = { version = "0.3", features = [ + "async-await", + "compat", + "sink", + "io", +] } futures-locks = "0.7" hex = "0.4.2" httparse = "1.3" hyper = "0.14" lazy_static = "1.4" -log = { version = "0.4", features = ["max_level_debug", "release_max_level_info"] } +log = { version = "0.4", features = [ + "max_level_debug", + "release_max_level_info", +] } mockall = "0.11" mozsvc-common = "0.2" -openssl = {version="0.10" } +openssl = { version = "0.10" } rand = "0.8" regex = "1.4" -reqwest = {version="0.11", features = ["json"] } -rusoto_core = { version="0.47", default-features=false, features=["rustls"] } # locked by serde_dynamodb 0.9 -rusoto_credential = { version="0.47"} # locked by serde_dynamodb 0.9 -rusoto_dynamodb = { version="0.47", default-features=false, features=["rustls"]} # locked by serde_dynamodb 0.9 -sentry = { version = "0.31", features = ["debug-logs"] } # Using debug-logs avoids https://github.com/getsentry/sentry-rust/issues/237 -sentry-core = {version = "0.31"} +reqwest = { version = "0.11", features = ["json"] } +rusoto_core = { version = "0.47", default-features = false, features = [ + "rustls", +] } # locked by serde_dynamodb 0.9 +rusoto_credential = { version = "0.47" } # locked by serde_dynamodb 0.9 +rusoto_dynamodb = { version = "0.47", default-features = false, features = [ + "rustls", +] } # locked by serde_dynamodb 0.9 +sentry = { version = "0.31", features = [ + "debug-logs", +] } # Using debug-logs avoids https://github.com/getsentry/sentry-rust/issues/237 +sentry-core = { version = "0.31" } sentry-actix = "0.31" sentry-backtrace = "0.31" serde = "1.0" serde_derive = "1.0" serde_dynamodb = "0.9" serde_json = "1.0" -slog = { version = "2.7", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] } +slog = { version = "2.7", features = [ + "dynamic-keys", + "max_level_trace", + "release_max_level_info", +] } slog-async = "2.6" slog-envlogger = "2.2.0" slog-mozlog-json = "0.1" @@ -84,7 +102,7 @@ tokio-core = "0.1" tokio-io = "0.1" tokio-openssl = "0.6" # Use older version of tungstenite to support legacy connection server. -tungstenite = { version = "0.9.2", default-features = false } # 0.10+ requires tokio 0.3+ +tungstenite = { version = "0.9.2", default-features = false } # 0.10+ requires tokio 0.3+ uuid = { version = "1.1", features = ["serde", "v4"] } url = "2.2" @@ -93,8 +111,8 @@ autoconnect_common = { path = "./autoconnect/autoconnect-common" } autoconnect_settings = { path = "./autoconnect/autoconnect-settings" } autoconnect_web = { path = "./autoconnect/autoconnect-web" } autoconnect_ws = { path = "./autoconnect/autoconnect-ws" } -autoconnect_ws_clientsm = { path ="./autoconnect/autoconnect-ws/autoconnect-ws-clientsm" } -autopush_common = { path = "./autopush-common", features=["bigtable"]} +autoconnect_ws_clientsm = { path = "./autoconnect/autoconnect-ws/autoconnect-ws-clientsm" } +autopush_common = { path = "./autopush-common", features = ["bigtable"] } [profile.release] debug = 1 From f5cf4e465a254fac41b24d689e0becfe536983c4 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 2 Oct 2023 14:59:11 -0700 Subject: [PATCH 2/2] f fix extra commit --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8874d49a3..3de27e4dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,6 @@ ->>>>>>> 68e447d2ac0c84550e438f86fa9d0e6fc20350d5 ## 1.68.1 (2023-09-27)