diff --git a/Cargo.lock b/Cargo.lock index 1673e1c43f..c5b506af45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1614,7 +1614,7 @@ dependencies = [ [[package]] name = "ddm-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=1b385990e8648b221fd11f018f2a7ec425461c6c#1b385990e8648b221fd11f018f2a7ec425461c6c" +source = "git+https://github.com/oxidecomputer/maghemite?rev=16360764aba8e0dcdde09746d8f4b11f172c64ec#16360764aba8e0dcdde09746d8f4b11f172c64ec" dependencies = [ "oxnet", "percent-encoding", @@ -3492,7 +3492,7 @@ dependencies = [ [[package]] name = "illumos-sys-hdrs" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=a250d664930c48c5f2745e6c8ba21ebea59ced2b#a250d664930c48c5f2745e6c8ba21ebea59ced2b" +source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" [[package]] name = "illumos-utils" @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "kstat-macro" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=a250d664930c48c5f2745e6c8ba21ebea59ced2b#a250d664930c48c5f2745e6c8ba21ebea59ced2b" +source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" dependencies = [ "quote", "syn 2.0.71", @@ -4323,7 +4323,7 @@ dependencies = [ [[package]] name = "mg-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=1b385990e8648b221fd11f018f2a7ec425461c6c#1b385990e8648b221fd11f018f2a7ec425461c6c" +source = "git+https://github.com/oxidecomputer/maghemite?rev=16360764aba8e0dcdde09746d8f4b11f172c64ec#16360764aba8e0dcdde09746d8f4b11f172c64ec" dependencies = [ "anyhow", "chrono", @@ -6213,7 +6213,7 @@ dependencies = [ [[package]] name = "opte" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=a250d664930c48c5f2745e6c8ba21ebea59ced2b#a250d664930c48c5f2745e6c8ba21ebea59ced2b" +source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" dependencies = [ "cfg-if", "dyn-clone", @@ -6230,7 +6230,7 @@ dependencies = [ [[package]] name = "opte-api" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=a250d664930c48c5f2745e6c8ba21ebea59ced2b#a250d664930c48c5f2745e6c8ba21ebea59ced2b" +source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" dependencies = [ "illumos-sys-hdrs", "ipnetwork", @@ -6242,7 +6242,7 @@ dependencies = [ [[package]] name = "opte-ioctl" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=a250d664930c48c5f2745e6c8ba21ebea59ced2b#a250d664930c48c5f2745e6c8ba21ebea59ced2b" +source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" dependencies = [ "libc", "libnet 0.1.0 (git+https://github.com/oxidecomputer/netadm-sys)", @@ -6316,7 +6316,7 @@ dependencies = [ [[package]] name = "oxide-vpc" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=a250d664930c48c5f2745e6c8ba21ebea59ced2b#a250d664930c48c5f2745e6c8ba21ebea59ced2b" +source = "git+https://github.com/oxidecomputer/opte?rev=3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d#3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" dependencies = [ "cfg-if", "illumos-sys-hdrs", diff --git a/Cargo.toml b/Cargo.toml index 2619be7ddc..335a159982 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -343,8 +343,8 @@ macaddr = { version = "1.0.1", features = ["serde_std"] } maplit = "1.0.2" mockall = "0.12" newtype_derive = "0.1.6" -mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "1b385990e8648b221fd11f018f2a7ec425461c6c" } -ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "1b385990e8648b221fd11f018f2a7ec425461c6c" } +mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "16360764aba8e0dcdde09746d8f4b11f172c64ec" } +ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "16360764aba8e0dcdde09746d8f4b11f172c64ec" } multimap = "0.10.0" nexus-auth = { path = "nexus/auth" } nexus-client = { path = "clients/nexus-client" } @@ -384,14 +384,14 @@ omicron-sled-agent = { path = "sled-agent" } omicron-test-utils = { path = "test-utils" } omicron-zone-package = "0.11.0" oxide-client = { path = "clients/oxide-client" } -oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "a250d664930c48c5f2745e6c8ba21ebea59ced2b", features = [ "api", "std" ] } +oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d", features = [ "api", "std" ] } once_cell = "1.19.0" openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" } openapiv3 = "2.0.0" # must match samael's crate! openssl = "0.10" openssl-sys = "0.9" -opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "a250d664930c48c5f2745e6c8ba21ebea59ced2b" } +opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d" } oso = "0.27" owo-colors = "4.0.0" oximeter = { path = "oximeter/oximeter" } diff --git a/package-manifest.toml b/package-manifest.toml index e82ed3f5de..8fe4ba0ceb 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -563,10 +563,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "1b385990e8648b221fd11f018f2a7ec425461c6c" +source.commit = "16360764aba8e0dcdde09746d8f4b11f172c64ec" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm-gz.sha256.txt -source.sha256 = "280bd6e5c30d8f1076bac9b8dbbdbc45379e76259aa6319da257192fcbf64a54" +source.sha256 = "58c8fcec6b932f7e602ac82cc28460aa557cabae1b66947ab3cb7334b87c35d4" output.type = "tarball" [package.mg-ddm] @@ -579,10 +579,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "1b385990e8648b221fd11f018f2a7ec425461c6c" +source.commit = "16360764aba8e0dcdde09746d8f4b11f172c64ec" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "f15f8bb0e13b1a9372c895775dae96b68ff1cc5e395e6bad4389c2a97957354e" +source.sha256 = "69fa43393a77f19713c7d76a320064e3eb58b3ea0b2953d2079a5c3edebc172e" output.type = "zone" output.intermediate_only = true @@ -594,10 +594,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "1b385990e8648b221fd11f018f2a7ec425461c6c" +source.commit = "16360764aba8e0dcdde09746d8f4b11f172c64ec" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mgd.sha256.txt -source.sha256 = "d4f2aaca20b312b6716206c335165442d6625b929eb00f0fd23f551e38216ace" +source.sha256 = "f1103de5dda4830eb653f4d555995d08c31253116448387399a77392c08dfb54" output.type = "zone" output.intermediate_only = true diff --git a/tools/maghemite_ddm_openapi_version b/tools/maghemite_ddm_openapi_version index f5848af24f..bd7971265c 100644 --- a/tools/maghemite_ddm_openapi_version +++ b/tools/maghemite_ddm_openapi_version @@ -1,2 +1,2 @@ -COMMIT="1b385990e8648b221fd11f018f2a7ec425461c6c" +COMMIT="16360764aba8e0dcdde09746d8f4b11f172c64ec" SHA2="007bfb717ccbc077c0250dee3121aeb0c5bb0d1c16795429a514fa4f8635a5ef" diff --git a/tools/maghemite_mg_openapi_version b/tools/maghemite_mg_openapi_version index a5f027ec9f..e67626d8a6 100644 --- a/tools/maghemite_mg_openapi_version +++ b/tools/maghemite_mg_openapi_version @@ -1,2 +1,2 @@ -COMMIT="1b385990e8648b221fd11f018f2a7ec425461c6c" +COMMIT="16360764aba8e0dcdde09746d8f4b11f172c64ec" SHA2="e4b42ab9daad90f0c561a830b62a9d17e294b4d0da0a6d44b4030929b0c37b7e" diff --git a/tools/maghemite_mgd_checksums b/tools/maghemite_mgd_checksums index 9c4f94c6cd..5479623d30 100644 --- a/tools/maghemite_mgd_checksums +++ b/tools/maghemite_mgd_checksums @@ -1,2 +1,2 @@ -CIDL_SHA256="d4f2aaca20b312b6716206c335165442d6625b929eb00f0fd23f551e38216ace" -MGD_LINUX_SHA256="2a9484345e6cba6587f71c1ee75048e2ee45a18a6628a7d88ccb9b9fb7b07faf" \ No newline at end of file +CIDL_SHA256="f1103de5dda4830eb653f4d555995d08c31253116448387399a77392c08dfb54" +MGD_LINUX_SHA256="b4469b8ec3b2193f3eff2886fe1c7ac17dc135b8d7572e1a6c765811738402bd" \ No newline at end of file diff --git a/tools/opte_version b/tools/opte_version index 6221f3dd5b..dfbb589f24 100644 --- a/tools/opte_version +++ b/tools/opte_version @@ -1 +1 @@ -0.33.272 +0.33.277