chore: Update for March 2021

* Updates googleapis-raw
* Updates grpcio
* Annotate pinned dependencies

Closes #1018

Cargo.toml

@@ -18,17 +18,17 @@ debug = 1
 actix-http = "2"
 actix-web = "3"
 actix-web-httpauth = "0.5"
-actix-rt = "1"
+actix-rt = "1"  # Pin to 1.0, due to dependencies on Tokio
 actix-cors = "0.5"
 async-trait = "0.1.40"
 base64 = "0.13"
-bb8 = "0.4.1"
+bb8 = "0.4.1"  # pin to 0.4 due to dependencies on Tokio
 bytes = "1.0"
-cadence = "0.23"
+cadence = "0.24"
 chrono = "0.4"
 config = "0.10"
 # Pin to 0.5 for now, to keep it under tokio 0.2 (issue977)
-deadpool = "0.5"
+deadpool = "0.5"  # pin to 0.5
 diesel = { version = "1.4", features = ["mysql", "r2d2"] }
 diesel_logger = "0.1.1"
 diesel_migrations = { version = "1.4.0", features = ["mysql"] }
@@ -40,7 +40,7 @@ googleapis-raw = { version = "0", path = "vendor/mozilla-rust-sdk/googleapis-raw
 # Some versions of OpenSSL 1.1.1 conflict with grpcio's built-in boringssl which can cause
 # syncserver to either fail to either compile, or start. In those cases, try
 # `cargo build --features grpcio/openssl ...`
-grpcio = { version = "0.7" }
+grpcio = { version = "0.8" }
 hyper = "0.13.10"  # RUSTSEC-2021-0020 requires 0.13.10+ or 0.14.3+
 lazy_static = "1.4.0"
 pyo3 = "0.13"
@@ -57,7 +57,7 @@ protobuf = "2.20.0"
 rand = "0.8"
 regex = "1.4"
 # pin to 0.19: https://github.com/getsentry/sentry-rust/issues/277
-sentry = { version = "0.19", features = ["with_curl_transport"] }
+sentry = { version = "0.19", features = ["with_curl_transport"] }  # pin to 0.19 due to curl transport, failure
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }

src/db/spanner/support.rs

@@ -276,6 +276,7 @@ fn merge_by_type(lhs: Value, rhs: &Value, field_type: &Type) -> Result<Value> {
         | TypeCode::TIMESTAMP => merge_string(lhs, rhs),
         TypeCode::ARRAY
         | TypeCode::FLOAT64
+        | TypeCode::NUMERIC
         | TypeCode::STRUCT
         | TypeCode::TYPE_CODE_UNSPECIFIED
         | TypeCode::BOOL => unsupported_merge(field_type),

vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml

@@ -1,18 +1,32 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 [package]
 name = "googleapis-raw"
-version = "0.0.6"
+version = "0.1.0"
 authors = ["Ferrous Systems"]
 edition = "2018"
 
 [dependencies]
-futures = "0.3.8"
-grpcio = "0.7.1"
-protobuf = "2.22.0"
+futures = "0.3.5"
+grpcio = "0.8.0"
+protobuf = "2.16.2"
 
 [dev-dependencies]
-slog = "2.7"
+slog = "2.5"
 slog-scope = "4.3"
 slog-term = "2.6"
-slog-stdlog = "4.1"
+slog-stdlog = "4.0"
 slog-async = "2.5"
 log = "0.4"