systeminit · nickgerace · May 14, 2025 · May 5, 2025 · nickgerace · May 14, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/dal-test/src/expand_helpers.rs b/lib/dal-test/src/expand_helpers.rs
@@ -9,14 +9,14 @@ use dal::{
     ChangeSet,
     ChangeSetId,
     DalContext,
-    Tenancy,
     WorkspacePk,
 };
 use jwt_simple::{
     algorithms::RSAKeyPairLike,
     claims::Claims,
     prelude::Duration,
 };
+use si_db::Tenancy;
 use si_jwt_public_key::SiJwtClaims;
 use tracing_subscriber::{
     EnvFilter,
@@ -45,7 +45,7 @@ pub async fn setup_history_actor_ctx(ctx: &mut DalContext) {
     )
     .await
     .expect("unable to associate user with workspace");
-    ctx.update_history_actor(dal::HistoryActor::User(user.pk()));
+    ctx.update_history_actor(si_db::HistoryActor::User(user.pk()));
 }
 
 /// This function is used during macro expansion for setting up a [`ChangeSet`] in an integration test.

diff --git a/lib/dal-test/src/helpers.rs b/lib/dal-test/src/helpers.rs
@@ -22,7 +22,6 @@ use dal::{
     Schema,
     SchemaVariant,
     SchemaVariantId,
-    User,
     UserPk,
     attribute::{
         path::AttributePath,
@@ -43,6 +42,7 @@ use names::{
     Name,
 };
 use si_data_nats::async_nats::jetstream::stream::Stream;
+use si_db::User;
 use tokio::time::Instant;
 
 mod change_set;

diff --git a/lib/dal-test/src/signup.rs b/lib/dal-test/src/signup.rs
@@ -5,11 +5,7 @@
 use dal::{
     ChangeSet,
     DalContext,
-    HistoryActor,
-    HistoryEvent,
     KeyPair,
-    Tenancy,
-    User,
     UserPk,
     Workspace,
     WorkspacePk,
@@ -24,6 +20,12 @@ use serde::{
     Deserialize,
     Serialize,
 };
+use si_db::{
+    HistoryActor,
+    HistoryEvent,
+    Tenancy,
+    User,
+};
 
 /// A wrapper for creating [`Workspaces`](Workspace) for integration tests.
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq)]

diff --git a/lib/dal/BUCK b/lib/dal/BUCK
@@ -104,6 +104,7 @@ rust_test(
         "//lib/dal-test:dal-test",
         "//lib/pending-events:pending-events",
         "//lib/rebaser-server:rebaser-server",
+        "//lib/si-db:si-db",
         "//lib/si-events-rs:si-events",
         "//lib/si-id:si-id",
         "//lib/si-frontend-mv-types-rs:si-frontend-mv-types",

diff --git a/lib/dal/src/audit_logging.rs b/lib/dal/src/audit_logging.rs
@@ -34,7 +34,6 @@ use crate::{
     ChangeSetError,
     ChangeSetStatus,
     DalContext,
-    TenancyError,
     TransactionsError,
     WsEvent,
     WsEventResult,
@@ -54,6 +53,8 @@ pub enum AuditLoggingError {
     PendingEventsError(#[from] PendingEventsError),
     #[error("shuttle error: {0}")]
     Shuttle(#[from] ShuttleError),
+    #[error("si db error: {0}")]
+    SiDb(#[from] si_db::Error),
     #[error("transactions error: {0}")]
     Transactions(#[from] Box<TransactionsError>),
 }
@@ -80,7 +81,7 @@ pub(crate) async fn publish_pending(
     // TODO(nick): nuke this from intergalactic orbit. Then do it again.
     let workspace_id = match ctx.workspace_pk() {
         Ok(workspace_id) => workspace_id,
-        Err(TransactionsError::Tenancy(TenancyError::NoWorkspace)) => return Ok(()),
+        Err(TransactionsError::SiDb(si_db::Error::NoWorkspace)) => return Ok(()),
         Err(err) => return Err(AuditLoggingError::Transactions(Box::new(err))),
     };
 
@@ -216,7 +217,7 @@ pub(crate) async fn write(
     // TODO(nick): nuke this from intergalactic orbit. Then do it again.
     let workspace_id = match ctx.workspace_pk() {
         Ok(workspace_id) => workspace_id,
-        Err(TransactionsError::Tenancy(TenancyError::NoWorkspace)) => return Ok(()),
+        Err(TransactionsError::SiDb(si_db::Error::NoWorkspace)) => return Ok(()),
         Err(err) => return Err(AuditLoggingError::Transactions(Box::new(err))),
     };
 
@@ -247,7 +248,7 @@ pub(crate) async fn write_final_message(ctx: &DalContext) -> Result<()> {
     // TODO(nick): nuke this from intergalactic orbit. Then do it again.
     let workspace_id = match ctx.workspace_pk() {
         Ok(workspace_id) => workspace_id,
-        Err(TransactionsError::Tenancy(TenancyError::NoWorkspace)) => return Ok(()),
+        Err(TransactionsError::SiDb(si_db::Error::NoWorkspace)) => return Ok(()),
         Err(err) => return Err(AuditLoggingError::Transactions(Box::new(err))),
    };
 

diff --git a/lib/dal/src/cached_module.rs b/lib/dal/src/cached_module.rs
@@ -26,6 +26,7 @@ use si_data_pg::{
     PgError,
     PgRow,
 };
+use si_db::HistoryActor;
 pub use si_id::CachedModuleId;
 use si_id::UserPk;
 use si_pkg::{
@@ -42,7 +43,6 @@ use ulid::Ulid;
 use crate::{
     ComponentType,
     DalContext,
-    HistoryActor,
     SchemaId,
     TransactionsError,
     slow_rt::{

diff --git a/lib/dal/src/change_set.rs b/lib/dal/src/change_set.rs
@@ -17,7 +17,12 @@ use si_data_pg::{
     PgError,
     PgRow,
 };
-use si_db::change_set::FIND_ANCESTORS_QUERY;
+use si_db::{
+    HistoryActor,
+    HistoryEvent,
+    User,
+    change_set::FIND_ANCESTORS_QUERY,
+};
 use si_events::{
     RebaseBatchAddressKind,
     WorkspaceSnapshotAddress,
@@ -26,7 +31,12 @@ use si_events::{
     ulid::Ulid,
     workspace_snapshot::Checksum,
 };
-use si_id::EntityId;
+use si_id::{
+    ActionId,
+    EntityId,
+    UserPk,
+    WorkspacePk,
+};
 use si_layer_cache::LayerDbError;
 use telemetry::prelude::*;
 use thiserror::Error;
@@ -38,28 +48,18 @@ use crate::{
     DalContext,
     Func,
     FuncError,
-    HistoryActor,
-    HistoryEvent,
-    HistoryEventError,
     Schema,
     SchemaError,
     SchemaVariant,
     SchemaVariantError,
     TransactionsError,
-    User,
-    UserError,
-    UserPk,
     Workspace,
     WorkspaceError,
-    WorkspacePk,
     WorkspaceSnapshot,
     WorkspaceSnapshotError,
     WsEvent,
     WsEventError,
-    action::{
-        ActionError,
-        ActionId,
-    },
+    action::ActionError,
     billing_publish::{
         self,
         BillingPublishError,
@@ -101,8 +101,6 @@ pub enum ChangeSetError {
     EnumParse(#[from] strum::ParseError),
     #[error("func error: {0}")]
     Func(#[from] Box<FuncError>),
-    #[error("history event error: {0}")]
-    HistoryEvent(#[from] HistoryEventError),
     #[error("invalid user actor pk")]
     InvalidActor(UserPk),
     #[error("invalid user system init")]
@@ -133,6 +131,8 @@ pub enum ChangeSetError {
     SchemaVariant(#[from] Box<SchemaVariantError>),
     #[error("serde json error: {0}")]
     SerdeJson(#[from] serde_json::Error),
+    #[error("si db error: {0}")]
+    SiDb(#[from] si_db::Error),
     #[error("slow runtime error: {0}")]
     SlowRuntime(#[from] SlowRuntimeError),
     #[error("transactions error: {0}")]
@@ -143,8 +143,6 @@ pub enum ChangeSetError {
         "found an unexpected number of open change sets matching default change set (should be one, found {0:?})"
     )]
     UnexpectedNumberOfOpenChangeSetsMatchingDefaultChangeSet(Vec<ChangeSetId>),
-    #[error("user error: {0}")]
-    User(#[from] UserError),
     #[error("workspace error: {0}")]
     Workspace(#[from] Box<WorkspaceError>),
     #[error("workspace snapshot error: {0}")]
@@ -186,10 +184,10 @@ pub enum ChangeSetApplyError {
     InvalidUserSystemInit,
     #[error("change set ({0}) does not have a base change set")]
     NoBaseChangeSet(ChangeSetId),
+    #[error("si db error: {0}")]
+    SiDb(#[from] si_db::Error),
     #[error("transactions error: {0}")]
     Transactions(#[from] TransactionsError),
-    #[error("user error: {0}")]
-    User(#[from] UserError),
 }
 
 /// A superset of [`ChangeSetResult`] used when performing apply logic.
@@ -1089,13 +1087,7 @@ impl ChangeSet {
     }
     pub async fn extract_userid_from_context_or_error(ctx: &DalContext) -> ChangeSetResult<UserPk> {
         let user_id = match ctx.history_actor() {
-            HistoryActor::User(user_pk) => {
-                let maybe_user = User::get_by_pk(ctx, *user_pk).await;
-                match maybe_user {
-                    Ok(user) => user.pk(),
-                    Err(err) => return Err(ChangeSetError::User(err)),
-                }
-            }
+            HistoryActor::User(user_pk) => User::get_by_pk(ctx, *user_pk).await?.pk(),
             HistoryActor::SystemInit => return Err(ChangeSetError::InvalidUserSystemInit),
         };
         Ok(user_id)

diff --git a/lib/dal/src/change_set/approval.rs b/lib/dal/src/change_set/approval.rs
@@ -37,6 +37,7 @@ use si_data_pg::{
     PgError,
     PgRow,
 };
+use si_db::HistoryActor;
 pub use si_events::ChangeSetApprovalStatus;
 use si_events::merkle_tree_hash::MerkleTreeHash;
 use si_id::{
@@ -54,7 +55,6 @@ use super::{
 };
 use crate::{
     DalContext,
-    HistoryActor,
     TransactionsError,
     WorkspaceSnapshotError,
 };