update to uuid v1.0.0 (part 1 of 2) (#1091)

oxidecomputer · May 20, 2022 · b20ed23 · b20ed23
1 parent ae0c3dc
commit b20ed23
Show file tree

Hide file tree

Showing 21 changed files with 77 additions and 71 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -18,7 +18,7 @@ macaddr = { version = "1.0.1", features = [ "serde_std" ] }
 rand = "0.8.4"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
 ring = "0.16"
-schemars = { version = "0.8", features = [ "chrono", "uuid" ] }
+schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] }
 serde = { version = "1.0", features = [ "derive" ] }
 serde_derive = "1.0"
 serde_json = "1.0"
@@ -29,8 +29,8 @@ steno = { git = "https://github.com/oxidecomputer/steno", branch = "main" }
 structopt = "0.3"
 thiserror = "1.0"
 tokio = { version = "1.18", features = [ "full" ] }
-tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-0_8" ] }
-uuid = { version = "0.8", features = [ "serde", "v4" ] }
+tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
+uuid = { version = "1.0.0", features = [ "serde", "v4" ] }
 parse-display = "0.5.4"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
 

diff --git a/gateway-client/Cargo.toml b/gateway-client/Cargo.toml
@@ -26,5 +26,5 @@ version = "2.5"
 features = [ "max_level_trace", "release_max_level_debug" ]
 
 [dependencies.uuid]
-version = "0.8"
+version = "1.0.0"
 features = [ "serde", "v4" ]
diff --git a/gateway-sp-comms/Cargo.toml b/gateway-sp-comms/Cargo.toml
@@ -15,7 +15,7 @@ thiserror = "1.0.31"
 tokio-tungstenite = "0.17"
 tokio-stream = "0.1.8"
 usdt = "0.3.1"
-uuid = "0.8"
+uuid = "1.0.0"
 
 gateway-messages = { path = "../gateway-messages", features = ["std"] }
 omicron-common = { path = "../common" }

diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
@@ -18,7 +18,7 @@ slog-dtrace = "0.2"
 structopt = "0.3"
 thiserror = "1.0.31"
 toml = "0.5.9"
-uuid = "0.8"
+uuid = "1.0.0"
 
 gateway-messages = { path = "../gateway-messages", features = ["std"] }
 gateway-sp-comms = { path = "../gateway-sp-comms" }

diff --git a/internal-dns/Cargo.toml b/internal-dns/Cargo.toml
@@ -10,7 +10,7 @@ clap = { version = "3.1", features = [ "derive" ] }
 internal-dns-client = { path = "../internal-dns-client" }
 dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
 pretty-hex = "0.3.0"
-schemars = "0.8"
+schemars = "0.8.10"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 sled = "0.34"

diff --git a/nexus-client/Cargo.toml b/nexus-client/Cargo.toml
@@ -25,5 +25,5 @@ version = "2.5"
 features = [ "max_level_trace", "release_max_level_debug" ]
 
 [dependencies.uuid]
-version = "0.8"
+version = "1.0.0"
 features = [ "serde", "v4" ]
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
@@ -15,8 +15,9 @@ 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 = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "57f0951793a74b31afd824bc3a0e5d89a41a540b" }
 diesel = { version = "2.0.0-rc.0", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
+diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace" }
 fatfs = "0.3.5"
 futures = "0.3.21"
 headers = "0.3.7"
@@ -60,10 +61,6 @@ path = "../api_identity"
 version = "0.4"
 features = [ "serde" ]
 
-[dependencies.diesel-dtrace]
-git = "https://github.com/oxidecomputer/diesel-dtrace"
-rev = "bec89c2f2b01a79ae99b4db667bfcea5fb2fef04"
-
 [dependencies.dropshot]
 git = "https://github.com/oxidecomputer/dropshot"
 branch = "main"
@@ -89,8 +86,8 @@ version = "0.1.0"
 path = "../oximeter/producer"
 
 [dependencies.schemars]
-version = "0.8"
-features = [ "chrono", "uuid" ]
+version = "0.8.10"
+features = [ "chrono", "uuid1" ]
 
 [dependencies.serde]
 version = "1.0"
@@ -110,10 +107,10 @@ features = [ "full" ]
 
 [dependencies.tokio-postgres]
 version = "0.7"
-features = [ "with-chrono-0_4", "with-serde_json-1", "with-uuid-0_8" ]
+features = [ "with-chrono-0_4", "with-serde_json-1", "with-uuid-1" ]
 
 [dependencies.uuid]
-version = "0.8"
+version = "1.0.0"
 features = [ "serde", "v4" ]
 
 [dev-dependencies]

diff --git a/nexus/src/db/fixed_data/mod.rs b/nexus/src/db/fixed_data/mod.rs
@@ -52,7 +52,7 @@ fn assert_valid_uuid(id: &uuid::Uuid) {
     };
 
     match id.get_variant() {
-        Some(uuid::Variant::RFC4122) => (),
+        uuid::Variant::RFC4122 => (),
         _ => panic!("unexpected variant in uuid: {:?}", id),
     };
 }

diff --git a/nexus/test-utils/Cargo.toml b/nexus/test-utils/Cargo.toml
@@ -24,7 +24,7 @@ parse-display = "0.5.4"
 serde = { version = "1.0",  features = [ "derive" ] }
 serde_json = "1.0"
 slog = { version = "2.7",  features = [ "max_level_trace", "release_max_level_debug" ] }
-uuid = { version = "0.8", features = [ "serde", "v4" ] }
+uuid = { version = "1.0.0", features = [ "serde", "v4" ] }
 
 [build-dependencies]
 dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }

diff --git a/openapi/nexus.json b/openapi/nexus.json
@@ -6136,6 +6136,7 @@
           },
           "disks": {
             "description": "The disks to be created or attached for this instance.",
+            "default": [],
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/InstanceDiskAttachment"
@@ -6155,6 +6156,9 @@
           },
           "network_interfaces": {
             "description": "The network interfaces to be created for this instance.",
+            "default": {
+              "type": "default"
+            },
             "allOf": [
               {
                 "$ref": "#/components/schemas/InstanceNetworkInterfaceAttachment"
@@ -6163,6 +6167,7 @@
           },
           "user_data": {
             "description": "User data for instance initialization systems (such as cloud-init). Must be a Base64-encoded string, as specified in RFC 4648 § 4 (+ and / characters with padding). Maximum 32 KiB unencoded data.",
+            "default": "",
             "type": "string"
           }
         },