From 0dde4cd33a9ef016a5fb6f6ef6711e366593cd1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 15:16:32 +0000
Subject: [PATCH 1/2] Bump dropshot from `8baf06e` to `1f98f79`

Bumps [dropshot](https://github.com/oxidecomputer/dropshot) from `8baf06e` to `1f98f79`.
- [Release notes](https://github.com/oxidecomputer/dropshot/releases)
- [Commits](https://github.com/oxidecomputer/dropshot/compare/8baf06e3fcdae54abf59910460de6b89008b6771...1f98f791bf4a9bfb5b15549e22f927075bbfa07c)

---
updated-dependencies:
- dependency-name: dropshot
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d511f91c6c8..7143ddf1b12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1172,7 +1172,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 [[package]]
 name = "dropshot"
 version = "0.7.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#8baf06e3fcdae54abf59910460de6b89008b6771"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#1f98f791bf4a9bfb5b15549e22f927075bbfa07c"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -1195,6 +1195,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sha1",
  "slog",
  "slog-async",
  "slog-bunyan",
@@ -1211,7 +1212,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.7.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#8baf06e3fcdae54abf59910460de6b89008b6771"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#1f98f791bf4a9bfb5b15549e22f927075bbfa07c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4800,6 +4801,17 @@ dependencies = [
  "digest 0.10.3",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "sha2"
 version = "0.9.9"

From 6d5df060feb5293e868da4efcf1ad72805b46199 Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Mon, 22 Aug 2022 10:56:23 -0700
Subject: [PATCH 2/2] update for breaking change

---
 nexus/src/authn/external/cookies.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nexus/src/authn/external/cookies.rs b/nexus/src/authn/external/cookies.rs
index b3a6013ca4e..dcc4c88dcaa 100644
--- a/nexus/src/authn/external/cookies.rs
+++ b/nexus/src/authn/external/cookies.rs
@@ -6,8 +6,8 @@ use anyhow::Context;
 use async_trait::async_trait;
 use cookie::{Cookie, CookieJar, ParseError};
 use dropshot::{
-    ApiEndpointBodyContentType, Extractor, ExtractorMetadata, HttpError,
-    RequestContext, ServerContext,
+    ApiEndpointBodyContentType, ExtensionMode, Extractor, ExtractorMetadata,
+    HttpError, RequestContext, ServerContext,
 };
 use std::sync::Arc;
 
@@ -48,7 +48,10 @@ impl Extractor for Cookies {
     fn metadata(
         _body_content_type: ApiEndpointBodyContentType,
     ) -> ExtractorMetadata {
-        ExtractorMetadata { paginated: false, parameters: vec![] }
+        ExtractorMetadata {
+            extension_mode: ExtensionMode::None,
+            parameters: vec![],
+        }
     }
 }