From 04a6e59a23e1565837504607e1d5a8885bc793e8 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Mon, 16 May 2022 10:50:04 -0700 Subject: [PATCH] update propolis and crucible deps --- Cargo.lock | 20 ++++++++++---------- nexus/Cargo.toml | 2 +- openapi/sled-agent.json | 30 +++++++++++++++++++++++++++--- package-manifest.toml | 6 +++--- sled-agent/Cargo.toml | 4 ++-- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b208112d0d5..1211c8eb65a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -739,7 +739,7 @@ dependencies = [ [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ea317a9dfee65d7c018a1fda89fdec63a560ef3#8ea317a9dfee65d7c018a1fda89fdec63a560ef3" dependencies = [ "aes-gcm-siv", "anyhow", @@ -772,7 +772,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ea317a9dfee65d7c018a1fda89fdec63a560ef3#8ea317a9dfee65d7c018a1fda89fdec63a560ef3" dependencies = [ "anyhow", "chrono", @@ -787,7 +787,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ea317a9dfee65d7c018a1fda89fdec63a560ef3#8ea317a9dfee65d7c018a1fda89fdec63a560ef3" dependencies = [ "anyhow", "rusqlite", @@ -805,7 +805,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ea317a9dfee65d7c018a1fda89fdec63a560ef3#8ea317a9dfee65d7c018a1fda89fdec63a560ef3" dependencies = [ "anyhow", "bincode", @@ -819,7 +819,7 @@ dependencies = [ [[package]] name = "crucible-scope" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ea317a9dfee65d7c018a1fda89fdec63a560ef3#8ea317a9dfee65d7c018a1fda89fdec63a560ef3" dependencies = [ "anyhow", "futures", @@ -3731,7 +3731,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=ec4f3a41a638ea6c3316a86f30f1895f4877f2ef#ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" +source = "git+https://github.com/oxidecomputer/propolis?rev=845c9cffc482739d417761aa1c668895f24b776d#845c9cffc482739d417761aa1c668895f24b776d" dependencies = [ "crucible", "reqwest", @@ -5537,12 +5537,12 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", + "cfg-if 0.1.10", + "rand 0.4.6", "static_assertions", ] diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 867ec5eea84..341adeba390 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -15,7 +15,7 @@ authz-macros = { path = "src/authz/authz-macros" } base64 = "0.13.0" bb8 = "0.8.0" cookie = "0.16" -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3" } diesel = { version = "2.0.0-rc.0", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] } fatfs = "0.3.5" futures = "0.3.21" diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json index 760183232d0..63df6a88831 100644 --- a/openapi/sled-agent.json +++ b/openapi/sled-agent.json @@ -1060,7 +1060,7 @@ "type": { "type": "string", "enum": [ - "Volume" + "volume" ] } }, @@ -1081,7 +1081,7 @@ "type": { "type": "string", "enum": [ - "Url" + "url" ] }, "url": { @@ -1113,7 +1113,7 @@ "type": { "type": "string", "enum": [ - "Region" + "region" ] } }, @@ -1123,6 +1123,30 @@ "opts", "type" ] + }, + { + "type": "object", + "properties": { + "block_size": { + "type": "integer", + "format": "uint64", + "minimum": 0 + }, + "path": { + "type": "string" + }, + "type": { + "type": "string", + "enum": [ + "file" + ] + } + }, + "required": [ + "block_size", + "path", + "type" + ] } ] } diff --git a/package-manifest.toml b/package-manifest.toml index 29a772423cc..6fa15e5c600 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -84,7 +84,7 @@ zone = true # 3. Use type = "manual" instead of the "prebuilt" type = "prebuilt" repo = "crucible" -commit = "d412b2be7ef8c0658bf5603f7fd746f6972e4666" +commit = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt sha256 = "f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb" @@ -98,7 +98,7 @@ zone = true [external_package.propolis-server.source] type = "prebuilt" repo = "propolis" -commit = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" +commit = "845c9cffc482739d417761aa1c668895f24b776d" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -sha256 = "fd3ac7cfa6659033051bb29ecc297240c519c5db339045f17ecccf594a266811" +sha256 = "80ba693906972d6525767596c95c0c5bafc1c6ff0c9d8cf9b9df437bfefb0bd6" diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 53ef4a60622..986f9488853 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1.1" cfg-if = "1.0" chrono = { version = "0.4", features = [ "serde" ] } # Only used by the simulated sled agent. -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3" } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } futures = "0.3.21" ipnetwork = "0.18" @@ -24,7 +24,7 @@ omicron-common = { path = "../common" } p256 = "0.9.0" percent-encoding = "2.1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "845c9cffc482739d417761aa1c668895f24b776d" } rand = { version = "0.8.5", features = ["getrandom"] } reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] } schemars = { version = "0.8", features = [ "chrono", "uuid" ] }