Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lock file maintenance #5786

Merged
merged 5 commits into from
May 20, 2024
Merged

Lock file maintenance #5786

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e85e80
freeze vsss-rs at =3.3.4
iliana May 17, 2024
9899dcb
cargo update
iliana May 17, 2024
2973a4c
expectorate
iliana May 17, 2024
ff6417a
Merge remote-tracking branch 'origin/main' into iliana/cargo-update
iliana May 20, 2024
8d4d403
defmt 0.3.7 was yanked
iliana May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,409 changes: 718 additions & 691 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bootstore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ slog.workspace = true
thiserror.workspace = true
tokio.workspace = true
uuid.workspace = true
vsss-rs = { version = "3.3.4", features = ["std", "curve25519"] }
vsss-rs = { version = "=3.3.4", features = ["std", "curve25519"] }
zeroize.workspace = true

# See omicron-rpaths for more about the "pq-sys" dependency.
Expand Down
2 changes: 1 addition & 1 deletion internal-dns/tests/output/test-server.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@
}
}
}
}
}
11 changes: 1 addition & 10 deletions openapi/bootstrap-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@
"checker": {
"nullable": true,
"description": "Checker to apply to incoming messages.",
"default": null,
"type": "string"
},
"originate": {
Expand All @@ -341,7 +340,6 @@
"shaper": {
"nullable": true,
"description": "Shaper to apply to outgoing messages.",
"default": null,
"type": "string"
}
},
Expand Down Expand Up @@ -439,29 +437,25 @@
"local_pref": {
"nullable": true,
"description": "Apply a local preference to routes received from this peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"md5_auth_key": {
"nullable": true,
"description": "Use the given key for TCP-MD5 authentication with the peer.",
"default": null,
"type": "string"
},
"min_ttl": {
"nullable": true,
"description": "Require messages from a peer have a minimum IP time to live field.",
"default": null,
"type": "integer",
"format": "uint8",
"minimum": 0
},
"multi_exit_discriminator": {
"nullable": true,
"description": "Apply the provided multi-exit discriminator (MED) updates sent to the peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
Expand All @@ -473,15 +467,13 @@
"remote_asn": {
"nullable": true,
"description": "Require that a peer has a specified ASN.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"vlan_id": {
"nullable": true,
"description": "Associate a VLAN ID with a BGP peer session.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -1216,7 +1208,6 @@
"vlan_id": {
"nullable": true,
"description": "The VLAN id associated with this route.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -1268,4 +1259,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion openapi/dns-server.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion openapi/gateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3285,4 +3285,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion openapi/installinator-artifactd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2325,4 +2325,4 @@
}
}
}
}
}
11 changes: 1 addition & 10 deletions openapi/nexus-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1567,7 +1567,6 @@
"checker": {
"nullable": true,
"description": "Checker to apply to incoming messages.",
"default": null,
"type": "string"
},
"originate": {
Expand All @@ -1580,7 +1579,6 @@
"shaper": {
"nullable": true,
"description": "Shaper to apply to outgoing messages.",
"default": null,
"type": "string"
}
},
Expand Down Expand Up @@ -1678,29 +1676,25 @@
"local_pref": {
"nullable": true,
"description": "Apply a local preference to routes received from this peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"md5_auth_key": {
"nullable": true,
"description": "Use the given key for TCP-MD5 authentication with the peer.",
"default": null,
"type": "string"
},
"min_ttl": {
"nullable": true,
"description": "Require messages from a peer have a minimum IP time to live field.",
"default": null,
"type": "integer",
"format": "uint8",
"minimum": 0
},
"multi_exit_discriminator": {
"nullable": true,
"description": "Apply the provided multi-exit discriminator (MED) updates sent to the peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
Expand All @@ -1712,15 +1706,13 @@
"remote_asn": {
"nullable": true,
"description": "Require that a peer has a specified ASN.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"vlan_id": {
"nullable": true,
"description": "Associate a VLAN ID with a BGP peer session.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -4267,7 +4259,6 @@
"vlan_id": {
"nullable": true,
"description": "The VLAN id associated with this route.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -5021,4 +5012,4 @@
}
}
}
}
}
3 changes: 1 addition & 2 deletions openapi/nexus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15970,7 +15970,6 @@
"signing_keypair": {
"nullable": true,
"description": "request signing key pair",
"default": null,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

notable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unsure! Let me see if I can find out why this changed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First guess would be the schemars update.

Copy link
Contributor Author

@iliana iliana May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it seems to have been the one PR in 0.8.18, which caused other breakage: oxidecomputer/dropshot#995

I don't know whether removing "default": null is problematic on its own.

Copy link
Contributor Author

@iliana iliana May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Progenitor-generated oxide-client (that we have in this repo to use for end-to-end tests) doesn't have any differences from main to this branch (per cargo expand).

The generated API in the console does have this difference:

diff --git a/app/api/__generated__/validate.ts b/app/api/__generated__/validate.ts
index fcb58fb1..07fe33d0 100644
--- a/app/api/__generated__/validate.ts
+++ b/app/api/__generated__/validate.ts
@@ -2327,7 +2327,7 @@ export const SamlIdentityProviderCreate = z.preprocess(
     idpEntityId: z.string(),
     idpMetadataSource: IdpMetadataSource,
     name: Name,
-    signingKeypair: DerEncodedKeyPair.default(null).optional(),
+    signingKeypair: DerEncodedKeyPair.optional(),
     sloUrl: z.string(),
     spClientId: z.string(),
     technicalContactEmail: z.string(),

which seems to not introduce any typechecking issues.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You would think the default value of a nullable would be null by default anyway! Thanks for checking the TS. That particular bit isn’t load-bearing anyway — we currently only use the generated validators in the mock server so we can 400 on bad request bodies.

"allOf": [
{
"$ref": "#/components/schemas/DerEncodedKeyPair"
Expand Down Expand Up @@ -19356,4 +19355,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion openapi/oximeter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,4 @@
}
}
}
}
}
11 changes: 1 addition & 10 deletions openapi/sled-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,6 @@
"checker": {
"nullable": true,
"description": "Checker to apply to incoming messages.",
"default": null,
"type": "string"
},
"originate": {
Expand All @@ -1478,7 +1477,6 @@
"shaper": {
"nullable": true,
"description": "Shaper to apply to outgoing messages.",
"default": null,
"type": "string"
}
},
Expand Down Expand Up @@ -1576,29 +1574,25 @@
"local_pref": {
"nullable": true,
"description": "Apply a local preference to routes received from this peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"md5_auth_key": {
"nullable": true,
"description": "Use the given key for TCP-MD5 authentication with the peer.",
"default": null,
"type": "string"
},
"min_ttl": {
"nullable": true,
"description": "Require messages from a peer have a minimum IP time to live field.",
"default": null,
"type": "integer",
"format": "uint8",
"minimum": 0
},
"multi_exit_discriminator": {
"nullable": true,
"description": "Apply the provided multi-exit discriminator (MED) updates sent to the peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
Expand All @@ -1610,15 +1604,13 @@
"remote_asn": {
"nullable": true,
"description": "Require that a peer has a specified ASN.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"vlan_id": {
"nullable": true,
"description": "Associate a VLAN ID with a BGP peer session.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -4279,7 +4271,6 @@
"vlan_id": {
"nullable": true,
"description": "The VLAN id associated with this route.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -5008,4 +4999,4 @@
}
}
}
}
}
13 changes: 1 addition & 12 deletions openapi/wicketd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,6 @@
"checker": {
"nullable": true,
"description": "Checker to apply to incoming messages.",
"default": null,
"type": "string"
},
"originate": {
Expand All @@ -1062,7 +1061,6 @@
"shaper": {
"nullable": true,
"description": "Shaper to apply to outgoing messages.",
"default": null,
"type": "string"
}
},
Expand Down Expand Up @@ -2751,7 +2749,6 @@
"vlan_id": {
"nullable": true,
"description": "The VLAN id associated with this route.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -4908,7 +4905,6 @@
},
"allowed_export": {
"description": "Apply export policy to this peer with an allow list.",
"default": null,
"allOf": [
{
"$ref": "#/components/schemas/UserSpecifiedImportExportPolicy"
Expand All @@ -4917,7 +4913,6 @@
},
"allowed_import": {
"description": "Apply import policy to this peer with an allow list.",
"default": null,
"allOf": [
{
"$ref": "#/components/schemas/UserSpecifiedImportExportPolicy"
Expand All @@ -4933,7 +4928,6 @@
"auth_key_id": {
"nullable": true,
"description": "The key identifier for authentication to use with the peer.",
"default": null,
"allOf": [
{
"$ref": "#/components/schemas/BgpAuthKeyId"
Expand Down Expand Up @@ -4993,23 +4987,20 @@
"local_pref": {
"nullable": true,
"description": "Apply a local preference to routes received from this peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"min_ttl": {
"nullable": true,
"description": "Require messages from a peer have a minimum IP time to live field.",
"default": null,
"type": "integer",
"format": "uint8",
"minimum": 0
},
"multi_exit_discriminator": {
"nullable": true,
"description": "Apply the provided multi-exit discriminator (MED) updates sent to the peer.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
Expand All @@ -5021,15 +5012,13 @@
"remote_asn": {
"nullable": true,
"description": "Require that a peer has a specified ASN.",
"default": null,
"type": "integer",
"format": "uint32",
"minimum": 0
},
"vlan_id": {
"nullable": true,
"description": "Associate a VLAN ID with a BGP peer session.",
"default": null,
"type": "integer",
"format": "uint16",
"minimum": 0
Expand Down Expand Up @@ -5154,4 +5143,4 @@
}
}
}
}
}
Loading
Loading