Merge pull request #5104 from systeminit/nick/f8d3367

Migrate all remaining IDs to si-id
systeminit · Dec 11, 2024 · 1f1c136 · 1f1c136
2 parents 14d25e6 + 1059c5f
commit 1f1c136
Show file tree

Hide file tree

Showing 23 changed files with 245 additions and 462 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/dal/src/workspace_snapshot/vector_clock.rs b/lib/dal/src/workspace_snapshot/vector_clock.rs
@@ -54,8 +54,7 @@ impl VectorClock {
         &self,
         change_set_id_filter: Option<ChangeSetId>,
     ) -> Option<(VectorClockId, LamportClock)> {
-        let maybe_change_set_id = change_set_id_filter
-            .map(|change_set_id| VectorClockChangeSetId::new(change_set_id.into_inner().into()));
+        let maybe_change_set_id = change_set_id_filter.map(VectorClockChangeSetId::from);
         self.entries
             .iter()
             .filter(|(clock_id, _)| {

diff --git a/lib/module-index-server/BUCK b/lib/module-index-server/BUCK
@@ -8,6 +8,7 @@ rust_library(
         "//lib/module-index-types:module-index-types",
         "//lib/si-data-pg:si-data-pg",
         "//lib/si-hash:si-hash",
+        "//lib/si-id:si-id",
         "//lib/si-jwt-public-key:si-jwt-public-key",
         "//lib/si-pkg:si-pkg",
         "//lib/si-posthog-rs:si-posthog",

diff --git a/lib/module-index-server/Cargo.toml b/lib/module-index-server/Cargo.toml
@@ -14,6 +14,7 @@ buck2-resources = { path = "../../lib/buck2-resources" }
 module-index-types = { path = "../../lib/module-index-types" }
 si-data-pg = { path = "../../lib/si-data-pg" }
 si-hash = { path = "../../lib/si-hash" }
+si-id = { path = "../../lib/si-id" }
 si-jwt-public-key = { path = "../../lib/si-jwt-public-key" }
 si-pkg = { path = "../../lib/si-pkg" }
 si-posthog = { path = "../../lib/si-posthog-rs" }

diff --git a/lib/module-index-server/src/models/si_module.rs b/lib/module-index-server/src/models/si_module.rs
@@ -3,13 +3,9 @@ use sea_orm::{entity::prelude::*, sea_query, TryGetError};
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
-pub mod module_id;
-pub mod schema_id;
-pub mod schema_variant_id;
-
-pub use module_id::ModuleId;
-pub use schema_id::SchemaId;
-pub use schema_variant_id::SchemaVariantId;
+pub use si_id::ModuleIndexModuleId as ModuleId;
+pub use si_id::SchemaId;
+pub use si_id::SchemaVariantId;
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

diff --git a/lib/module-index-server/src/models/si_module/module_id.rs b/lib/module-index-server/src/models/si_module/module_id.rs
diff --git a/lib/module-index-server/src/models/si_module/schema_id.rs b/lib/module-index-server/src/models/si_module/schema_id.rs
diff --git a/lib/module-index-server/src/models/si_module/schema_variant_id.rs b/lib/module-index-server/src/models/si_module/schema_variant_id.rs
diff --git a/lib/module-index-server/src/routes/upsert_module_route.rs b/lib/module-index-server/src/routes/upsert_module_route.rs
@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 use axum::{
     extract::{multipart::MultipartError, Multipart},
     response::{IntoResponse, Response},
@@ -18,7 +20,6 @@ use serde::{Deserialize, Serialize};
 use si_pkg::{SiPkg, SiPkgError, SiPkgKind};
 use telemetry::prelude::*;
 use thiserror::Error;
-use ulid::Ulid;
 
 use crate::{
     extract::{Authorization, DbConnection, ExtractedS3Bucket},
@@ -121,11 +122,11 @@ pub async fn upsert_module_route(
         SiPkgKind::Module => ModuleKind::Module,
     };
 
-    let new_schema_id = Some(SchemaId(Ulid::new()));
+    let new_schema_id = Some(SchemaId::new());
     let schema_id = match module_kind {
         ModuleKind::WorkspaceBackup => None,
         ModuleKind::Module => match module_schema_id {
-            Some(schema_id_string) => Some(SchemaId(Ulid::from_string(&schema_id_string)?)),
+            Some(schema_id_string) => Some(SchemaId::from_str(&schema_id_string)?),
             None => match module_based_on_hash {
                 None => new_schema_id,
                 Some(based_on_hash) => {
@@ -156,7 +157,7 @@ pub async fn upsert_module_route(
     };
 
     if let Some(schema_id) = schema_id {
-        info!("module gets schema id: {}", schema_id.0);
+        info!("module gets schema id: {}", schema_id.as_raw_id());
     }
 
     let schemas: Vec<String> = loaded_module
@@ -177,9 +178,9 @@ pub async fn upsert_module_route(
     let schema_variant_id = match module_kind {
         ModuleKind::WorkspaceBackup => None,
         ModuleKind::Module => match module_schema_variant_id {
-            Some(schema_variant_id_string) => Some(SchemaVariantId(Ulid::from_string(
-                &schema_variant_id_string,
-            )?)),
+            Some(schema_variant_id_string) => {
+                Some(SchemaVariantId::from_str(&schema_variant_id_string)?)
+            }
             _ => None,
         },
     };

diff --git a/lib/si-events-rs/BUCK b/lib/si-events-rs/BUCK
@@ -21,7 +21,6 @@ rust_library(
         "//third-party/rust:serde_json",
         "//third-party/rust:strum",
         "//third-party/rust:thiserror",
-        "//third-party/rust:ulid",
         "//third-party/rust:xxhash-rust",
     ],
     srcs = glob([

diff --git a/lib/si-events-rs/Cargo.toml b/lib/si-events-rs/Cargo.toml
@@ -23,5 +23,4 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 strum = { workspace = true }
 thiserror = { workspace = true }
-ulid = { workspace = true }
 xxhash-rust = { workspace = true }