use TypedUuid for session and token IDs

Author: david-crespo

nexus/db-model/src/console_session.rs

@@ -4,14 +4,18 @@
 
 use chrono::{DateTime, Utc};
 use nexus_db_schema::schema::console_session;
+use omicron_uuid_kinds::ConsoleSessionKind;
+use omicron_uuid_kinds::TypedUuid;
 use uuid::Uuid;
 
+use crate::typed_uuid::DbTypedUuid;
+
 // TODO: `struct SessionToken(String)` for session token
 
 #[derive(Queryable, Insertable, Clone, Debug, Selectable)]
 #[diesel(table_name = console_session)]
 pub struct ConsoleSession {
-    pub id: Uuid,
+    pub id: DbTypedUuid<ConsoleSessionKind>,
     pub token: String,
     pub time_created: DateTime<Utc>,
     pub time_last_used: DateTime<Utc>,
@@ -22,7 +26,7 @@ impl ConsoleSession {
     pub fn new(token: String, silo_user_id: Uuid) -> Self {
         let now = Utc::now();
         Self {
-            id: Uuid::new_v4(),
+            id: TypedUuid::new_v4().into(),
             token,
             silo_user_id,
             time_last_used: now,

nexus/db-model/src/device_auth.rs

@@ -11,9 +11,12 @@ use nexus_db_schema::schema::{device_access_token, device_auth_request};
 
 use chrono::{DateTime, Duration, Utc};
 use nexus_types::external_api::views;
+use omicron_uuid_kinds::{AccessTokenKind, TypedUuid};
 use rand::{Rng, RngCore, SeedableRng, distributions::Slice, rngs::StdRng};
 use uuid::Uuid;
 
+use crate::typed_uuid::DbTypedUuid;
+
 /// Default timeout in seconds for client to authenticate for a token request.
 const CLIENT_AUTHENTICATION_TIMEOUT: i64 = 300;
 
@@ -117,7 +120,7 @@ impl DeviceAuthRequest {
 #[derive(Clone, Debug, Insertable, Queryable, Selectable)]
 #[diesel(table_name = device_access_token)]
 pub struct DeviceAccessToken {
-    pub id: Uuid,
+    pub id: DbTypedUuid<AccessTokenKind>,
     pub token: String,
     pub client_id: Uuid,
     pub device_code: String,
@@ -137,7 +140,7 @@ impl DeviceAccessToken {
         let now = Utc::now();
         assert!(time_requested <= now);
         Self {
-            id: Uuid::new_v4(),
+            id: TypedUuid::new_v4().into(),
             token: generate_token(),
             client_id,
             device_code,

nexus/db-queries/src/db/datastore/mod.rs

@@ -482,12 +482,12 @@ mod test {
         ByteCount, Error, IdentityMetadataCreateParams, LookupType, Name,
     };
     use omicron_test_utils::dev;
-    use omicron_uuid_kinds::CollectionUuid;
     use omicron_uuid_kinds::DatasetUuid;
     use omicron_uuid_kinds::GenericUuid;
     use omicron_uuid_kinds::PhysicalDiskUuid;
     use omicron_uuid_kinds::SledUuid;
     use omicron_uuid_kinds::VolumeUuid;
+    use omicron_uuid_kinds::{CollectionUuid, TypedUuid};
     use std::collections::HashMap;
     use std::collections::HashSet;
     use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddrV6};
@@ -575,7 +575,7 @@ mod test {
         let silo_user_id = Uuid::new_v4();
 
         let session = ConsoleSession {
-            id: Uuid::new_v4(),
+            id: TypedUuid::new_v4().into(),
             token: token.clone(),
             time_created: Utc::now() - Duration::minutes(5),
             time_last_used: Utc::now() - Duration::minutes(5),

uuid-kinds/src/lib.rs

@@ -51,10 +51,12 @@ macro_rules! impl_typed_uuid_kind {
 // Please keep this list in alphabetical order.
 
 impl_typed_uuid_kind! {
+    AccessToken => "access_token",
     AffinityGroup => "affinity_group",
     AntiAffinityGroup => "anti_affinity_group",
     Blueprint => "blueprint",
     Collection => "collection",
+    ConsoleSession => "console_session",
     Dataset => "dataset",
     DemoSaga => "demo_saga",
     Downstairs => "downstairs",