From 08d584974bdb1d0b1aa7764d304a5e60eaabd186 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <rtyler@brokenco.de>
Date: Wed, 3 Mar 2021 11:55:36 -0800
Subject: [PATCH] Upgrade to tide 0.16 across the board to make the
 async-graphql example code work

---
 Cargo.lock                             | 65 +++++---------------------
 crates/agent/Cargo.toml                |  2 +-
 services/local-orchestrator/Cargo.toml |  2 +-
 services/object-store/Cargo.toml       |  2 +-
 services/parser/Cargo.toml             |  2 +-
 services/reldata/Cargo.toml            |  5 +-
 6 files changed, 20 insertions(+), 58 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f0d1e0..46a4526 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,7 +276,7 @@ dependencies = [
  "async-trait",
  "futures-util",
  "serde_json",
- "tide 0.16.0",
+ "tide",
  "tide-websockets",
 ]
 
@@ -2063,7 +2063,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "tempfile",
- "tide 0.14.0",
+ "tide",
  "url",
  "uuid",
 ]
@@ -2118,7 +2118,7 @@ dependencies = [
  "serde 1.0.123",
  "serde_json",
  "tempfile",
- "tide 0.15.1",
+ "tide",
  "uuid",
 ]
 
@@ -2139,7 +2139,7 @@ dependencies = [
  "async-std",
  "log",
  "pretty_env_logger 0.4.0",
- "tide 0.15.1",
+ "tide",
 ]
 
 [[package]]
@@ -2164,7 +2164,7 @@ dependencies = [
  "otto-parser",
  "pretty_env_logger 0.4.0",
  "serde_json",
- "tide 0.15.1",
+ "tide",
  "uuid",
 ]
 
@@ -2175,11 +2175,14 @@ dependencies = [
  "async-graphql",
  "async-graphql-tide",
  "async-std",
+ "async-trait",
+ "dotenv",
+ "itertools",
  "log",
  "otto-models",
  "pretty_env_logger 0.4.0",
  "sqlx",
- "tide 0.15.1",
+ "tide",
 ]
 
 [[package]]
@@ -3188,52 +3191,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tide"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "457aa92965e7219a7444b2891ba970136cdf07217cea5591c15f981635800336"
-dependencies = [
- "async-h1",
- "async-session",
- "async-sse",
- "async-std",
- "async-trait",
- "femme",
- "futures-util",
- "http-client",
- "http-types",
- "kv-log-macro",
- "log",
- "pin-project-lite 0.1.12",
- "route-recognizer",
- "serde 1.0.123",
- "serde_json",
-]
-
-[[package]]
-name = "tide"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8889753e7e7b9d1ceb7a67e7df8c3994b4657082219d78eb379f71fe2934e66b"
-dependencies = [
- "async-h1",
- "async-session",
- "async-sse",
- "async-std",
- "async-trait",
- "femme",
- "futures-util",
- "http-client",
- "http-types",
- "kv-log-macro",
- "log",
- "pin-project-lite 0.1.12",
- "route-recognizer",
- "serde 1.0.123",
- "serde_json",
-]
-
 [[package]]
 name = "tide"
 version = "0.16.0"
@@ -3241,9 +3198,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c459573f0dd2cc734b539047f57489ea875af8ee950860ded20cf93a79a1dee0"
 dependencies = [
  "async-h1",
+ "async-session",
  "async-sse",
  "async-std",
  "async-trait",
+ "femme",
  "futures-util",
  "http-client",
  "http-types",
@@ -3270,7 +3229,7 @@ dependencies = [
  "serde 1.0.123",
  "serde_json",
  "sha-1 0.9.4",
- "tide 0.16.0",
+ "tide",
 ]
 
 [[package]]
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index e5d0b45..6169fcb 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -14,6 +14,6 @@ serde_json = "~1.0.59"
 serde_yaml = "~0.8.13"
 serde = {version = "~1.0.117", features = ["rc", "derive"]}
 tempfile = "~3.1.0"
-tide = "~0.14.0"
+tide = "0.16"
 url = "~2.2.0"
 uuid = { version = "~0.8.1", features = ["v4", "serde"]}
diff --git a/services/local-orchestrator/Cargo.toml b/services/local-orchestrator/Cargo.toml
index f48601e..b98297d 100644
--- a/services/local-orchestrator/Cargo.toml
+++ b/services/local-orchestrator/Cargo.toml
@@ -14,5 +14,5 @@ pretty_env_logger = "~0.4.0"
 serde = {version = "~1.0.117", features = ["rc", "derive"]}
 serde_json = "~1.0.59"
 tempfile = "~3.1.0"
-tide = "~0.15.0"
+tide = "0.16"
 uuid = { version = "~0.8.1", features = ["v4", "serde"]}
diff --git a/services/object-store/Cargo.toml b/services/object-store/Cargo.toml
index 7f5a48f..248bf72 100644
--- a/services/object-store/Cargo.toml
+++ b/services/object-store/Cargo.toml
@@ -16,4 +16,4 @@ path = "src/main.rs"
 async-std = { version = "1", features = ["attributes"]}
 log = "~0.4.11"
 pretty_env_logger = "~0.4.0"
-tide = "~0.15.0"
+tide = "0.16"
diff --git a/services/parser/Cargo.toml b/services/parser/Cargo.toml
index 57b07a3..d0a5bf7 100644
--- a/services/parser/Cargo.toml
+++ b/services/parser/Cargo.toml
@@ -15,5 +15,5 @@ otto-models = { path = "../../crates/models" }
 otto-parser = { path = "../../crates/parser" }
 pretty_env_logger = "~0.4.0"
 serde_json = "~1.0.59"
-tide = "~0.15.0"
+tide = "0.16"
 uuid = { version = "~0.8.1", features = ["v4", "serde"]}
diff --git a/services/reldata/Cargo.toml b/services/reldata/Cargo.toml
index a785166..55dcbc3 100644
--- a/services/reldata/Cargo.toml
+++ b/services/reldata/Cargo.toml
@@ -7,9 +7,12 @@ edition = "2018"
 [dependencies]
 async-graphql = "2.0"
 async-graphql-tide = "2.0"
+async-trait = "0.1"
 async-std = { version = "1", features = ["attributes"]}
+dotenv = "0.15"
+itertools = "0.10"
 log = "~0.4.11"
 otto-models = { path = "../../crates/models" }
 pretty_env_logger = "~0.4.0"
 sqlx = { version = "~0.5.1", features = ["runtime-async-std-rustls", "postgres", "tls", "json", "sqlite", "chrono", "macros", "uuid"]}
-tide = "~0.15.0"
+tide = "0.16"