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

tests: fixing lint and build

Browse Source
This commit is contained in:
Benjamin Chastanier
2022-05-05 12:55:13 +02:00
committed by Pierre Mavro
parent 91749538b7
commit b315a61b38
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cmd/helm_utils.rs
View File

@@ -388,20 +388,18 @@ where
let mut need_backup = false;
let root_dir_path = std::env::temp_dir();
if chart.backup_resources.is_some() {
if installed_version.le(&get_common_helm_chart_version(&chart)?) {
if let Err(e) = prepare_chart_backup(
kubernetes_config,
root_dir_path.as_path(),
&chart,
envs,
chart.backup_resources.as_ref().unwrap().to_vec(),
) {
return Err(e);
};
if chart.backup_resources.is_some() && installed_version.le(&get_common_helm_chart_version(&chart)?) {
if let Err(e) = prepare_chart_backup(
kubernetes_config,
root_dir_path.as_path(),
&chart,
envs,
chart.backup_resources.as_ref().unwrap().to_vec(),
) {
return Err(e);
};
need_backup = true;
}
need_backup = true;
}
Ok(BackupStatus {

34
test_utilities/src/common.rs
View File

@@ -657,7 +657,7 @@ pub fn database_test_environment_on_upgrade(context: &Context) -> EnvironmentReq
min_instances: 1,
max_instances: 1,
cpu_burst: "100m".to_string(),
advance_settings: Default::default(),
advanced_settings: Default::default(),
}],
routers: vec![],
databases: vec![],
@@ -1891,24 +1891,33 @@ pub fn test_db_on_upgrade(
&context,
logger.clone(),
localisation.as_str(),
KubernetesKind::Eks,
kubernetes_version.clone(),
&ClusterDomain::Default,
&ClusterDomain::Default {
cluster_id: context.cluster_id().to_string(),
},
None,
),
Kind::Do => DO::docker_cr_engine(
&context,
logger.clone(),
localisation.as_str(),
KubernetesKind::Doks,
kubernetes_version.clone(),
&ClusterDomain::Default,
&ClusterDomain::Default {
cluster_id: context.cluster_id().to_string(),
},
None,
),
Kind::Scw => Scaleway::docker_cr_engine(
&context,
logger.clone(),
localisation.as_str(),
KubernetesKind::ScwKapsule,
kubernetes_version.clone(),
&ClusterDomain::Default,
&ClusterDomain::Default {
cluster_id: context.cluster_id().to_string(),
},
None,
),
};
@@ -1971,29 +1980,38 @@ pub fn test_db_on_upgrade(
&context_for_delete,
logger.clone(),
localisation.as_str(),
KubernetesKind::Eks,
kubernetes_version,
&ClusterDomain::Default,
&ClusterDomain::Default {
cluster_id: context_for_delete.cluster_id().to_string(),
},
None,
),
Kind::Do => DO::docker_cr_engine(
&context_for_delete,
logger.clone(),
localisation.as_str(),
KubernetesKind::Doks,
kubernetes_version,
&ClusterDomain::Default,
&ClusterDomain::Default {
cluster_id: context_for_delete.cluster_id().to_string(),
},
None,
),
Kind::Scw => Scaleway::docker_cr_engine(
&context_for_delete,
logger.clone(),
localisation.as_str(),
KubernetesKind::ScwKapsule,
kubernetes_version,
&ClusterDomain::Default,
&ClusterDomain::Default {
cluster_id: context_for_delete.cluster_id().to_string(),
},
None,
),
};
// let ret = environment_delete.delete_environment(&ea_delete, logger, &engine_config_for_delete);
let ret = environment_delete.delete_environment(&ea_delete, logger, &engine_config_for_delete);
assert!(matches!(ret, TransactionResult::Ok));
return test_name.to_string();