Skip to content

Commit a3c24dc

Browse files
authored
[meta] update newtype-uuid, uuid, proptest (#8359)
The proptest update pulled in a new version of rand, so we start migrating to it. It would be nice to move Omicron to rand 0.9 in general, but: - some third-party dependencies (e.g. password-hash) require rand 0.8 - rand 0.9 appears to change how seeding is done, causing generated outputs to be perturbed So we do a more targeted update to rand 0.9.
1 parent 5b05d4a commit a3c24dc

34 files changed

+7454
-7420
lines changed

Cargo.lock

Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,10 +618,12 @@ propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev =
618618
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "e3988414bd68ecf806078fb898120e1194451ee9" }
619619
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "e3988414bd68ecf806078fb898120e1194451ee9" }
620620
# NOTE: see above!
621-
proptest = "1.6.0"
621+
proptest = "1.7.0"
622622
qorb = "0.3.1"
623623
quote = "1.0"
624624
rand = "0.8.5"
625+
# We're still in the middle of migrating to rand 0.9.
626+
rand09 = { package = "rand", version = "0.9.1" }
625627
rand_core = "0.6.4"
626628
rand_distr = "0.4.3"
627629
rand_seeder = "0.3.0"
@@ -738,7 +740,7 @@ update-common = { path = "update-common" }
738740
update-engine = { path = "update-engine" }
739741
url = "2.5.3"
740742
usdt = "0.5.0"
741-
uuid = { version = "1.15.1", features = ["serde", "v4"] }
743+
uuid = { version = "1.17.0", features = ["serde", "v4"] }
742744
uzers = "0.12"
743745
walkdir = "2.5"
744746
whoami = "1.5"
@@ -757,7 +759,7 @@ zone = { version = "0.3.1", default-features = false, features = ["async"] }
757759
# the kinds). However, uses of omicron-uuid-kinds _within omicron_ will have
758760
# std and the other features enabled because they'll refer to it via
759761
# omicron-uuid-kinds.workspace = true.
760-
newtype-uuid = { version = "1.2.2", default-features = false }
762+
newtype-uuid = { version = "1.2.4", default-features = false }
761763
omicron-uuid-kinds = { path = "uuid-kinds", features = ["serde", "schemars08", "uuid-v4"] }
762764

763765
# NOTE: The test profile inherits from the dev profile, so settings under

dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added-external-dns.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
load-example --seed test_expunge_newly_added_external_dns
44

55
blueprint-show 3f00b694-1b16-4aaa-8f78-e6b3a527b434
6-
blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 9995de32-dd52-4eb1-b0eb-141eb84bc739
6+
blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 8429c772-07e8-40a6-acde-2ed47d16cf84
77

88
# Diff DNS to see that the expunged zone is no longer has DNS records.
99
blueprint-diff 3f00b694-1b16-4aaa-8f78-e6b3a527b434 366b0b68-d80e-4bc1-abd3-dc69837847e0
@@ -15,5 +15,5 @@ blueprint-diff 366b0b68-d80e-4bc1-abd3-dc69837847e0 9c998c1d-1a7b-440a-ae0c-40f7
1515

1616
blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2
1717
# expunging the new zone should work, then diff again to see the new zone also have its DNS records removed.
18-
blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone d786ef4a-5acb-4f5d-a732-a00addf986b5
18+
blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone 8c0a1969-15b6-4165-ba6d-a27c24151037
1919
blueprint-diff 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 2ac8c740-444d-42ff-8d66-9812a7e51288

dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added-internal-dns.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ load-example
22

33
blueprint-show dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
44
# Expunge an internal DNS zone
5-
blueprint-edit dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 expunge-zone 5a526763-1d2b-42a5-b2ef-42f58aa8cbfa
5+
blueprint-edit dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 expunge-zone 99e2f30b-3174-40bf-a78a-90da8abba8ca
66
# Diff against the new blueprint; the zone has been expunged so its records should be removed.
77
blueprint-diff dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
88

99
# Mark the internal DNS zone ready for cleanup.
1010
# This approximates sled-agent performing an inventory collection and seeing the DNS zone has gone away.
1111
# This zone's records were removed in the expunge before, so there are no further DNS changes.
12-
blueprint-edit 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 mark-for-cleanup 5a526763-1d2b-42a5-b2ef-42f58aa8cbfa
12+
blueprint-edit 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 mark-for-cleanup 99e2f30b-3174-40bf-a78a-90da8abba8ca
1313
blueprint-diff 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 58d5e830-0884-47d8-a7cd-b2b3751adeb4
1414

1515
# Planning a new blueprint will now replace the expunged zone, with new records for its replacement.

dev-tools/reconfigurator-cli/tests/input/cmds-set-zone-images.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ load-example --nsleds 1 --ndisks-per-sled 3 --seed test_set_zone_images
55
blueprint-show 971eeb12-1830-4fa0-a699-98ea0164505c
66

77
# Set a couple zones' image sources to specific artifacts.
8-
blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
9-
blueprint-edit latest set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 artifact valid-non-semver 7b4281a6bd5946bb96b332c62afe289bef275e58b9ba031085f8827655f434b3
8+
blueprint-edit latest set-zone-image 7cbd5731-4f6a-4d13-9248-2ec7483d3c37 artifact 1.2.3 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
9+
blueprint-edit latest set-zone-image 87505ee8-022c-45fd-8a38-55ffd685bca6 artifact valid-non-semver 7b4281a6bd5946bb96b332c62afe289bef275e58b9ba031085f8827655f434b3
1010

1111
blueprint-show f714e6ea-e85a-4d7d-93c2-a018744fe176
1212
blueprint-diff 971eeb12-1830-4fa0-a699-98ea0164505c f714e6ea-e85a-4d7d-93c2-a018744fe176
1313

1414
# Set these zones' image sources back to the install dataset.
15-
blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
16-
blueprint-edit latest set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 install-dataset
15+
blueprint-edit latest set-zone-image 7cbd5731-4f6a-4d13-9248-2ec7483d3c37 install-dataset
16+
blueprint-edit latest set-zone-image 87505ee8-022c-45fd-8a38-55ffd685bca6 install-dataset
1717
blueprint-show d9c572a1-a68c-4945-b1ec-5389bd588fe9
1818
blueprint-diff f714e6ea-e85a-4d7d-93c2-a018744fe176 d9c572a1-a68c-4945-b1ec-5389bd588fe9
1919

@@ -24,6 +24,6 @@ blueprint-edit latest set-zone-image help
2424
# test error case: no such zone id
2525
blueprint-edit latest set-zone-image 126f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
2626
# test error case: invalid version identifier
27-
blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 🫡 5d835e8666bd5cf65be66efbca6847b24e41fd85993448a211ad7be5fea559ab
27+
blueprint-edit latest set-zone-image 7cbd5731-4f6a-4d13-9248-2ec7483d3c37 artifact 🫡 5d835e8666bd5cf65be66efbca6847b24e41fd85993448a211ad7be5fea559ab
2828
# test error case: bad hash
29-
blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 aaaa
29+
blueprint-edit latest set-zone-image 7cbd5731-4f6a-4d13-9248-2ec7483d3c37 artifact 1.2.3 aaaa

0 commit comments

Comments
 (0)