serokell/deploy-rs
1
1
Fork 0
mirror of https://github.com/serokell/deploy-rs.git synced 2024-09-11 10:45:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #274 from PhilTaken/phil/node-name-in-errors

Browse Source 
better error messages: provide node names
This commit is contained in:
Roman Melnikov 2024-06-11 15:12:03 +02:00 committed by GitHub
commit ea0aaeb222
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/cli.rs
View File

@ -380,10 +380,12 @@ fn prompt_deployment(
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum RunDeployError { pub enum RunDeployError {
#[error("Failed to deploy profile: {0}")] #[error("Failed to deploy profile to node {0}: {1}")]
DeployProfile(#[from] deploy::deploy::DeployProfileError), DeployProfile(String, deploy::deploy::DeployProfileError),
#[error("Failed to push profile: {0}")] #[error("Failed to build profile on node {0}: {0}")]
PushProfile(#[from] deploy::push::PushProfileError), BuildProfile(String, deploy::push::PushProfileError),
#[error("Failed to push profile to node {0}: {0}")]
PushProfile(String, deploy::push::PushProfileError),
#[error("No profile named `{0}` was found")] #[error("No profile named `{0}` was found")]
ProfileNotFound(String), ProfileNotFound(String),
#[error("No node named `{0}` was found")] #[error("No node named `{0}` was found")]
@ -396,10 +398,10 @@ pub enum RunDeployError {
TomlFormat(#[from] toml::ser::Error), TomlFormat(#[from] toml::ser::Error),
#[error("{0}")] #[error("{0}")]
PromptDeployment(#[from] PromptDeploymentError), PromptDeployment(#[from] PromptDeploymentError),
#[error("Failed to revoke profile: {0}")] #[error("Failed to revoke profile for node {0}: {1}")]
RevokeProfile(#[from] deploy::deploy::RevokeProfileError), RevokeProfile(String, deploy::deploy::RevokeProfileError),
#[error("Deployment failed, rolled back to previous generation")] #[error("Deployment to node {0} failed, rolled back to previous generation")]
Rollback Rollback(String)
} }
type ToDeploy<'a> = Vec<( type ToDeploy<'a> = Vec<(
@ -545,7 +547,7 @@ async fn run_deploy(
if deploy_data.merged_settings.interactive_sudo.unwrap_or(false) { if deploy_data.merged_settings.interactive_sudo.unwrap_or(false) {
warn!("Interactive sudo is enabled! Using a sudo password is less secure than correctly configured SSH keys.\nPlease use keys in production environments."); warn!("Interactive sudo is enabled! Using a sudo password is less secure than correctly configured SSH keys.\nPlease use keys in production environments.");
if deploy_data.merged_settings.sudo.is_some() { if deploy_data.merged_settings.sudo.is_some() {
warn!("Custom sudo commands should be configured to accept password input from stdin when using the 'interactive sudo' option. Deployment may fail if the custom command ignores stdin."); warn!("Custom sudo commands should be configured to accept password input from stdin when using the 'interactive sudo' option. Deployment may fail if the custom command ignores stdin.");
} else { } else {
@ -586,11 +588,17 @@ async fn run_deploy(
}; };
for data in data_iter() { for data in data_iter() {
deploy::push::build_profile(data).await?; let node_name: String = data.deploy_data.node_name.to_string();
deploy::push::build_profile(data).await.map_err(|e| {
RunDeployError::BuildProfile(node_name, e)
})?;
} }
for data in data_iter() { for data in data_iter() {
deploy::push::push_profile(data).await?; let node_name: String = data.deploy_data.node_name.to_string();
deploy::push::push_profile(data).await.map_err(|e| {
RunDeployError::PushProfile(node_name, e)
})?;
} }
let mut succeeded: Vec<(&deploy::DeployData, &deploy::DeployDefs)> = vec![]; let mut succeeded: Vec<(&deploy::DeployData, &deploy::DeployDefs)> = vec![];
@ -613,12 +621,14 @@ async fn run_deploy(
// the command line) // the command line)
for (deploy_data, deploy_defs) in &succeeded { for (deploy_data, deploy_defs) in &succeeded {
if deploy_data.merged_settings.auto_rollback.unwrap_or(true) { if deploy_data.merged_settings.auto_rollback.unwrap_or(true) {
deploy::deploy::revoke(*deploy_data, *deploy_defs).await?; deploy::deploy::revoke(*deploy_data, *deploy_defs).await.map_err(|e| {
RunDeployError::RevokeProfile(deploy_data.node_name.to_string(), e)
})?;
} }
} }
return Err(RunDeployError::Rollback); return Err(RunDeployError::Rollback(deploy_data.node_name.to_string()));
} }
return Err(RunDeployError::DeployProfile(e)) return Err(RunDeployError::DeployProfile(deploy_data.node_name.to_string(), e))
} }
succeeded.push((deploy_data, deploy_defs)) succeeded.push((deploy_data, deploy_defs))
} }