From 804210e220df13d96a51f06ca664c12f52279fc7 Mon Sep 17 00:00:00 2001
From: augustuswm <gusmayo@gmail.com>
Date: Thu, 12 Oct 2023 15:51:00 -0500
Subject: [PATCH] More dep updates

---
 Cargo.lock                      | 150 ++++++++++++++++++--------------
 Cargo.toml                      |  70 +++++++--------
 rfd-api/src/context.rs          |   2 +-
 rfd-processor/src/search/mod.rs |   2 +-
 4 files changed, 121 insertions(+), 103 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0f66e911..ee59d99e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,12 +117,6 @@ version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "async-bb8-diesel"
 version = "0.1.0"
@@ -410,7 +404,7 @@ dependencies = [
  "async-trait",
  "json5",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "pathdiff",
  "ron",
  "rust-ini",
@@ -437,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "cookie"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
+checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
 dependencies = [
  "time",
  "version_check",
@@ -1139,9 +1133,9 @@ dependencies = [
  "reqwest",
  "reqwest-conditional-middleware",
  "reqwest-middleware",
- "reqwest-retry",
+ "reqwest-retry 0.2.3",
  "reqwest-tracing",
- "ring",
+ "ring 0.16.20",
  "schemars",
  "serde",
  "serde_json",
@@ -1477,12 +1471,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "iso8601-duration"
-version = "0.1.0"
+name = "iso8601"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b51dd97fa24074214b9eb14da518957573f4dec3189112610ae1ccec9ac464"
+checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
 dependencies = [
- "nom 5.1.3",
+ "nom",
 ]
 
 [[package]]
@@ -1537,7 +1531,7 @@ checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
 dependencies = [
  "base64 0.21.4",
  "pem",
- "ring",
+ "ring 0.16.20",
  "serde",
  "serde_json",
  "simple_asn1",
@@ -1552,19 +1546,6 @@ dependencies = [
  "spin 0.5.2",
 ]
 
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.149"
@@ -1669,9 +1650,9 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-index-setting-macro"
-version = "0.22.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fedd7e2fabfbcc91679f3d76f6d648ea7fc9ea87c841b10d26c2a258f408da"
+checksum = "b6e019768c1720f9820e94e8ec527e492be150eb0a5deeec28d85af7a5bbbe6a"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -1681,16 +1662,16 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-sdk"
-version = "0.22.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6be928c91e1b23689725586b56f3284f394d93185accfa2771caec3e10015d"
+checksum = "639a940bc77db5398000cb184c543106a823677f474f2f195251d2bdd373b6de"
 dependencies = [
  "async-trait",
  "either",
  "futures",
  "futures-io",
  "isahc",
- "iso8601-duration",
+ "iso8601",
  "js-sys",
  "jsonwebtoken",
  "log",
@@ -1840,24 +1821,13 @@ dependencies = [
 
 [[package]]
 name = "newline-converter"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f"
+checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f"
 dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "nom"
-version = "5.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2012,9 +1982,9 @@ dependencies = [
  "reqwest",
  "reqwest-conditional-middleware",
  "reqwest-middleware",
- "reqwest-retry",
+ "reqwest-retry 0.2.3",
  "reqwest-tracing",
- "ring",
+ "ring 0.16.20",
  "schemars",
  "serde",
  "serde_json",
@@ -2694,7 +2664,30 @@ dependencies = [
  "parking_lot 0.11.2",
  "reqwest",
  "reqwest-middleware",
- "retry-policies",
+ "retry-policies 0.1.2",
+ "task-local-extensions",
+ "tokio",
+ "tracing",
+ "wasm-timer",
+]
+
+[[package]]
+name = "reqwest-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "chrono",
+ "futures",
+ "getrandom",
+ "http",
+ "hyper",
+ "parking_lot 0.11.2",
+ "reqwest",
+ "reqwest-middleware",
+ "retry-policies 0.2.1",
  "task-local-extensions",
  "tokio",
  "tracing",
@@ -2728,6 +2721,17 @@ dependencies = [
  "rand",
 ]
 
+[[package]]
+name = "retry-policies"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "rand",
+]
+
 [[package]]
 name = "rfd-api"
 version = "0.1.0"
@@ -2759,7 +2763,7 @@ dependencies = [
  "regex",
  "reqwest",
  "rfd-model",
- "ring",
+ "ring 0.17.3",
  "rsa",
  "schemars",
  "serde",
@@ -2772,7 +2776,7 @@ dependencies = [
  "tap",
  "thiserror",
  "tokio",
- "toml 0.5.11",
+ "toml 0.8.2",
  "trace-request",
  "tracing",
  "tracing-slog",
@@ -2801,7 +2805,7 @@ dependencies = [
  "tabwriter",
  "textwrap",
  "tokio",
- "toml 0.5.11",
+ "toml 0.8.2",
  "uuid",
 ]
 
@@ -2852,7 +2856,7 @@ dependencies = [
  "regex",
  "reqwest",
  "reqwest-middleware",
- "reqwest-retry",
+ "reqwest-retry 0.3.0",
  "reqwest-tracing",
  "rfd-data",
  "rfd-model",
@@ -2907,11 +2911,25 @@ dependencies = [
  "libc",
  "once_cell",
  "spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys",
+]
+
 [[package]]
 name = "ron"
 version = "0.7.1"
@@ -3004,7 +3022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
- "ring",
+ "ring 0.16.20",
  "rustls-webpki",
  "sct",
 ]
@@ -3036,8 +3054,8 @@ version = "0.101.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -3119,8 +3137,8 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -3508,12 +3526,6 @@ dependencies = [
  "der",
 ]
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -4093,6 +4105,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "1.7.2"
diff --git a/Cargo.toml b/Cargo.toml
index 5be1d049..2d8c7d3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,73 +15,73 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-anyhow = "1.0.68"
+anyhow = "1.0.75"
 async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel" }
-async-trait = "0.1.61"
-base64 = "0.21.0"
-bb8 = "0.8"
-chrono = "0.4.22"
-clap = { version = "4.1.11", features = ["derive", "string", "env"] }
-config = { version = "0.13.1", features = ["toml"] }
-cookie = { version = "0.17.0" }
-crc32c = "0.6.3"
-diesel = { version = "2.1.1", features = ["postgres"] }
-dirs = "5.0.0"
+async-trait = "0.1.73"
+base64 = "0.21.4"
+bb8 = "0.8.1"
+chrono = "0.4.31"
+clap = { version = "4.4.6", features = ["derive", "string", "env"] }
+config = { version = "0.13.3", features = ["toml"] }
+cookie = { version = "0.18.0" }
+crc32c = "0.6.4"
+diesel = { version = "2.1.3", features = ["postgres"] }
+dirs = "5.0.1"
 dropshot = { git = "https://github.com/oxidecomputer/dropshot" }
 dropshot-verified-body = { git = "https://github.com/oxidecomputer/dropshot-verified-body", branch = "dropshot-dev" }
-google-cloudkms1 = "5.0.2"
-google-drive = "0.7.0-rc.1"
-google-storage1 = "5.0.2"
+google-cloudkms1 = "5.0.3"
+google-drive = "0.7.0"
+google-storage1 = "5.0.3"
 hex = "0.4.3"
 hmac = "0.12.1"
-http = "0.2.8"
-hyper = "0.14.23"
+http = "0.2.9"
+hyper = "0.14.27"
 hyper-tls = "0.5.0"
 itertools = "0.11.0"
-jsonwebtoken = "8.2.0"
-meilisearch-sdk = "0.22.1"
-md-5 = "0.10.5"
+jsonwebtoken = "8.3.0"
+meilisearch-sdk = "0.24.2"
+md-5 = "0.10.6"
 mime_guess = "2.0.4"
-mockall = "0.11.3"
-newline-converter = "0.2.2"
-oauth2 = "4.1.0"
-octorust = "0.7.0-rc.1"
+mockall = "0.11.4"
+newline-converter = "0.3.0"
+oauth2 = "4.4.2"
+octorust = "0.7.0"
 openssl = "0.10.57"
 partial-struct = { git = "https://github.com/oxidecomputer/partial-struct" }
 progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "print-example" }
 progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "print-example" }
 rand = "0.8.5"
 rand_core = "0.6"
-regex = "1.7.1"
+regex = "1.10.0"
 reqwest = { version = "0.11", features = ["json", "stream"] }
 reqwest-middleware = "0.2"
-reqwest-retry = "0.2.2"
+reqwest-retry = "0.3.0"
 reqwest-tracing = "0.4.6"
-ring = "0.16.20"
+ring = "0.17.3"
 rsa = "0.9.2"
 rustfmt-wrapper = "0.2.0"
-schemars = "0.8.11"
+schemars = "0.8.15"
 sha2 = "0.10.7"
 serde = "1"
 serde_bytes = "0.11.9"
 serde_json = "1"
 serde_urlencoded = "0.7.1"
-similar = "2.2.1"
+similar = "2.3.0"
 slog = "2.7.0"
-slog-async = "2.7.0"
+slog-async = "2.8.0"
 tabwriter = "1.3.0"
 tap = "1.0.1"
 textwrap = "0.16.0"
 thiserror = "1.0.38"
-tokio = "1.25.0"
-toml = "0.5.10"
+tokio = "1.33.0"
+toml = "0.8.2"
 tracing = "0.1.37"
-tracing-core = "0.1.30"
+tracing-core = "0.1.31"
 tracing-slog = { git = "https://github.com/oxidecomputer/tracing-slog" }
-tracing-subscriber = "0.3.16"
-uuid = "1.2.2"
+tracing-subscriber = "0.3.17"
+uuid = "1.4.1"
 valuable = "0.1.0"
-yup-oauth2 = "8.1.0"
+yup-oauth2 = "8.3.0"
 
 # [patch."https://github.com/oxidecomputer/progenitor"]
 # progenitor = { path = "../progenitor/progenitor" }
diff --git a/rfd-api/src/context.rs b/rfd-api/src/context.rs
index 2b5796b2..538af588 100644
--- a/rfd-api/src/context.rs
+++ b/rfd-api/src/context.rs
@@ -227,7 +227,7 @@ impl ApiContext {
             },
             oauth_providers: HashMap::new(),
             search: SearchContext {
-                client: SearchClient::new(search.host, search.key),
+                client: SearchClient::new(search.host, Some(search.key)),
                 index: search.index,
             },
         })
diff --git a/rfd-processor/src/search/mod.rs b/rfd-processor/src/search/mod.rs
index 095f79e2..b92b6dfd 100644
--- a/rfd-processor/src/search/mod.rs
+++ b/rfd-processor/src/search/mod.rs
@@ -34,7 +34,7 @@ impl RfdSearchIndex {
         index: impl Into<String>,
     ) -> Self {
         Self {
-            client: Client::new(host, api_key),
+            client: Client::new(host, Some(api_key)),
             index: index.into(),
         }
     }