Skip to content

Commit d6683fb

Browse files
committed
refactor: move TraceId from state/ to environment/ directory
Move trace_id.rs from src/domain/environment/state/ to src/domain/environment/ to keep the state/ folder clean with only state types. TraceId is a domain value object that provides unique identifiers for error traces, not a state type itself. This change improves code organization by separating value objects from state machine types. Changes: - Move src/domain/environment/state/trace_id.rs to src/domain/environment/trace_id.rs - Update all imports across 12 files to use new path - Update module exports in environment/mod.rs and environment/state/mod.rs
1 parent 422d298 commit d6683fb

File tree

13 files changed

+28
-17
lines changed

13 files changed

+28
-17
lines changed

src/application/commands/configure.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ use tracing::{info, instrument, warn};
55
use crate::application::steps::{InstallDockerComposeStep, InstallDockerStep};
66
use crate::domain::environment::repository::EnvironmentRepository;
77
use crate::domain::environment::state::{
8-
ConfigureErrorKind, ConfigureFailureContext, ConfigureStep, TraceId,
8+
ConfigureErrorKind, ConfigureFailureContext, ConfigureStep,
99
};
1010
use crate::domain::environment::{
11-
ConfigureFailed, Configured, Configuring, Environment, Provisioned,
11+
ConfigureFailed, Configured, Configuring, Environment, Provisioned, TraceId,
1212
};
1313
use crate::infrastructure::external_tools::ansible::adapter::AnsibleClient;
1414
use crate::infrastructure::trace::ConfigureTraceWriter;

src/application/commands/provision.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ use crate::application::steps::{
2525
};
2626
use crate::domain::environment::repository::EnvironmentRepository;
2727
use crate::domain::environment::state::{
28-
ProvisionErrorKind, ProvisionFailureContext, ProvisionStep, TraceId,
28+
ProvisionErrorKind, ProvisionFailureContext, ProvisionStep,
2929
};
30-
use crate::domain::environment::{
30+
use crate::domain::environment::{TraceId,
3131
Created, Environment, ProvisionFailed, Provisioned, Provisioning,
3232
};
3333
#[allow(unused_imports)]

src/domain/environment/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,15 @@
4848
pub mod name;
4949
pub mod repository;
5050
pub mod state;
51+
mod trace_id;
5152

5253
// Test utilities (only available in test configuration)
5354
#[cfg(test)]
5455
pub mod testing;
5556

57+
// Re-export TraceId for use by state module
58+
pub use trace_id::TraceId;
59+
5660
// Re-export commonly used types for convenience
5761
pub use name::{EnvironmentName, EnvironmentNameError};
5862
pub use state::{

src/domain/environment/state/configure_failed.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ impl AnyEnvironmentState {
6565
mod tests {
6666
use super::*;
6767
use crate::domain::environment::state::{
68-
ConfigureErrorKind, ConfigureFailureContext, ConfigureStep, TraceId,
68+
ConfigureErrorKind, ConfigureFailureContext, ConfigureStep,
6969
};
70+
use crate::domain::environment::TraceId;
7071
use chrono::Utc;
7172
use std::time::Duration;
7273

src/domain/environment/state/configuring.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,9 @@ mod tests {
163163
#[test]
164164
fn it_should_transition_from_configuring_to_configure_failed() {
165165
use crate::domain::environment::state::{
166-
ConfigureErrorKind, ConfigureFailureContext, ConfigureStep, TraceId,
166+
ConfigureErrorKind, ConfigureFailureContext, ConfigureStep,
167167
};
168+
use crate::domain::environment::TraceId;
168169
use chrono::Utc;
169170
use std::time::Duration;
170171

src/domain/environment/state/error_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::time::Duration;
99
use chrono::{DateTime, Utc};
1010
use serde::{Deserialize, Serialize};
1111

12-
use super::TraceId;
12+
use crate::domain::environment::TraceId;
1313

1414
// ============================================================================
1515
// Provision Command Error Context

src/domain/environment/state/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ mod released;
5858
mod releasing;
5959
mod run_failed;
6060
mod running;
61-
mod trace_id;
6261

6362
// Re-export state types
6463
pub use configure_failed::ConfigureFailed;
@@ -78,7 +77,6 @@ pub use released::Released;
7877
pub use releasing::Releasing;
7978
pub use run_failed::RunFailed;
8079
pub use running::Running;
81-
pub use trace_id::TraceId;
8280

8381
/// Error type for invalid type conversions when working with type-erased environments
8482
///
@@ -390,6 +388,7 @@ mod tests {
390388

391389
/// Helper to create a test `ProvisionFailureContext` with custom error message
392390
fn create_test_provision_context(error_message: &str) -> ProvisionFailureContext {
391+
use crate::domain::environment::TraceId;
393392
use chrono::Utc;
394393
use std::time::Duration;
395394

@@ -407,6 +406,7 @@ mod tests {
407406

408407
/// Helper to create a test `ConfigureFailureContext` with custom error message
409408
fn create_test_configure_context(error_message: &str) -> ConfigureFailureContext {
409+
use crate::domain::environment::TraceId;
410410
use chrono::Utc;
411411
use std::time::Duration;
412412

src/domain/environment/state/provision_failed.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ impl AnyEnvironmentState {
6565
mod tests {
6666
use super::*;
6767
use crate::domain::environment::state::{
68-
ProvisionErrorKind, ProvisionFailureContext, ProvisionStep, TraceId,
68+
ProvisionErrorKind, ProvisionFailureContext, ProvisionStep,
6969
};
70+
use crate::domain::environment::TraceId;
7071
use chrono::Utc;
7172
use std::time::Duration;
7273

src/domain/environment/state/provisioned.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ mod tests {
9797
}
9898

9999
fn create_test_provision_context() -> ProvisionFailureContext {
100-
use crate::domain::environment::state::{ProvisionErrorKind, ProvisionStep, TraceId};
100+
use crate::domain::environment::state::{ProvisionErrorKind, ProvisionStep};
101+
use crate::domain::environment::TraceId;
101102
use chrono::Utc;
102103
use std::time::Duration;
103104

src/domain/environment/state/provisioning.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,9 @@ mod tests {
174174
#[test]
175175
fn it_should_transition_from_provisioning_to_provision_failed() {
176176
use crate::domain::environment::state::{
177-
ProvisionErrorKind, ProvisionFailureContext, ProvisionStep, TraceId,
177+
ProvisionErrorKind, ProvisionFailureContext, ProvisionStep,
178178
};
179+
use crate::domain::environment::TraceId;
179180
use chrono::Utc;
180181
use std::time::Duration;
181182

0 commit comments

Comments
 (0)