From a65ede93c7e151d877d62c102431865244a3a83d Mon Sep 17 00:00:00 2001 From: Pierre Mavro Date: Mon, 21 Jun 2021 18:23:24 +0200 Subject: [PATCH] fix: temporary disable diff and add more log lines info --- Cargo.lock | 3 ++ Cargo.toml | 1 + .../aws/kubernetes/helm_charts.rs | 15 +++++--- src/cloud_provider/helm.rs | 2 ++ src/cmd/helm.rs | 1 + test_utilities/Cargo.lock | 35 +++++-------------- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 851d3e79..843ebb3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2096,6 +2096,7 @@ dependencies = [ "timeout-readwrite", "tokio 1.7.0", "tracing", + "tracing-futures", "tracing-subscriber", "trust-dns-resolver", "walkdir", @@ -3559,6 +3560,8 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ + "futures 0.3.15", + "futures-task", "pin-project", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index c951c51c..5b207cd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,7 @@ tar = "0.4.35" # logger tracing = "0.1.26" tracing-subscriber = "0.2.18" +tracing-futures = { version = "0.2.5", features = ["std", "std-future", "futures-03"] } # Docker deps # shiplift = "0.6.0" diff --git a/src/cloud_provider/aws/kubernetes/helm_charts.rs b/src/cloud_provider/aws/kubernetes/helm_charts.rs index e09faf43..6f557064 100644 --- a/src/cloud_provider/aws/kubernetes/helm_charts.rs +++ b/src/cloud_provider/aws/kubernetes/helm_charts.rs @@ -56,6 +56,8 @@ pub fn aws_helm_charts( kubernetes_config: &Path, envs: &[(String, String)], ) -> Result>>, SimpleError> { + info!("preparing chart configuration to be deployed"); + let chart_prefix = chart_prefix_path.unwrap_or("./"); let chart_path = |x: &str| -> String { format!("{}/{}", &chart_prefix, x) }; let content_file = File::open(&qovery_terraform_config_file)?; @@ -893,10 +895,12 @@ datasources: ) { Ok(x) => x, Err(e) => { + let msg = format!("Qovery agent version couldn't be retrieved. {}", e); + error!("{}", &msg); return Err(SimpleError { kind: SimpleErrorKind::Other, - message: Some(format!("Qovery agent version couldn't be retrieved. {}", e)), - }) + message: Some(msg), + }); } }; let qovery_agent = CommonChart { @@ -974,10 +978,12 @@ datasources: ) { Ok(x) => x, Err(e) => { + let msg = format!("Qovery engine version couldn't be retrieved. {}", e); + error!("{}", &msg); return Err(SimpleError { kind: SimpleErrorKind::Other, - message: Some(format!("Qovery engine version couldn't be retrieved. {}", e)), - }) + message: Some(msg), + }); } }; let qovery_engine = CommonChart { @@ -1126,6 +1132,7 @@ datasources: level_5.push(Box::new(pleco)); } + info!("charts configuration preparation finished"); Ok(vec![level_1, level_2, level_3, level_4, level_5, level_6]) } diff --git a/src/cloud_provider/helm.rs b/src/cloud_provider/helm.rs index 9373e5b3..75d8312c 100644 --- a/src/cloud_provider/helm.rs +++ b/src/cloud_provider/helm.rs @@ -127,6 +127,7 @@ pub trait HelmChart: Send { } fn run(&self, kubernetes_config: &Path, envs: &[(String, String)]) -> Result, SimpleError> { + info!("prepare and deploy chart {}", &self.get_chart_info().name); self.check_prerequisites()?; self.pre_exec(&kubernetes_config, &envs, None)?; if let Err(e) = self.exec(&kubernetes_config, &envs, None) { @@ -367,6 +368,7 @@ impl HelmChart for CoreDNSConfigChart { } fn run(&self, kubernetes_config: &Path, envs: &[(String, String)]) -> Result, SimpleError> { + info!("prepare and deploy chart {}", &self.get_chart_info().name); self.check_prerequisites()?; let payload = match self.pre_exec(&kubernetes_config, &envs, None) { Ok(p) => match p { diff --git a/src/cmd/helm.rs b/src/cmd/helm.rs index b8183076..cc4d4c10 100644 --- a/src/cmd/helm.rs +++ b/src/cmd/helm.rs @@ -154,6 +154,7 @@ where envs.clone(), |out| match out { Ok(line) => { + info!("{}", line); if debug { debug!("{}", line); } diff --git a/test_utilities/Cargo.lock b/test_utilities/Cargo.lock index 997c0a23..adff6017 100644 --- a/test_utilities/Cargo.lock +++ b/test_utilities/Cargo.lock @@ -1212,7 +1212,7 @@ dependencies = [ "httparse", "httpdate 0.3.2", "itoa", - "pin-project 1.0.2", + "pin-project", "socket2 0.3.19", "tokio 0.2.24", "tower-service", @@ -1236,7 +1236,7 @@ dependencies = [ "httparse", "httpdate 1.0.0", "itoa", - "pin-project 1.0.2", + "pin-project", "socket2 0.4.0", "tokio 1.7.0", "tower-service", @@ -1924,33 +1924,13 @@ dependencies = [ "sha-1", ] -[[package]] -name = "pin-project" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" -dependencies = [ - "pin-project-internal 0.4.27", -] - [[package]] name = "pin-project" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" dependencies = [ - "pin-project-internal 1.0.2", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" -dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.8", - "syn 1.0.73", + "pin-project-internal", ] [[package]] @@ -2107,6 +2087,7 @@ dependencies = [ "timeout-readwrite", "tokio 1.7.0", "tracing", + "tracing-futures", "tracing-subscriber", "trust-dns-resolver", "walkdir", @@ -3565,11 +3546,13 @@ dependencies = [ [[package]] name = "tracing-futures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 0.4.27", + "futures 0.3.15", + "futures-task", + "pin-project", "tracing", ]