Merge pull request #1481 from mozilla-services/chore/0.13-audit-bump

merge 0.13 and bump rust/crates

.cargo/audit.toml

@@ -6,4 +6,6 @@ ignore = [
     "RUSTSEC-2020-0159",
     "RUSTSEC-2020-0071",
     "RUSTSEC-2021-0124",
+    "RUSTSEC-2023-0034", # Bound by actix-http 2.2, Reqwest 0.10
+    "RUSTSEC-2023-0052", # Bound by reqwest, various tls libs
 ]

.circleci/config.yml

@@ -161,7 +161,7 @@ commands:
 jobs:
   checks:
     docker:
-      - image: cimg/rust:1.65.0
+      - image: cimg/rust:1.72.0
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
@@ -178,7 +178,7 @@ jobs:
 
   build-and-test:
     docker:
-      - image: cimg/rust:1.65.0
+      - image: cimg/rust:1.72.0
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS

CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="0.13.7"></a>
+## 0.13.7 (2023-09-12)
+
+
+*   Re-tag 0.13.6
+
+
+
 <a name="0.13.6"></a>
 ## 0.13.6 (2023-03-07)
 

Cargo.toml

@@ -18,7 +18,7 @@ members = [
 default-members = ["syncserver"]
 
 [workspace.package]
-version = "0.14.0"
+version = "0.13.7"
 authors = [
   "Ben Bangert <ben@groovie.org>",
   "Phil Jenvey <pjenvey@underboss.org>",

Dockerfile

@@ -1,4 +1,5 @@
-FROM lukemathwalker/cargo-chef:0.1.50-rust-1.66-buster as chef
+# NOTE: Ensure builder's Rust version matches CI's in .circleci/config.yml
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
 WORKDIR /app
 
 FROM chef AS planner

syncserver/src/web/middleware/sentry.rs

@@ -22,7 +22,7 @@ pub fn report(
     extra: HashMap<String, String>,
     mut event: Event<'static>,
 ) {
-    event.tags.extend(tags.into_iter());
+    event.tags.extend(tags);
     event
         .extra
         .extend(extra.into_iter().map(|(k, v)| (k, Value::from(v))));

syncstorage-db/src/tests/db.rs

@@ -866,7 +866,7 @@ async fn get_bsos() -> Result<(), DbError> {
 
     let uid = 2;
     let coll = "clients";
-    let sortindexes = vec![1, 3, 4, 2, 0];
+    let sortindexes = [1, 3, 4, 2, 0];
     for (i, (revi, sortindex)) in sortindexes.iter().enumerate().rev().enumerate() {
         let bso = pbso(
             uid,

syncstorage-mysql/src/models.rs

@@ -130,6 +130,8 @@ impl MysqlDb {
             conn: LoggingConnection::new(conn),
             session: RefCell::new(Default::default()),
         };
+        // https://github.com/mozilla-services/syncstorage-rs/issues/1480
+        #[allow(clippy::arc_with_non_send_sync)]
         MysqlDb {
             inner: Arc::new(inner),
             coll_cache,

syncstorage-spanner/src/models.rs

@@ -113,6 +113,9 @@ impl SpannerDb {
             session: RefCell::new(Default::default()),
         };
         SpannerDb {
+            // We can probably move this to Rc:
+            // https://github.com/mozilla-services/syncstorage-rs/issues/1480
+            #[allow(clippy::arc_with_non_send_sync)]
             inner: Arc::new(inner),
             coll_cache,
             metrics: metrics.clone(),

tokenserver-db/src/models.rs

@@ -76,6 +76,8 @@ impl TokenserverDb {
             conn: LoggingConnection::new(conn),
         };
 
+        // https://github.com/mozilla-services/syncstorage-rs/issues/1480
+        #[allow(clippy::arc_with_non_send_sync)]
         Self {
             inner: Arc::new(inner),
             metrics: metrics.clone(),