Merge branch 'main' into bran/store-prep-steps

Cargo.toml

@@ -28,6 +28,7 @@ version = "0.4.5"
 # https://docs.rs/chrono/latest/chrono/#duration
 chrono = { version = "0.4", default-features = false }
 janus_aggregator = { version = "0.4", path = "aggregator" }
+janus_aggregator_api = { version = "0.4", path = "aggregator_api" }
 janus_aggregator_core = { version = "0.4", path = "aggregator_core" }
 janus_build_script_utils = { version = "0.4", path = "build_script_utils" }
 janus_client = { version = "0.4", path = "client" }
@@ -41,6 +42,7 @@ kube = { version = "0.82.0", default-features = false, features = ["client", "ru
 prio = { version = "0.12.0", features = ["multithreaded"] }
 trillium = "0.2.8"
 trillium-api = { version = "0.2.0-rc.2", default-features = false }
+trillium-caching-headers = "0.2.1"
 trillium-head = "0.2.0"
 trillium-opentelemetry = "0.0.1"
 trillium-router = "0.3.5"

aggregator/Cargo.toml

@@ -30,6 +30,7 @@ test-util = [
     "dep:hex",
     "dep:lazy_static",
     "dep:testcontainers",
+    "dep:trillium-testing",
 ]
 
 [dependencies]
@@ -52,6 +53,7 @@ hex = { version = "0.4.3", features = ["serde"], optional = true }
 http = "0.2.9"
 http-api-problem = "0.56.0"
 hyper = "0.14.25"
+janus_aggregator_api.workspace = true
 janus_aggregator_core.workspace = true
 janus_core.workspace = true
 janus_messages.workspace = true
@@ -61,7 +63,7 @@ lazy_static = { version = "1", optional = true }
 once_cell = "1.17.1"
 opentelemetry = { version = "0.18", features = ["metrics", "rt-tokio"] }
 opentelemetry-jaeger = { version = "0.17", optional = true, features = ["rt-tokio"] }
-opentelemetry-otlp = { version = "0.11", optional = true, features = ["metrics"] }  # ensure that the version of tonic below matches what this uses
+opentelemetry-otlp = { version = "0.11", optional = true, features = ["metrics"] } # ensure that the version of tonic below matches what this uses
 opentelemetry-prometheus = { version = "0.11", optional = true }
 opentelemetry-semantic-conventions = { version = "0.10", optional = true }
 postgres-protocol = "0.6.5"
@@ -72,8 +74,10 @@ rand = { version = "0.8", features = ["min_const_gen"] }
 regex = "1"
 reqwest = { version = "0.11.16", default-features = false, features = ["rustls-tls", "json"] }
 ring = "0.16.20"
+routefinder = "0.5.3"
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = "1.0.95"
+serde_urlencoded = "0.7.1"
 serde_yaml = "0.9.21"
 signal-hook = "0.3.15"
 signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] }
@@ -88,13 +92,16 @@ tracing-opentelemetry = { version = "0.18", optional = true }
 tracing-stackdriver = "0.6.2"
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter", "fmt", "json"] }
 trillium.workspace = true
+trillium-api.workspace = true
+trillium-caching-headers.workspace = true
 trillium-head.workspace = true
+trillium-opentelemetry.workspace = true
 trillium-prometheus = "0.1.0"
 trillium-router.workspace = true
+trillium-testing = { workspace = true, optional = true }
 trillium-tokio.workspace = true
 url = { version = "2.3.1", features = ["serde"] }
 uuid = { version = "1.3.1", features = ["v4"] }
-warp = { version = "0.3", features = ["tls"] }
 
 [dev-dependencies]
 assert_matches = "1"
@@ -104,7 +111,8 @@ janus_aggregator = { path = ".", features = ["fpvec_bounded_l2", "test-util"] }
 janus_aggregator_core = { workspace = true, features = ["test-util"] }
 mockito = "1.0.2"
 tempfile = "3.5.0"
-tokio = { version = "1", features = ["test-util"] }  # ensure this remains compatible with the non-dev dependency
+tokio = { version = "1", features = ["test-util"] } # ensure this remains compatible with the non-dev dependency
+trillium-testing.workspace = true
 trycmd = "0.14.15"
 wait-timeout = "0.2.0"