From 73a29f5129b77923d92e82d78d58c462bf69366b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 15:04:43 +0000 Subject: [PATCH 1/3] Bump dropshot from `da09c39` to `0e971f5` Bumps [dropshot](https://github.com/oxidecomputer/dropshot) from `da09c39` to `0e971f5`. - [Release notes](https://github.com/oxidecomputer/dropshot/releases) - [Commits](https://github.com/oxidecomputer/dropshot/compare/da09c39441e2d4c984d076f90cd550d9c6f76951...0e971f5c554390273622b37cd2a6aaec1dff815b) --- updated-dependencies: - dependency-name: dropshot dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50dbb5ede1..3f6ea92673 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -974,7 +974,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dropshot" version = "0.6.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#da09c39441e2d4c984d076f90cd550d9c6f76951" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0e971f5c554390273622b37cd2a6aaec1dff815b" dependencies = [ "async-stream", "async-trait", @@ -992,7 +992,7 @@ dependencies = [ "percent-encoding", "proc-macro2", "rustls", - "rustls-pemfile 0.3.0", + "rustls-pemfile 1.0.0", "schemars", "serde", "serde_json", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "dropshot_endpoint" version = "0.6.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#da09c39441e2d4c984d076f90cd550d9c6f76951" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0e971f5c554390273622b37cd2a6aaec1dff815b" dependencies = [ "proc-macro2", "quote", From 2191aa4409fe4c8d2ecaae73bbef8193da8fad89 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 3 May 2022 14:48:48 -0700 Subject: [PATCH 2/3] update for examples --- openapi/nexus.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openapi/nexus.json b/openapi/nexus.json index 409ebadc1a..8524249f4e 100644 --- a/openapi/nexus.json +++ b/openapi/nexus.json @@ -5971,6 +5971,7 @@ ] }, "Ipv4Net": { + "example": "192.168.1.0/24", "title": "An IPv4 subnet", "description": "An IPv4 subnet, including prefix and subnet mask", "type": "string", @@ -5978,6 +5979,7 @@ "maxLength": 18 }, "Ipv6Net": { + "example": "fd12:3456::/64", "title": "An IPv6 subnet", "description": "An IPv6 subnet, including prefix and subnet mask", "type": "string", @@ -5985,6 +5987,7 @@ "maxLength": 43 }, "L4PortRange": { + "example": "22", "title": "A range of IP ports", "description": "An inclusive-inclusive range of IP ports. The second port may be omitted to represent a single port", "type": "string", @@ -6004,6 +6007,7 @@ ] }, "MacAddr": { + "example": "ff:ff:ff:ff:ff:ff", "title": "A MAC address", "description": "A Media Access Control address, in EUI-48 format", "type": "string", From 87dfff8d195784fd34f7e3b8d1eccbacb30ea3c5 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 3 May 2022 22:46:28 -0700 Subject: [PATCH 3/3] other openapi docs --- openapi/bootstrap-agent.json | 1 + openapi/sled-agent.json | 1 + 2 files changed, 2 insertions(+) diff --git a/openapi/bootstrap-agent.json b/openapi/bootstrap-agent.json index cf04477f44..113fe221a8 100644 --- a/openapi/bootstrap-agent.json +++ b/openapi/bootstrap-agent.json @@ -111,6 +111,7 @@ ] }, "Ipv6Net": { + "example": "fd12:3456::/64", "title": "An IPv6 subnet", "description": "An IPv6 subnet, including prefix and subnet mask", "type": "string", diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json index 36e51a2408..4c6fa0a484 100644 --- a/openapi/sled-agent.json +++ b/openapi/sled-agent.json @@ -857,6 +857,7 @@ ] }, "MacAddr": { + "example": "ff:ff:ff:ff:ff:ff", "title": "A MAC address", "description": "A Media Access Control address, in EUI-48 format", "type": "string",