Upgrade Vector to version 0.33.0 in the tests (#339)

* Upgrade Vector to version 0.33.0 in the tests * Fix clippy warnings
stackabletech · Oct 31, 2023 · d6c2b6d · d6c2b6d
1 parent 4a2a5b2
commit d6c2b6d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs
@@ -1189,14 +1189,7 @@ fn build_template_envs(
     airflow: &AirflowCluster,
     env_overrides: &HashMap<String, String>,
 ) -> Vec<EnvVar> {
-    let secret_prop = Some(
-        airflow
-            .spec
-            .cluster_config
-            .credentials_secret
-            .as_str()
-            .clone(),
-    );
+    let secret_prop = Some(airflow.spec.cluster_config.credentials_secret.as_str());
 
     let mut env = secret_prop
         .map(|secret| {

diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
@@ -1,4 +1,4 @@
-use std::fmt::Display;
+use std::fmt::{Display, Write};
 
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_airflow_crd::STACKABLE_LOG_DIR;
@@ -122,16 +122,17 @@ fn create_airflow_config(log_config: &AutomaticContainerLogConfig, log_dir: &str
         .loggers
         .iter()
         .filter(|(name, _)| name.as_str() != AutomaticContainerLogConfig::ROOT_LOGGER)
-        .map(|(name, config)| {
-            format!(
+        .fold(String::new(), |mut output, (name, config)| {
+            let _ = writeln!(
+                output,
                 "
 LOGGING_CONFIG['loggers'].setdefault('{name}', {{ 'propagate': True }})
 LOGGING_CONFIG['loggers']['{name}']['level'] = {level}
 ",
                 level = config.level.to_python_expression()
-            )
-        })
-        .collect::<String>();
+            );
+            output
+        });
 
     format!(
         "\

diff --git a/tests/templates/kuttl/logging/03-install-airflow-vector-aggregator.yaml b/tests/templates/kuttl/logging/03-install-airflow-vector-aggregator.yaml
@@ -5,7 +5,7 @@ commands:
   - script: >-
       helm install airflow-vector-aggregator vector
       --namespace $NAMESPACE
-      --version 0.23.0
+      --version 0.26.0
       --repo https://helm.vector.dev
       --values airflow-vector-aggregator-values.yaml
 ---