chore: nullify unimplemented environments; demonstrate environment selection.

Author: l-monninger

Cargo.lock

@@ -222,7 +222,7 @@ mtma-environment-types = { path = "environments/util/types" }
 ### core
 mtma-testing-environment = { path = "environments/core/testing" }
 mtma-provisioner-environment = { path = "environments/core/provisioner" }
-mtma-box-environment = { path = "environments/box/provisioner" }
+mtma-box-environment = { path = "environments/core/box" }
 
 [workspace.lints.clippy]
 debug_assert_with_mut_call = "deny"

Cargo.toml

@@ -1,5 +1,3 @@
-use anyhow::Context;
-use movement_core::Overlays;
 use mtma_environment_types::{EnvironmentError, Environmentish};
 use mtma_migrator_types::migrator::MovementMigrator;
 use std::fmt::Debug;
@@ -27,32 +25,6 @@ impl BoxEnvironment {
 
 impl Environmentish for BoxEnvironment {
 	async fn build_movement_migrator(&self) -> Result<MovementMigrator, EnvironmentError> {
-		// Form the migrator.
-		let mut movement_migrator =
-			MovementMigrator::try_temp().map_err(|e| BoxEnvironmentError::Internal(e.into()))?;
-		movement_migrator.set_overlays(Overlays::default());
-
-		// Start the migrator so that it's running in the background.
-		// In the future, some migrators may be for already running nodes.
-		let movement_migrator_for_task = movement_migrator.clone();
-		let movement_migrator_task = kestrel::task(async move {
-			movement_migrator_for_task.run().await?;
-			Ok::<_, anyhow::Error>(())
-		});
-
-		// wait for the rest client to be ready
-		// once we have this, there should also be a config, so we can then kill off the migrator and proceed
-		movement_migrator
-		.wait_for_rest_client_ready(tokio::time::Duration::from_secs(600)) // we wait for up to ten minutes because the nix flake in .vendors/movementcan be a bit slow the first time
-		.await
-		.context(
-			"failed to wait for movement migrator rest client while running accounts equal manual prelude",
-		).map_err(|e| BoxEnvironmentError::Internal(e.into()))?;
-
-		kestrel::end!(movement_migrator_task)
-			.context("failed to end movement migrator task")
-			.map_err(|e| BoxEnvironmentError::Internal(e.into()))?;
-
-		Ok(movement_migrator)
+		Err(BoxEnvironmentError::Internal(anyhow::anyhow!("not implemented").into()).into())
 	}
 }

environments/core/box/src/environment/environment.rs

@@ -1,5 +1,3 @@
-use anyhow::Context;
-use movement_core::Overlays;
 use mtma_environment_types::{EnvironmentError, Environmentish};
 use mtma_migrator_types::migrator::MovementMigrator;
 use std::fmt::Debug;
@@ -27,32 +25,6 @@ impl ProvisionerEnvironment {
 
 impl Environmentish for ProvisionerEnvironment {
 	async fn build_movement_migrator(&self) -> Result<MovementMigrator, EnvironmentError> {
-		// Form the migrator.
-		let mut movement_migrator = MovementMigrator::try_temp()
-			.map_err(|e| ProvisionerEnvironmentError::Internal(e.into()))?;
-		movement_migrator.set_overlays(Overlays::default());
-
-		// Start the migrator so that it's running in the background.
-		// In the future, some migrators may be for already running nodes.
-		let movement_migrator_for_task = movement_migrator.clone();
-		let movement_migrator_task = kestrel::task(async move {
-			movement_migrator_for_task.run().await?;
-			Ok::<_, anyhow::Error>(())
-		});
-
-		// wait for the rest client to be ready
-		// once we have this, there should also be a config, so we can then kill off the migrator and proceed
-		movement_migrator
-		.wait_for_rest_client_ready(tokio::time::Duration::from_secs(600)) // we wait for up to ten minutes because the nix flake in .vendors/movementcan be a bit slow the first time
-		.await
-		.context(
-			"failed to wait for movement migrator rest client while running accounts equal manual prelude",
-		).map_err(|e| ProvisionerEnvironmentError::Internal(e.into()))?;
-
-		kestrel::end!(movement_migrator_task)
-			.context("failed to end movement migrator task")
-			.map_err(|e| ProvisionerEnvironmentError::Internal(e.into()))?;
-
-		Ok(movement_migrator)
+		Err(ProvisionerEnvironmentError::Internal(anyhow::anyhow!("not implemented").into()).into())
 	}
 }

environments/core/provisioner/src/environment/environment.rs

@@ -34,6 +34,8 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 slect = { workspace = true }
 mtma-testing-environment = { workspace = true }
+mtma-box-environment = { workspace = true }
+mtma-provisioner-environment = { workspace = true }
 mtma-environment-types = { workspace = true }
 mtma-migrator-types = { workspace = true }
 

migration/cli/migrate-node/Cargo.toml

@@ -125,17 +125,35 @@ Select migration over the node
 ###### **Options:**
 
 * `--environment-testing` — Enable the environment-testing selection
+* `--environment-box` — Enable the environment-box selection
+* `--environment-provisioner` — Enable the environment-provisioner selection
 * `--null` — Enable the null selection
 
-**Selection (1/2):** `environment-testing`
+**Selection (1/4):** `environment-testing`
 The config for the [TestingEnvironment]
 
 Usage: --environment-testing.*
 
 Options:
   -h, --help  Print help (see more with '--help')
 
-**Selection (2/2):** `null`
+**Selection (2/4):** `environment-box`
+The config for the [BoxEnvironment]
+
+Usage: --environment-box.*
+
+Options:
+  -h, --help  Print help (see more with '--help')
+
+**Selection (3/4):** `environment-provisioner`
+The config for the [ProvisionerEnvironment]
+
+Usage: --environment-provisioner.*
+
+Options:
+  -h, --help  Print help (see more with '--help')
+
+**Selection (4/4):** `null`
 The config for the migration
 
 Usage: --null.*

migration/cli/migrate-node/docs/cli/README.md

@@ -1,8 +1,10 @@
 use anyhow::Context;
 use clap::Parser;
+use mtma_box_environment::Config as BoxEnvironmentConfig;
 use mtma_environment_types::Environmentish;
 use mtma_migrator_types::migration::Migrationish;
 use mtma_node_null_core::Config as NullConfig;
+use mtma_provisioner_environment::Config as ProvisionerEnvironmentConfig;
 use mtma_testing_environment::Config as TestingEnvironmentConfig;
 use serde::{Deserialize, Serialize};
 use slect::Slect;
@@ -12,14 +14,29 @@ use slect::Slect;
 #[clap(help_expected = true)]
 pub struct Select {
 	/// Extra args to pass to slect API
-	#[slect(environment_testing = TestingEnvironmentConfig, null = NullConfig)]
+	#[slect(environment_testing = TestingEnvironmentConfig, environment_box = BoxEnvironmentConfig, environment_provisioner = ProvisionerEnvironmentConfig, null = NullConfig)]
 	extra_args: Vec<String>,
 }
 
 impl select::Select {
 	pub async fn execute(&self) -> Result<(), anyhow::Error> {
-		let (maybe_environment_testing, maybe_null) =
-			self.select().map_err(|e| anyhow::anyhow!("{}", e))?;
+		let (
+			maybe_environment_testing,
+			maybe_environment_box,
+			maybe_environment_provisioner,
+			maybe_null,
+		) = self.select().map_err(|e| anyhow::anyhow!("{}", e))?;
+
+		// if more than one environment is provided, we need to error
+		let environment_count = maybe_environment_testing.is_some() as u8
+			+ maybe_environment_box.is_some() as u8
+			+ maybe_environment_provisioner.is_some() as u8;
+		if environment_count > 1 {
+			return Err(anyhow::anyhow!(
+				"only one environment should be provided, but got {}",
+				environment_count
+			));
+		}
 
 		let environment_config = maybe_environment_testing.context(
 			"--environment-testing is the only supported environment; it must be provided",