From 2e67cd86fddd2afccb0b63320817dbf1828c61df Mon Sep 17 00:00:00 2001 From: marc Date: Thu, 19 Nov 2020 09:35:40 +0100 Subject: [PATCH] rename cast error fn --- src/cloud_provider/aws/application.rs | 20 ++++++------- src/cloud_provider/aws/databases/mongodb.rs | 30 +++++++++---------- src/cloud_provider/aws/databases/mysql.rs | 30 +++++++++---------- .../aws/databases/postgresql.rs | 30 +++++++++---------- src/cloud_provider/aws/external_service.rs | 18 +++++------ src/cloud_provider/aws/kubernetes/mod.rs | 26 ++++++++-------- src/cloud_provider/aws/router.rs | 16 +++++----- src/error.rs | 2 +- 8 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/cloud_provider/aws/application.rs b/src/cloud_provider/aws/application.rs index 816acf00..6a4c88a8 100644 --- a/src/cloud_provider/aws/application.rs +++ b/src/cloud_provider/aws/application.rs @@ -13,7 +13,7 @@ use crate::cloud_provider::DeploymentTarget; use crate::cmd::helm::Timeout; use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY}; use crate::error::{ - from_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, + cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, }; use crate::models::Context; @@ -145,7 +145,7 @@ impl Application { let selector = format!("app={}", self.name()); if is_error { - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::get_stateless_resource_information( @@ -158,7 +158,7 @@ impl Application { } // clean the resource - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::do_stateless_service_cleanup( @@ -246,7 +246,7 @@ impl Create for Application { let from_dir = format!("{}/aws/charts/q-application", self.context.lib_root_dir()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -264,7 +264,7 @@ impl Create for Application { (AWS_SECRET_ACCESS_KEY, aws.secret_access_key.as_str()), ]; - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -278,7 +278,7 @@ impl Create for Application { )?; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history( @@ -307,7 +307,7 @@ impl Create for Application { // check app status let selector = format!("app={}", self.name()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::kubectl::kubectl_exec_is_pod_ready_with_retry( @@ -349,7 +349,7 @@ impl Create for Application { (AWS_SECRET_ACCESS_KEY, aws.secret_access_key.as_str()), ]; - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -364,7 +364,7 @@ impl Create for Application { let helm_release_name = self.helm_release_name(); - let history_rows = from_simple_error_to_engine_error( + let history_rows = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_history( @@ -376,7 +376,7 @@ impl Create for Application { )?; if history_rows.len() == 1 { - from_simple_error_to_engine_error( + cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_uninstall( diff --git a/src/cloud_provider/aws/databases/mongodb.rs b/src/cloud_provider/aws/databases/mongodb.rs index ff088731..615d5a1f 100644 --- a/src/cloud_provider/aws/databases/mongodb.rs +++ b/src/cloud_provider/aws/databases/mongodb.rs @@ -12,7 +12,7 @@ use crate::cloud_provider::DeploymentTarget; use crate::cmd::helm::Timeout; use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY}; use crate::error::{ - from_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, + cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, }; use crate::models::Context; use std::path::Path; @@ -145,7 +145,7 @@ impl MongoDB { let context = self.tera_context(*kubernetes, *environment); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -155,7 +155,7 @@ impl MongoDB { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -165,7 +165,7 @@ impl MongoDB { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -179,7 +179,7 @@ impl MongoDB { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -221,7 +221,7 @@ impl MongoDB { let selector = format!("app={}", self.name()); if is_error { - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::get_stateless_resource_information( @@ -234,7 +234,7 @@ impl MongoDB { } // clean the resource - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::do_stateless_service_cleanup( @@ -310,7 +310,7 @@ impl Create for MongoDB { let context = self.tera_context(*kubernetes, *environment); let workspace_dir = self.workspace_directory(); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -320,7 +320,7 @@ impl Create for MongoDB { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -330,7 +330,7 @@ impl Create for MongoDB { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -345,7 +345,7 @@ impl Create for MongoDB { )?; // deploy database + external DNS - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::terraform::terraform_exec_with_init_validate_plan_apply( @@ -366,7 +366,7 @@ impl Create for MongoDB { .downcast_ref::() .unwrap(); - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -381,7 +381,7 @@ impl Create for MongoDB { // default chart let from_dir = format!("{}/common/services/mongodb", self.context.lib_root_dir()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -396,7 +396,7 @@ impl Create for MongoDB { &self.context.lib_root_dir() ); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -414,7 +414,7 @@ impl Create for MongoDB { ]; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history( diff --git a/src/cloud_provider/aws/databases/mysql.rs b/src/cloud_provider/aws/databases/mysql.rs index e04de67c..33d0e742 100644 --- a/src/cloud_provider/aws/databases/mysql.rs +++ b/src/cloud_provider/aws/databases/mysql.rs @@ -16,7 +16,7 @@ use crate::cmd::kubectl::{ }; use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY}; use crate::error::{ - from_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, + cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, }; use crate::models::Context; use std::path::Path; @@ -146,7 +146,7 @@ impl MySQL { let context = self.tera_context(*kubernetes, *environment); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -156,7 +156,7 @@ impl MySQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -166,7 +166,7 @@ impl MySQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -180,7 +180,7 @@ impl MySQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -222,7 +222,7 @@ impl MySQL { let selector = format!("app={}", self.name()); if is_error { - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::get_stateless_resource_information( @@ -235,7 +235,7 @@ impl MySQL { } // clean the resource - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::do_stateless_service_cleanup( @@ -308,7 +308,7 @@ impl Create for MySQL { let workspace_dir = self.workspace_directory(); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -318,7 +318,7 @@ impl Create for MySQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -328,7 +328,7 @@ impl Create for MySQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -342,7 +342,7 @@ impl Create for MySQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::terraform::terraform_exec_with_init_validate_plan_apply( @@ -365,7 +365,7 @@ impl Create for MySQL { .downcast_ref::() .unwrap(); - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -380,7 +380,7 @@ impl Create for MySQL { // default chart let from_dir = format!("{}/common/services/mysql", self.context.lib_root_dir()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -393,7 +393,7 @@ impl Create for MySQL { let chart_values = format!("{}/common/chart_values/mysql", &self.context.lib_root_dir()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -410,7 +410,7 @@ impl Create for MySQL { ]; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history( diff --git a/src/cloud_provider/aws/databases/postgresql.rs b/src/cloud_provider/aws/databases/postgresql.rs index 7c3b4fb3..674ae344 100644 --- a/src/cloud_provider/aws/databases/postgresql.rs +++ b/src/cloud_provider/aws/databases/postgresql.rs @@ -12,7 +12,7 @@ use crate::cloud_provider::DeploymentTarget; use crate::cmd::helm::Timeout; use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY}; use crate::error::{ - from_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, + cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, }; use crate::models::Context; use std::path::Path; @@ -142,7 +142,7 @@ impl PostgreSQL { let context = self.tera_context(*kubernetes, *environment); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -152,7 +152,7 @@ impl PostgreSQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -162,7 +162,7 @@ impl PostgreSQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -176,7 +176,7 @@ impl PostgreSQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -218,7 +218,7 @@ impl PostgreSQL { let selector = format!("app={}", self.name()); if is_error { - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::get_stateless_resource_information( @@ -231,7 +231,7 @@ impl PostgreSQL { } // clean the resource - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::do_stateless_service_cleanup( @@ -308,7 +308,7 @@ impl Create for PostgreSQL { let workspace_dir = self.workspace_directory(); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -318,7 +318,7 @@ impl Create for PostgreSQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -328,7 +328,7 @@ impl Create for PostgreSQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -342,7 +342,7 @@ impl Create for PostgreSQL { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::terraform::terraform_exec_with_init_validate_plan_apply( @@ -364,7 +364,7 @@ impl Create for PostgreSQL { .downcast_ref::() .unwrap(); - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -384,7 +384,7 @@ impl Create for PostgreSQL { &self.context.lib_root_dir() ); // default chart - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -394,7 +394,7 @@ impl Create for PostgreSQL { ), )?; // overwrite with our chart values - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -411,7 +411,7 @@ impl Create for PostgreSQL { ]; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history( diff --git a/src/cloud_provider/aws/external_service.rs b/src/cloud_provider/aws/external_service.rs index 57003579..54aabe12 100644 --- a/src/cloud_provider/aws/external_service.rs +++ b/src/cloud_provider/aws/external_service.rs @@ -12,7 +12,7 @@ use crate::cloud_provider::service::{ use crate::cloud_provider::DeploymentTarget; use crate::cmd::helm::Timeout; use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY}; -use crate::error::{from_simple_error_to_engine_error, EngineError, EngineErrorCause}; +use crate::error::{cast_simple_error_to_engine_error, EngineError, EngineErrorCause}; use crate::models::Context; #[derive(Clone, Eq, PartialEq, Hash)] @@ -105,7 +105,7 @@ impl ExternalService { let selector = format!("app={}", self.name()); if is_error { - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), common::get_stateless_resource_information( @@ -118,7 +118,7 @@ impl ExternalService { } // clean the resource - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), common::do_stateless_service_cleanup( @@ -210,7 +210,7 @@ impl Create for ExternalService { let workspace_dir = self.workspace_directory(); let from_dir = format!("{}/common/services/q-job", self.context.lib_root_dir()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -228,7 +228,7 @@ impl Create for ExternalService { (AWS_SECRET_ACCESS_KEY, aws.secret_access_key.as_str()), ]; - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), common::kubernetes_config_path( @@ -242,7 +242,7 @@ impl Create for ExternalService { )?; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history( @@ -319,7 +319,7 @@ impl Create for ExternalService { (AWS_SECRET_ACCESS_KEY, aws.secret_access_key.as_str()), ]; - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), common::kubernetes_config_path( @@ -334,7 +334,7 @@ impl Create for ExternalService { let helm_release_name = self.helm_release_name(); - let history_rows = from_simple_error_to_engine_error( + let history_rows = cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), crate::cmd::helm::helm_exec_history( @@ -346,7 +346,7 @@ impl Create for ExternalService { )?; if history_rows.len() == 1 { - from_simple_error_to_engine_error( + cast_simple_error_to_engine_error( crate::cloud_provider::service::ExternalService::engine_error_scope(self), self.context.execution_id(), crate::cmd::helm::helm_exec_uninstall( diff --git a/src/cloud_provider/aws/kubernetes/mod.rs b/src/cloud_provider/aws/kubernetes/mod.rs index 019496e1..74204db7 100644 --- a/src/cloud_provider/aws/kubernetes/mod.rs +++ b/src/cloud_provider/aws/kubernetes/mod.rs @@ -29,7 +29,7 @@ use crate::deletion_utilities::{get_firsts_namespaces_to_delete, get_qovery_mana use crate::dns_provider::cloudflare::Cloudflare; use crate::dns_provider::DnsProvider; use crate::dns_provider::Kind::CLOUDFLARE; -use crate::error::{from_simple_error_to_engine_error, EngineError, EngineErrorCause}; +use crate::error::{cast_simple_error_to_engine_error, EngineError, EngineErrorCause}; use crate::fs::workspace_directory; use crate::models::{ Context, Listener, Listeners, ListenersHelper, ProgressInfo, ProgressLevel, ProgressListener, @@ -409,7 +409,7 @@ impl<'a> Kubernetes for EKS<'a> { .downcast_ref::() .unwrap(); - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -427,7 +427,7 @@ impl<'a> Kubernetes for EKS<'a> { (AWS_SECRET_ACCESS_KEY, aws.secret_access_key.as_str()), ]; - let nodes = from_simple_error_to_engine_error( + let nodes = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), cmd::kubectl::kubectl_exec_get_node(kubernetes_config_file_path, aws_credentials_envs), @@ -489,7 +489,7 @@ impl<'a> Kubernetes for EKS<'a> { // generate terraform files and copy them into temp dir let context = self.tera_context(); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -502,7 +502,7 @@ impl<'a> Kubernetes for EKS<'a> { // copy lib/common/bootstrap/charts directory (and sub directory) into the lib/aws/bootstrap/common/charts directory. // this is due to the required dependencies of lib/aws/bootstrap/*.tf files let common_charts_temp_dir = format!("{}/common/charts", temp_dir.as_str()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::copy_non_template_files( @@ -511,7 +511,7 @@ impl<'a> Kubernetes for EKS<'a> { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::terraform::terraform_exec_with_init_validate_plan_apply( @@ -583,7 +583,7 @@ impl<'a> Kubernetes for EKS<'a> { // generate terraform files and copy them into temp dir let context = self.tera_context(); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -597,7 +597,7 @@ impl<'a> Kubernetes for EKS<'a> { // this is due to the required dependencies of lib/aws/bootstrap/*.tf files let common_charts_temp_dir = format!("{}/common/charts", temp_dir.as_str()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::copy_non_template_files( @@ -617,7 +617,7 @@ impl<'a> Kubernetes for EKS<'a> { ), ]; - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), kubernetes_config_path( @@ -643,7 +643,7 @@ impl<'a> Kubernetes for EKS<'a> { info!("Deleting non Qovery Namespaces"); for namespace_to_delete in namespaces_to_delete.iter() { - let kubernetes_config_file_path0 = from_simple_error_to_engine_error( + let kubernetes_config_file_path0 = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), kubernetes_config_path( @@ -683,7 +683,7 @@ impl<'a> Kubernetes for EKS<'a> { info!("Deleting Qovery managed Namespaces"); - let kubernetes_config_file_path2 = from_simple_error_to_engine_error( + let kubernetes_config_file_path2 = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), kubernetes_config_path( @@ -729,7 +729,7 @@ impl<'a> Kubernetes for EKS<'a> { } info!("Running Terraform destroy"); - let terraform_result = from_simple_error_to_engine_error( + let terraform_result = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), cmd::terraform::terraform_exec_with_init_plan_apply_destroy(temp_dir.as_str()), @@ -1319,7 +1319,7 @@ impl<'a> Kubernetes for EKS<'a> { ), ]; - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( diff --git a/src/cloud_provider/aws/router.rs b/src/cloud_provider/aws/router.rs index 6ee85d15..53fb8759 100644 --- a/src/cloud_provider/aws/router.rs +++ b/src/cloud_provider/aws/router.rs @@ -14,7 +14,7 @@ use crate::cloud_provider::DeploymentTarget; use crate::cmd::helm::Timeout; use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY}; use crate::error::{ - from_simple_error_to_engine_error, EngineError, EngineErrorCause, SimpleError, SimpleErrorKind, + cast_simple_error_to_engine_error, EngineError, EngineErrorCause, SimpleError, SimpleErrorKind, }; use crate::models::{ Context, Listeners, ListenersHelper, ProgressInfo, ProgressLevel, ProgressScope, @@ -232,7 +232,7 @@ impl Router { let workspace_dir = self.workspace_directory(); let helm_release_name = self.helm_release_name(); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::do_stateless_service_cleanup( @@ -341,7 +341,7 @@ impl Create for Router { let workspace_dir = self.workspace_directory(); let helm_release_name = self.helm_release_name(); - let kubernetes_config_file_path = from_simple_error_to_engine_error( + let kubernetes_config_file_path = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), common::kubernetes_config_path( @@ -372,7 +372,7 @@ impl Create for Router { "{}/common/chart_values/nginx-ingress", self.context.lib_root_dir() ); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -382,7 +382,7 @@ impl Create for Router { ), )?; - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::copy_non_template_files( @@ -395,7 +395,7 @@ impl Create for Router { )?; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history_with_override( @@ -454,7 +454,7 @@ impl Create for Router { } let from_dir = format!("{}/aws/charts/q-ingress-tls", self.context.lib_root_dir()); - let _ = from_simple_error_to_engine_error( + let _ = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::template::generate_and_copy_all_files_into_dir( @@ -465,7 +465,7 @@ impl Create for Router { )?; // do exec helm upgrade and return the last deployment status - let helm_history_row = from_simple_error_to_engine_error( + let helm_history_row = cast_simple_error_to_engine_error( self.engine_error_scope(), self.context.execution_id(), crate::cmd::helm::helm_exec_with_upgrade_history( diff --git a/src/error.rs b/src/error.rs index c707cd41..225f2803 100644 --- a/src/error.rs +++ b/src/error.rs @@ -89,7 +89,7 @@ impl From for SimpleError { } } -pub fn from_simple_error_to_engine_error>( +pub fn cast_simple_error_to_engine_error>( scope: EngineErrorScope, execution_id: T, input: Result,