aboutsummaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/data.rs1
-rw-r--r--src/utils/deploy.rs40
-rw-r--r--src/utils/push.rs5
3 files changed, 15 insertions, 31 deletions
diff --git a/src/utils/data.rs b/src/utils/data.rs
index d1dae5b..de6adfc 100644
--- a/src/utils/data.rs
+++ b/src/utils/data.rs
@@ -34,7 +34,6 @@ pub struct NodeSettings {
#[derive(Deserialize, Debug, Clone)]
pub struct ProfileSettings {
pub path: String,
- pub activate: Option<String>,
pub bootstrap: Option<String>,
}
diff --git a/src/utils/deploy.rs b/src/utils/deploy.rs
index f1f4210..7301967 100644
--- a/src/utils/deploy.rs
+++ b/src/utils/deploy.rs
@@ -9,10 +9,9 @@ fn build_activate_command(
sudo: &Option<String>,
profile_path: &str,
closure: &str,
- activate_cmd: &Option<String>,
bootstrap_cmd: &Option<String>,
auto_rollback: bool,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> String {
let mut self_activate_command =
format!("{} '{}' '{}'", activate_path_str, profile_path, closure);
@@ -27,18 +26,11 @@ fn build_activate_command(
);
}
- if let Some(ref activate_cmd) = activate_cmd {
- self_activate_command = format!(
- "{} --activate-cmd '{}'",
- self_activate_command, activate_cmd
- );
- }
-
if auto_rollback {
self_activate_command = format!("{} --auto-rollback", self_activate_command);
}
- Ok(self_activate_command)
+ self_activate_command
}
#[test]
@@ -47,22 +39,21 @@ fn test_activation_command_builder() {
let sudo = Some("sudo -u test".to_string());
let profile_path = "/blah/profiles/test";
let closure = "/blah/etc";
- let activate_cmd = Some("$THING/bin/aaaaaaa".to_string());
let bootstrap_cmd = None;
let auto_rollback = true;
- match build_activate_command(
- activate_path_str,
- &sudo,
- profile_path,
- closure,
- &activate_cmd,
- &bootstrap_cmd,
- auto_rollback,
- ) {
- Err(_) => panic!(""),
- Ok(x) => assert_eq!(x, "sudo -u test /blah/bin/activate '/blah/profiles/test' '/blah/etc' --activate-cmd '$THING/bin/aaaaaaa' --auto-rollback".to_string()),
- }
+ assert_eq!(
+ build_activate_command(
+ activate_path_str,
+ &sudo,
+ profile_path,
+ closure,
+ &bootstrap_cmd,
+ auto_rollback,
+ ),
+ "sudo -u test /blah/bin/activate '/blah/profiles/test' '/blah/etc' --auto-rollback"
+ .to_string(),
+ );
}
pub async fn deploy_profile(
@@ -81,10 +72,9 @@ pub async fn deploy_profile(
&deploy_defs.sudo,
&deploy_defs.profile_path,
&deploy_data.profile.profile_settings.path,
- &deploy_data.profile.profile_settings.activate,
&deploy_data.profile.profile_settings.bootstrap,
deploy_data.merged_settings.auto_rollback,
- )?;
+ );
let hostname = match deploy_data.cmd_overrides.hostname {
Some(ref x) => x,
diff --git a/src/utils/push.rs b/src/utils/push.rs
index a973572..3f48d68 100644
--- a/src/utils/push.rs
+++ b/src/utils/push.rs
@@ -17,11 +17,6 @@ pub async fn push_profile(
deploy_data.profile_name, deploy_data.node_name
);
- debug!(
- "Building profile `{} for node `{}`",
- deploy_data.profile_name, deploy_data.node_name
- );
-
let build_exit_status = if supports_flakes {
Command::new("nix")
.arg("build")