jlengrand/engine
1
0
Fork 0
mirror of https://github.com/jlengrand/engine.git synced 2026-03-10 08:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: execute correct check action during deployment (#599)

Browse Source
This commit is contained in:
Erèbe - Romain Gerard
2022-02-11 09:14:28 +01:00
committed by GitHub
parent 9de522207c
commit b0824612d8
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cloud_provider/kubernetes.rs
View File

@@ -411,7 +411,7 @@ pub fn deploy_environment(
// check all deployed services
let _ = service::check_kubernetes_service_error(
service.on_create_check(),
service.exec_check_action(),
kubernetes,
service,
event_details.clone(),
@@ -449,11 +449,11 @@ pub fn deploy_environment(
// check all deployed services
let _ = service::check_kubernetes_service_error(
service.on_create_check(),
service.exec_check_action(),
kubernetes,
service,
event_details.clone(),
&stateful_deployment_target,
&stateless_deployment_target,
&listeners_helper,
"check deployment",
CheckAction::Deploy,

18
src/cloud_provider/service.rs
View File

@@ -144,6 +144,15 @@ pub trait StatelessService: Service + Create + Pause + Delete {
crate::cloud_provider::service::Action::Nothing => Ok(()),
}
}
fn exec_check_action(&self) -> Result<(), EngineError> {
match self.action() {
crate::cloud_provider::service::Action::Create => self.on_create_check(),
crate::cloud_provider::service::Action::Delete => self.on_delete_check(),
crate::cloud_provider::service::Action::Pause => self.on_pause_check(),
crate::cloud_provider::service::Action::Nothing => Ok(()),
}
}
}
pub trait StatefulService: Service + Create + Pause + Delete {
@@ -156,6 +165,15 @@ pub trait StatefulService: Service + Create + Pause + Delete {
}
}
fn exec_check_action(&self) -> Result<(), EngineError> {
match self.action() {
crate::cloud_provider::service::Action::Create => self.on_create_check(),
crate::cloud_provider::service::Action::Delete => self.on_delete_check(),
crate::cloud_provider::service::Action::Pause => self.on_pause_check(),
crate::cloud_provider::service::Action::Nothing => Ok(()),
}
}
fn is_managed_service(&self) -> bool;
}