fix(sendgrid): return message id from the sendgrid provider

https://github.com/mozilla/fxa-email-service/pull/37 r=rfk,shane-tomlinson
2018-06-05 09:15:40 +01:00 · 2018-06-05 09:15:40 +01:00 · fe8ec12f55
--- a/Cargo.lock
+++ b/Cargo.lock
@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -50,7 +50,7 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -150,7 +150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde-hjson 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -179,7 +179,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -187,7 +187,7 @@ name = "core-foundation-sys"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -270,7 +270,7 @@ dependencies = [

 [[package]]
 name = "data-encoding"
-version = "1.2.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -363,9 +363,9 @@ dependencies = [
 "rusoto_core 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rusoto_credential 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rusoto_ses 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sendgrid 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sendgrid 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "validator 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "validator_derive 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -481,7 +481,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -490,7 +490,7 @@ name = "isatty"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -531,7 +531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "libc"
-version = "0.2.41"
+version = "0.2.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -584,7 +584,7 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -592,7 +592,7 @@ name = "memchr"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -600,7 +600,7 @@ name = "memchr"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -645,7 +645,7 @@ dependencies = [
 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -670,7 +670,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "schannel 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -684,7 +684,7 @@ version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -727,7 +727,7 @@ name = "num_cpus"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -738,17 +738,17 @@ dependencies = [
 "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "openssl-sys"
-version = "0.9.31"
+version = "0.9.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "vcpkg 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -827,7 +827,7 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -846,7 +846,7 @@ name = "quote"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -855,7 +855,7 @@ version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -865,7 +865,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -884,7 +884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -981,7 +981,7 @@ dependencies = [
 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime_guess 2.0.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_urlencoded 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@ -998,7 +998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1045,7 +1045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "rocket 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1064,7 +1064,7 @@ dependencies = [
 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rusoto_credential 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1142,7 +1142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1152,7 +1152,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1170,14 +1170,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "sendgrid"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "data-encoding 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "data-encoding 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1189,7 +1189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "serde"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1206,12 +1206,12 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1221,7 +1221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1239,7 +1239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1296,10 +1296,10 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1324,7 +1324,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1349,7 +1349,7 @@ name = "time"
 version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1519,7 +1519,7 @@ name = "toml"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1632,8 +1632,8 @@ dependencies = [
 "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1767,7 +1767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
 "checksum crossbeam-utils 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d636a8b3bcc1b409d7ffd3facef8f21dcb4009626adbd0c5e6c4305c07253c7b"
 "checksum crypto-mac 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0999b4ff4d3446d4ddb19a63e9e00c1876e75cd7000d20e57a693b4b3f08d958"
-"checksum data-encoding 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d867ddbf09de0b73e09ec798972fb7f870495a0893f6f736c1855448c5a56789"
+"checksum data-encoding 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "67df0571a74bf0d97fb8b2ed22abdd9a48475c96bd327db968b7d9cace99655e"
 "checksum digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum encoding_rs 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98fd0f24d1fb71a4a6b9330c8ca04cbd4e7cc5d846b54ca74ff376bc7c9f798d"
@ -1797,7 +1797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739"
 "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
-"checksum libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)" = "ac8ebf8343a981e2fa97042b14768f02ed3e1d602eac06cae6166df3c8ced206"
+"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1"
 "checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
 "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
@ -1822,7 +1822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "775393e285254d2f5004596d69bb8bc1149754570dcc08cf30cabeba67955e28"
 "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
 "checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985"
-"checksum openssl-sys 0.9.31 (registry+https://github.com/rust-lang/crates.io-index)" = "a4d6a27d108b29befe1822d40e2e22f85518dac59acbf7f30fdc532f48fd0a77"
+"checksum openssl-sys 0.9.32 (registry+https://github.com/rust-lang/crates.io-index)" = "55ab11bb4f1874c116d57ff27d8bfe8252dafc567384334b7c58339ad57e0010"
 "checksum ordermap 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b81cf3b8cb96aa0e73bbedfcdc9708d09fec2854ba8d474be4e6f666d7379e8b"
 "checksum pear 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "2d0b966f9b387335fedc3546471db37b6e02430c180878015df1eaa3e62da289"
 "checksum pear_codegen 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "3a97c944f71801ef6b36bbf47a98b24167795d74bb8678f013d60d312bfc795c"
@ -1833,7 +1833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum phf_shared 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "c2261d544c2bb6aa3b10022b0be371b9c7c64f762ef28c6f5d4f1ef6d97b5930"
 "checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
-"checksum proc-macro2 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1fa93823f53cfd0f5ac117b189aed6cfdfb2cfc0a9d82e956dd7927595ed7d46"
+"checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
@ -1867,11 +1867,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum sendgrid 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "07e141c41481f37f63709b1153eeca4dad94e0a0698381a4846119c5b4872303"
+"checksum sendgrid 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9af1dc695d563dc3480d447bf4329aff354c73d208586c0a422ea15d05b67edf"
 "checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-"checksum serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)" = "fba5be06346c5200249c8c8ca4ccba4a09e8747c71c16e420bd359a0db4d8f91"
+"checksum serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)" = "e9a2d9a9ac5120e0f768801ca2b58ad6eec929dc9d1d616c162f208869c2ce95"
 "checksum serde-hjson 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a2376ebb8976138927f48b49588ef73cde2f6591b8b3df22f4063e0f27b9bec"
-"checksum serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)" = "79e4620ba6fbe051fc7506fab6f84205823564d55da18d55b695160fb3479cd8"
+"checksum serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)" = "0a90213fa7e0f5eac3f7afe2d5ff6b088af515052cc7303bd68c7e3b91a3fb79"
 "checksum serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "93aee34bb692dde91e602871bc792dd319e489c7308cdbbe5f27cf27c64280f5"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum serde_urlencoded 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e703cef904312097cfceab9ce131ff6bbe09e8c964a0703345a5f49238757bc1"
@ -1883,7 +1883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum smallvec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03dab98ab5ded3a8b43b2c80751194608d0b2aa0f1d46cf95d1c35e192844aa7"
 "checksum state 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
-"checksum syn 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6dfd71b2be5a58ee30a6f8ea355ba8290d397131c00dfa55c3d34e6e13db5101"
+"checksum syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c67da57e61ebc7b7b6fff56bb34440ca3a83db037320b0507af4c10368deda7d"
 "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -14,7 +14,7 @@ rocket_contrib = "0.3.12"
 rusoto_core = "0.32.0"
 rusoto_credential = "0.11.0"
 rusoto_ses = "0.32.0"
-sendgrid = "0.6.2"
+sendgrid = "0.7.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
--- a/src/providers/mod.rs
+++ b/src/providers/mod.rs
@ -89,16 +89,14 @@ impl<'s> Providers<'s> {
            self.default_provider
        };

-        match self.providers.get(resolved_provider_id) {
-            Some(ref provider) => match provider.send(to, cc, subject, body_text, body_html) {
-                Ok(message_id) => Ok(format!("{}:{}", resolved_provider_id, message_id)),
-                Err(error) => Err(error),
-            },
-            None => Err(ProviderError::new(format!(
-                "invalid provider '{}'",
+        self.providers
+            .get(resolved_provider_id)
+            .ok_or(ProviderError::new(format!(
+                "Invalid provider `{}`",
                resolved_provider_id
-            ))),
-        }
+            )))
+            .and_then(|provider| provider.send(to, cc, subject, body_text, body_html))
+            .map(|message_id| format!("{}:{}", resolved_provider_id, message_id))
    }
 }

--- a/src/providers/sendgrid.rs
+++ b/src/providers/sendgrid.rs
@ -2,6 +2,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.

+use std::str::{from_utf8, Utf8Error};
+
+use reqwest::StatusCode;
 use sendgrid::{
    errors::SendgridError,
    v3::{
@ -68,10 +71,29 @@ impl<'s> Provider for SendgridProvider<'s> {
        });
        message.add_personalization(personalization);

-        self.client.send(&message)
-            // TODO: implement message ids
-            .map(|_| String::from("deadbeef"))
+        self.client
+            .send(&message)
            .map_err(From::from)
+            .and_then(|response| {
+                let status = response.status();
+                if status == StatusCode::Ok || status == StatusCode::Accepted {
+                    response
+                        .headers()
+                        .get_raw("X-Message-Id")
+                        .and_then(|raw_header| raw_header.one())
+                        .ok_or(ProviderError {
+                            description: String::from(
+                                "Missing or duplicate X-Message-Id header in Sendgrid response",
+                            ),
+                        })
+                        .and_then(|message_id| from_utf8(message_id).map_err(From::from))
+                        .map(|message_id| message_id.to_string())
+                } else {
+                    Err(ProviderError {
+                        description: format!("Sendgrid response: {}", status),
+                    })
+                }
+            })
    }
 }

@ -82,3 +104,11 @@ impl From<SendgridError> for ProviderError {
        }
    }
 }
+
+impl From<Utf8Error> for ProviderError {
+    fn from(error: Utf8Error) -> ProviderError {
+        ProviderError {
+            description: format!("Failed to decode string as UTF-8: {:?}", error),
+        }
+    }
+}
--- a/src/queues/sendgrid/mod.rs
+++ b/src/queues/sendgrid/mod.rs
@ -0,0 +1,200 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, you can obtain one at https://mozilla.org/MPL/2.0/.
+
+use std::{
+    boxed::Box, fmt::{self, Debug, Formatter},
+};
+
+use futures::future::{self, Future};
+use md5;
+use rusoto_core::{reactor::RequestDispatcher, Region};
+use rusoto_credential::StaticProvider;
+use rusoto_sqs::{
+    DeleteMessageError, DeleteMessageRequest, Message as SqsMessage, ReceiveMessageError,
+    ReceiveMessageRequest, SendMessageError, SendMessageRequest, Sqs, SqsClient,
+};
+use serde_json::{self, Error as JsonError, Value as JsonValue};
+
+use self::notification::Notification as SqsNotification;
+use super::{
+    notification::Notification, DeleteFuture, Factory, Incoming, Message, Outgoing, QueueError,
+    ReceiveFuture, SendFuture,
+};
+use settings::Settings;
+
+pub mod notification;
+
+pub struct Queue {
+    client: Box<Sqs>,
+    url: String,
+    receive_request: ReceiveMessageRequest,
+}
+
+impl Queue {
+    fn parse_message(&self, message: SqsMessage) -> Result<Message, QueueError> {
+        let body = message.body.unwrap_or(String::from(""));
+        if body == "" {
+            return Err(QueueError::new(format!(
+                "Missing message body, queue=`{}`",
+                self.url
+            )));
+        }
+
+        if let Some(hash) = message.md5_of_body {
+            if hash != format!("{:x}", md5::compute(&body)) {
+                return Err(QueueError::new(format!(
+                    "Message body does not match MD5 hash, queue=`{}`, hash=`{}`, body=`{}`",
+                    self.url, hash, body
+                )));
+            }
+        }
+
+        let receipt_handle = message.receipt_handle.unwrap_or(String::from(""));
+        if receipt_handle == "" {
+            return Err(QueueError::new(format!(
+                "Missing receipt handle, queue=`{}`",
+                self.url
+            )));
+        }
+
+        serde_json::from_value(JsonValue::String(body.clone()))
+            .map(|notification: SqsNotification| {
+                println!(
+                    "Successfully parsed SQS message, queue=`{}`, receipt_handle=`{}`, notification_type=`{}`",
+                    self.url,
+                    receipt_handle,
+                    notification.notification_type
+                );
+                Message {
+                    notification: From::from(notification),
+                    id: receipt_handle,
+                }
+            })
+            .map_err(|error| {
+                QueueError::new(format!(
+                    "Unparseable message body, queue=`{}`, error=`{}`, body=`{}`",
+                    self.url, error, body
+                ))
+            })
+    }
+}
+
+impl Factory for Queue {
+    fn new(id: String, settings: &Settings) -> Queue {
+        let region = settings
+            .aws
+            .region
+            .parse::<Region>()
+            .expect("invalid region");
+
+        let client: Box<Sqs> = if let Some(ref keys) = settings.aws.keys {
+            let creds =
+                StaticProvider::new(keys.access.to_string(), keys.secret.to_string(), None, None);
+            Box::new(SqsClient::new(RequestDispatcher::default(), creds, region))
+        } else {
+            Box::new(SqsClient::simple(region))
+        };
+
+        let mut receive_request = ReceiveMessageRequest::default();
+        receive_request.max_number_of_messages = Some(10);
+        receive_request.queue_url = id.clone();
+
+        Queue {
+            client,
+            url: id,
+            receive_request,
+        }
+    }
+}
+
+impl Incoming for Queue {
+    fn receive(&'static self) -> ReceiveFuture {
+        let future = self
+            .client
+            .receive_message(&self.receive_request)
+            .map(|result| result.messages.unwrap_or(Vec::new()))
+            .map(move |messages| {
+                messages
+                    .into_iter()
+                    .map(|message| {
+                        self.parse_message(message).unwrap_or_else(|error| {
+                            // At this point any parse errors are message-specific.
+                            // Log them but don't fail the broader call to receive,
+                            // because other messages might be fine.
+                            println!("Queue error receiving from {}: {:?}", self.url, error);
+                            Message::default()
+                        })
+                    })
+                    .collect()
+            })
+            .map_err(From::from);
+
+        Box::new(future)
+    }
+
+    fn delete(&'static self, message: Message) -> DeleteFuture {
+        let request = DeleteMessageRequest {
+            queue_url: self.url.to_string(),
+            receipt_handle: message.id,
+        };
+
+        let future = self.client.delete_message(&request).map_err(move |error| {
+            println!("Queue error deleting from {}: {:?}", self.url, error);
+            From::from(error)
+        });
+
+        Box::new(future)
+    }
+}
+
+impl Outgoing for Queue {
+    fn send(&'static self, notification: &Notification) -> SendFuture {
+        let mut request = SendMessageRequest::default();
+        request.message_body = match serde_json::to_string(notification) {
+            Ok(body) => body,
+            Err(error) => return Box::new(future::err(From::from(error))),
+        };
+        request.queue_url = self.url.to_string();
+
+        let future = self
+            .client
+            .send_message(&request)
+            .map(|result| result.message_id.map_or(String::from(""), |id| id.clone()))
+            .map_err(From::from);
+
+        Box::new(future)
+    }
+}
+
+impl Debug for Queue {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+        write!(formatter, "SQS queue, url=`{}`", self.url)
+    }
+}
+
+unsafe impl Sync for Queue {}
+
+impl From<ReceiveMessageError> for QueueError {
+    fn from(error: ReceiveMessageError) -> QueueError {
+        QueueError::new(format!("SQS ReceiveMessage error: {:?}", error))
+    }
+}
+
+impl From<SendMessageError> for QueueError {
+    fn from(error: SendMessageError) -> QueueError {
+        QueueError::new(format!("SQS SendMessage error: {:?}", error))
+    }
+}
+
+impl From<DeleteMessageError> for QueueError {
+    fn from(error: DeleteMessageError) -> QueueError {
+        QueueError::new(format!("SQS DeleteMessage error: {:?}", error))
+    }
+}
+
+impl From<JsonError> for QueueError {
+    fn from(error: JsonError) -> QueueError {
+        QueueError::new(format!("JSON error: {:?}", error))
+    }
+}
--- a/src/send/mod.rs
+++ b/src/send/mod.rs
@ -116,15 +116,18 @@ fn handler(email: Email) -> Result<Json<Value>, Failure> {
        None
    };

-    match PROVIDERS.send(
-        email.to.as_ref(),
-        cc.as_ref(),
-        email.subject.as_ref(),
-        email.body.text.as_ref(),
-        html,
-        provider,
-    ) {
-        Ok(message_id) => Ok(Json(json!({ "messageId": message_id }))),
-        Err(_error) => Err(Failure(Status::InternalServerError)),
-    }
+    PROVIDERS
+        .send(
+            email.to.as_ref(),
+            cc.as_ref(),
+            email.subject.as_ref(),
+            email.body.text.as_ref(),
+            html,
+            provider,
+        )
+        .map(|message_id| Json(json!({ "messageId": message_id })))
+        .map_err(|error| {
+            println!("{}", error);
+            Failure(Status::InternalServerError)
+        })
 }