Separate runtime internals from public modules

testing-framework/core/src/scenario/definition/model.rs

@@ -7,8 +7,7 @@ use crate::{
     scenario::{
         Application, ClusterControlProfile, ClusterMode, DeploymentPolicy, DynError,
         ExistingCluster, ExternalNodeSource, HttpReadinessRequirement, expectation::Expectation,
-        runtime::orchestration::SourceOrchestrationPlan, sources::ScenarioSources,
-        workload::Workload,
+        runtime::SourceOrchestrationPlan, sources::ScenarioSources, workload::Workload,
     },
     topology::DynTopologyError,
 };

testing-framework/core/src/scenario/definition/validation.rs

@@ -6,10 +6,7 @@ use super::model::ScenarioBuildError;
 use crate::scenario::{
     Application, ClusterControlProfile, ClusterMode, DynError, RequiresNodeControl,
     expectation::Expectation,
-    runtime::{
-        context::RunMetrics,
-        orchestration::{SourceOrchestrationPlan, SourceOrchestrationPlanError},
-    },
+    runtime::{SourceOrchestrationPlan, SourceOrchestrationPlanError, context::RunMetrics},
     sources::ScenarioSources,
     workload::Workload,
 };

testing-framework/core/src/scenario/runtime/internal/mod.rs

@@ -0,0 +1,13 @@
+mod orchestration;
+mod providers;
+
+pub use orchestration::{
+    ManagedSource, SourceOrchestrationPlan, SourceOrchestrationPlanError,
+    build_source_orchestration_plan, orchestrate_sources, orchestrate_sources_with_providers,
+    resolve_sources,
+};
+pub use providers::{
+    ApplicationExternalProvider, AttachProvider, AttachProviderError, AttachedNode, ExternalNode,
+    ExternalProviderError, ManagedProviderError, ManagedProvisionedNode, SourceProviders,
+    StaticManagedProvider,
+};

testing-framework/core/src/scenario/runtime/internal/orchestration/source_resolver.rs

@@ -1,15 +1,13 @@
 use std::sync::Arc;
 
+use super::{SourceOrchestrationMode, SourceOrchestrationPlan, SourceOrchestrationPlanError};
 use crate::scenario::{
     Application, DynError, NodeClients, Scenario,
     runtime::{
-        orchestration::{
-            SourceOrchestrationMode, SourceOrchestrationPlan, SourceOrchestrationPlanError,
-        },
-        providers::{
-            ApplicationExternalProvider, AttachProviderError, AttachedNode, ExternalNode,
-            ExternalProviderError, ManagedProviderError, ManagedProvisionedNode, SourceProviders,
-            StaticManagedProvider,
+        ApplicationExternalProvider, AttachProviderError, AttachedNode, SourceProviders,
+        StaticManagedProvider,
+        internal::{
+            ExternalNode, ExternalProviderError, ManagedProviderError, ManagedProvisionedNode,
         },
     },
 };

testing-framework/core/src/scenario/runtime/internal/providers/managed_provider.rs

@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 
-use crate::scenario::{Application, DynError, runtime::orchestration::ManagedSource};
+use crate::scenario::{Application, DynError, runtime::ManagedSource};
 
 /// Managed node produced by the managed provider path.
 #[derive(Clone, Debug)]

testing-framework/core/src/scenario/runtime/mod.rs

@@ -1,27 +1,23 @@
 pub mod context;
 mod deployer;
+mod internal;
 mod inventory;
 pub mod metrics;
 mod node_clients;
-pub mod orchestration;
-pub mod providers;
 pub mod readiness;
 mod runner;
 
 use async_trait::async_trait;
 pub use context::{CleanupGuard, RunContext, RunHandle, RunMetrics, RuntimeAssembly};
 pub use deployer::{Deployer, ScenarioError};
+#[doc(hidden)]
+pub use internal::{
+    ApplicationExternalProvider, AttachProvider, AttachProviderError, AttachedNode, ManagedSource,
+    SourceOrchestrationPlan, SourceOrchestrationPlanError, SourceProviders, StaticManagedProvider,
+    build_source_orchestration_plan, orchestrate_sources, orchestrate_sources_with_providers,
+    resolve_sources,
+};
 pub use node_clients::NodeClients;
-#[doc(hidden)]
-pub use orchestration::{
-    ManagedSource, SourceOrchestrationPlan, build_source_orchestration_plan, orchestrate_sources,
-    orchestrate_sources_with_providers, resolve_sources,
-};
-#[doc(hidden)]
-pub use providers::{
-    ApplicationExternalProvider, AttachProvider, AttachProviderError, AttachedNode,
-    SourceProviders, StaticManagedProvider,
-};
 pub use readiness::{
     HttpReadinessRequirement, ReadinessError, StabilizationConfig, wait_for_http_ports,
     wait_for_http_ports_with_host, wait_for_http_ports_with_host_and_requirement,