Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions crates/alien-deploy-cli/src/commands/up.rs
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,27 @@ mod tests {
assert!(!hosted_setup_reconcile_required("running", None, None));
}

#[test]
fn failed_setup_states_are_prepared_before_retrying() {
for status in [
DeploymentStatus::Running,
DeploymentStatus::UpdateFailed,
DeploymentStatus::RefreshFailed,
DeploymentStatus::InitialSetupFailed,
DeploymentStatus::ProvisioningFailed,
] {
assert!(requires_direct_setup_preparation(&status), "{status:?}");
}

for status in [
DeploymentStatus::Pending,
DeploymentStatus::InitialSetup,
DeploymentStatus::Provisioning,
] {
assert!(!requires_direct_setup_preparation(&status), "{status:?}");
}
}

#[test]
fn setup_refresh_prefers_desired_release_and_falls_back_to_current() {
assert_eq!(
Expand Down Expand Up @@ -2926,8 +2947,7 @@ fn hosted_setup_reconcile_required(
| "refresh-failed"
| "initial-setup-failed"
| "provisioning-failed"
)
&& packaged_revision.is_some()
) && packaged_revision.is_some()
&& packaged_revision != applied_revision
}

Expand Down Expand Up @@ -4206,12 +4226,7 @@ pub async fn push_initial_setup(
message: "Failed to deserialize runtime_metadata from manager".to_string(),
})?;

if matches!(
state.status,
DeploymentStatus::Running
| DeploymentStatus::UpdateFailed
| DeploymentStatus::RefreshFailed
) {
if requires_direct_setup_preparation(&state.status) {
let stack_state = state.stack_state.as_ref().ok_or_else(|| {
AlienError::new(ErrorData::ConfigurationError {
message: "A running deployment has no stack state for setup update".to_string(),
Expand Down Expand Up @@ -4317,6 +4332,17 @@ pub async fn push_initial_setup(
}
}

fn requires_direct_setup_preparation(status: &DeploymentStatus) -> bool {
matches!(
status,
DeploymentStatus::Running
| DeploymentStatus::UpdateFailed
| DeploymentStatus::RefreshFailed
| DeploymentStatus::InitialSetupFailed
| DeploymentStatus::ProvisioningFailed
)
}

fn should_collect_push_setup_environment_info(platform: Platform) -> bool {
!matches!(platform, Platform::Machines)
}
Expand Down
Loading