diff --git a/src/ApiService/ApiService/ApiService.csproj b/src/ApiService/ApiService/ApiService.csproj
index 3d55169547..3a4075df11 100644
--- a/src/ApiService/ApiService/ApiService.csproj
+++ b/src/ApiService/ApiService/ApiService.csproj
@@ -25,9 +25,8 @@
-
+
-
diff --git a/src/ApiService/ApiService/packages.lock.json b/src/ApiService/ApiService/packages.lock.json
index 014dec6b23..44e77c1860 100644
--- a/src/ApiService/ApiService/packages.lock.json
+++ b/src/ApiService/ApiService/packages.lock.json
@@ -2,28 +2,13 @@
"version": 1,
"dependencies": {
"net7.0": {
- "Azure.Core": {
- "type": "Direct",
- "requested": "[1.25.0, )",
- "resolved": "1.25.0",
- "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==",
- "dependencies": {
- "Microsoft.Bcl.AsyncInterfaces": "1.1.1",
- "System.Diagnostics.DiagnosticSource": "4.6.0",
- "System.Memory.Data": "1.0.2",
- "System.Numerics.Vectors": "4.5.0",
- "System.Text.Encodings.Web": "4.7.2",
- "System.Text.Json": "4.7.2",
- "System.Threading.Tasks.Extensions": "4.5.4"
- }
- },
"Azure.Data.Tables": {
"type": "Direct",
- "requested": "[12.5.0, )",
- "resolved": "12.5.0",
- "contentHash": "XeIxPf+rF1NXkX3NJSB0ZTNgU233vyPXGmaFsR0lUVibtWP/lj+Qu1FcPxoslURcX0KC+UgTb226nqVdHjoweQ==",
+ "requested": "[12.8.0, )",
+ "resolved": "12.8.0",
+ "contentHash": "jBNOUXoANEv66mIyR+rzC7toogo48pYciH4n5xsb8nHRz6lfjX9jwsOjC8sdR1Zl75Z6MZvaZjajqVwCt3JqVw==",
"dependencies": {
- "Azure.Core": "1.22.0",
+ "Azure.Core": "1.27.0",
"System.Text.Json": "4.7.2"
}
},
@@ -397,6 +382,20 @@
"resolved": "2.0.3",
"contentHash": "RUdwpeaZpj98w1dQw295V950qGGtoVdPbhxU1UBazR9pOAX6YpK9qc17u9swRhlKTDY2PvHIXODrNwFXGC/jvw=="
},
+ "Azure.Core": {
+ "type": "Transitive",
+ "resolved": "1.27.0",
+ "contentHash": "2313x90KaNKRY88ZMK/4MQaNESTzgPEeUCeyXMrOoZwh8HsjuHAHPG8eskHlpmQ4CuOag+QEwE04vykzTvosrw==",
+ "dependencies": {
+ "Microsoft.Bcl.AsyncInterfaces": "1.1.1",
+ "System.Diagnostics.DiagnosticSource": "4.6.0",
+ "System.Memory.Data": "1.0.2",
+ "System.Numerics.Vectors": "4.5.0",
+ "System.Text.Encodings.Web": "4.7.2",
+ "System.Text.Json": "4.7.2",
+ "System.Threading.Tasks.Extensions": "4.5.4"
+ }
+ },
"Azure.Data.AppConfiguration": {
"type": "Transitive",
"resolved": "1.2.0",
diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json
index bc6fd621db..9d0039eb9f 100644
--- a/src/ApiService/IntegrationTests/packages.lock.json
+++ b/src/ApiService/IntegrationTests/packages.lock.json
@@ -56,8 +56,8 @@
},
"Azure.Core": {
"type": "Transitive",
- "resolved": "1.25.0",
- "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==",
+ "resolved": "1.27.0",
+ "contentHash": "2313x90KaNKRY88ZMK/4MQaNESTzgPEeUCeyXMrOoZwh8HsjuHAHPG8eskHlpmQ4CuOag+QEwE04vykzTvosrw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -80,10 +80,10 @@
},
"Azure.Data.Tables": {
"type": "Transitive",
- "resolved": "12.5.0",
- "contentHash": "XeIxPf+rF1NXkX3NJSB0ZTNgU233vyPXGmaFsR0lUVibtWP/lj+Qu1FcPxoslURcX0KC+UgTb226nqVdHjoweQ==",
+ "resolved": "12.8.0",
+ "contentHash": "jBNOUXoANEv66mIyR+rzC7toogo48pYciH4n5xsb8nHRz6lfjX9jwsOjC8sdR1Zl75Z6MZvaZjajqVwCt3JqVw==",
"dependencies": {
- "Azure.Core": "1.22.0",
+ "Azure.Core": "1.27.0",
"System.Text.Json": "4.7.2"
}
},
@@ -2482,8 +2482,7 @@
"apiservice": {
"type": "Project",
"dependencies": {
- "Azure.Core": "[1.25.0, )",
- "Azure.Data.Tables": "[12.5.0, )",
+ "Azure.Data.Tables": "[12.8.0, )",
"Azure.Identity": "[1.6.0, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
"Azure.ResourceManager": "[1.3.1, )",
diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json
index c095309ea5..5e0d7c72b4 100644
--- a/src/ApiService/Tests/packages.lock.json
+++ b/src/ApiService/Tests/packages.lock.json
@@ -75,8 +75,8 @@
},
"Azure.Core": {
"type": "Transitive",
- "resolved": "1.25.0",
- "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==",
+ "resolved": "1.27.0",
+ "contentHash": "2313x90KaNKRY88ZMK/4MQaNESTzgPEeUCeyXMrOoZwh8HsjuHAHPG8eskHlpmQ4CuOag+QEwE04vykzTvosrw==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
@@ -99,10 +99,10 @@
},
"Azure.Data.Tables": {
"type": "Transitive",
- "resolved": "12.5.0",
- "contentHash": "XeIxPf+rF1NXkX3NJSB0ZTNgU233vyPXGmaFsR0lUVibtWP/lj+Qu1FcPxoslURcX0KC+UgTb226nqVdHjoweQ==",
+ "resolved": "12.8.0",
+ "contentHash": "jBNOUXoANEv66mIyR+rzC7toogo48pYciH4n5xsb8nHRz6lfjX9jwsOjC8sdR1Zl75Z6MZvaZjajqVwCt3JqVw==",
"dependencies": {
- "Azure.Core": "1.22.0",
+ "Azure.Core": "1.27.0",
"System.Text.Json": "4.7.2"
}
},
@@ -2609,8 +2609,7 @@
"apiservice": {
"type": "Project",
"dependencies": {
- "Azure.Core": "[1.25.0, )",
- "Azure.Data.Tables": "[12.5.0, )",
+ "Azure.Data.Tables": "[12.8.0, )",
"Azure.Identity": "[1.6.0, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
"Azure.ResourceManager": "[1.3.1, )",
diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
index 5c230b5bf5..f25c34cd5c 100644
--- a/src/agent/Cargo.lock
+++ b/src/agent/Cargo.lock
@@ -83,15 +83,19 @@ checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
[[package]]
name = "arrayvec"
-version = "0.5.2"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
-name = "arrayvec"
-version = "0.7.2"
+name = "assert-json-diff"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
+dependencies = [
+ "serde",
+ "serde_json",
+]
[[package]]
name = "async-channel"
@@ -309,7 +313,7 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5839ee4f953e811bfdcf223f509cb2c6a3e1447959b0bff459405575bc17f22"
dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
]
[[package]]
@@ -357,7 +361,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
dependencies = [
- "nom 7.1.3",
+ "nom",
]
[[package]]
@@ -450,17 +454,6 @@ dependencies = [
"cache-padded",
]
-[[package]]
-name = "config"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
-dependencies = [
- "lazy_static",
- "nom 5.1.2",
- "serde",
-]
-
[[package]]
name = "core-foundation"
version = "0.9.3"
@@ -650,18 +643,23 @@ dependencies = [
[[package]]
name = "deadpool"
-version = "0.7.0"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
+checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e"
dependencies = [
"async-trait",
- "config",
- "crossbeam-queue",
+ "deadpool-runtime",
"num_cpus",
- "serde",
+ "retain_mut",
"tokio",
]
+[[package]]
+name = "deadpool-runtime"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1"
+
[[package]]
name = "debuggable-module"
version = "0.1.0"
@@ -1194,9 +1192,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.13"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
dependencies = [
"bytes",
"fnv",
@@ -1324,9 +1322,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.25"
+version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes",
"futures-channel",
@@ -1586,19 +1584,6 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec 0.5.2",
- "bitflags",
- "cfg-if 1.0.0",
- "ryu",
- "static_assertions",
-]
-
[[package]]
name = "libc"
version = "0.2.141"
@@ -1864,17 +1849,6 @@ dependencies = [
"pin-utils",
]
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
[[package]]
name = "nom"
version = "7.1.3"
@@ -1895,7 +1869,7 @@ dependencies = [
"indent_write",
"joinery",
"memchr",
- "nom 7.1.3",
+ "nom",
]
[[package]]
@@ -2735,6 +2709,12 @@ dependencies = [
"wiremock",
]
+[[package]]
+name = "retain_mut"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
+
[[package]]
name = "rstack"
version = "0.3.2"
@@ -3071,7 +3051,7 @@ dependencies = [
"clap",
"env_logger",
"log",
- "nom 7.1.3",
+ "nom",
"pdb",
"quick-xml",
"regex",
@@ -3099,12 +3079,6 @@ dependencies = [
"sha2",
]
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
[[package]]
name = "storage-queue"
version = "0.1.0"
@@ -3215,7 +3189,7 @@ dependencies = [
"goblin 0.6.0",
"lazy_static",
"lazycell",
- "nom 7.1.3",
+ "nom",
"nom-supreme",
"parking_lot 0.12.1",
"pdb-addr2line",
@@ -3991,11 +3965,13 @@ dependencies = [
[[package]]
name = "wiremock"
-version = "0.5.8"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c3fe7c6af90383100cd1486ef0467c2ebead0303ed7aa3dc6e51173ee3ff8ba"
+checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c"
dependencies = [
+ "assert-json-diff",
"async-trait",
+ "base64 0.21.0",
"deadpool",
"futures",
"futures-timer",
diff --git a/src/proxy-manager/Cargo.lock b/src/proxy-manager/Cargo.lock
index d8e992c5fd..2375dacfdf 100644
--- a/src/proxy-manager/Cargo.lock
+++ b/src/proxy-manager/Cargo.lock
@@ -424,9 +424,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.13"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
dependencies = [
"bytes",
"fnv",
@@ -515,9 +515,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.25"
+version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes",
"futures-channel",