Fix tests

Author: sbernauer

rust/operator-binary/src/config/jvm.rs

@@ -23,7 +23,6 @@ pub enum Error {
 /// JVM arguments that go into
 /// 1.`spark.driver.extraJavaOptions`
 /// 2. `spark.executor.extraJavaOptions`
-
 pub fn construct_extra_java_options(
     spark_application: &SparkApplication,
     s3_conn: &Option<S3ConnectionSpec>,
@@ -40,7 +39,7 @@ pub fn construct_extra_java_options(
         jvm_args.extend([
             format!("-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}/truststore.p12"),
             format!("-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"),
-            format!("-Djavax.net.ssl.trustStoreType=pkcs12"),
+            "-Djavax.net.ssl.trustStoreType=pkcs12".to_string(),
         ]);
     }
 
@@ -71,15 +70,13 @@ pub fn construct_extra_java_options(
         .context(MergeJvmArgumentOverridesSnafu)?;
 
     Ok((
-        from_driver.effective_jvm_config_after_merging().join("\n"),
+        from_driver.effective_jvm_config_after_merging().join(" "),
         from_executor.effective_jvm_config_after_merging().join(" "),
     ))
 }
 
 #[cfg(test)]
 mod tests {
-    use indoc::indoc;
-
     use super::*;
 
     #[test]
@@ -144,9 +141,7 @@ mod tests {
 
         assert_eq!(
             driver_extra_java_options,
-            indoc! {"
-                  -Djava.security.properties=/stackable/log_config/security.properties
-                  -Dhttps.proxyHost=from-driver"}
+            "-Djava.security.properties=/stackable/log_config/security.properties -Dhttps.proxyHost=from-driver"
         );
         assert_eq!(
             executor_extra_java_options,

rust/operator-binary/src/crd/mod.rs

@@ -518,7 +518,7 @@ impl v1alpha1::SparkApplication {
         &'a self,
         app_version: &'a str,
         role: &'a str,
-    ) -> ObjectLabels<v1alpha1::SparkApplication> {
+    ) -> ObjectLabels<'a, v1alpha1::SparkApplication> {
         ObjectLabels {
             owner: self,
             app_name: APP_NAME,
@@ -590,7 +590,7 @@ impl v1alpha1::SparkApplication {
         }
 
         let (driver_extra_java_options, executor_extra_java_options) =
-            construct_extra_java_options(&self, s3conn, log_dir)
+            construct_extra_java_options(self, s3conn, log_dir)
                 .context(ConstructJvmArgumentsSnafu)?;
         submit_cmd.extend(vec![
             format!("--conf spark.driver.extraJavaOptions=\"{driver_extra_java_options}\""),

rust/operator-binary/src/history/config/jvm.rs

@@ -53,8 +53,6 @@ pub fn construct_history_jvm_args(
 
 #[cfg(test)]
 mod tests {
-    use indoc::indoc;
-
     use super::*;
     use crate::crd::history::v1alpha1::SparkHistoryServer;
 
@@ -85,10 +83,9 @@ mod tests {
 
         assert_eq!(
             jvm_config,
-            indoc! {"
-                -Dlog4j.configurationFile=/stackable/log_config/log4j2.properties
-                -Djava.security.properties=/stackable/spark/conf/security.properties
-                -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=18081:/stackable/jmx/config.yaml"}
+            "-Dlog4j.configurationFile=/stackable/log_config/log4j2.properties \
+            -Djava.security.properties=/stackable/spark/conf/security.properties \
+            -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=18081:/stackable/jmx/config.yaml"
         );
     }
 
@@ -129,13 +126,12 @@ mod tests {
 
         assert_eq!(
             jvm_config,
-            indoc! {"
-                -Dlog4j.configurationFile=/stackable/log_config/log4j2.properties
-                -Djava.security.properties=/stackable/spark/conf/security.properties
-                -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=18081:/stackable/jmx/config.yaml
-                -Dhttps.proxyHost=proxy.my.corp
-                -Djava.net.preferIPv4Stack=true
-                -Dhttps.proxyPort=1234"}
+            "-Dlog4j.configurationFile=/stackable/log_config/log4j2.properties \
+            -Djava.security.properties=/stackable/spark/conf/security.properties \
+            -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=18081:/stackable/jmx/config.yaml \
+            -Dhttps.proxyHost=proxy.my.corp \
+            -Djava.net.preferIPv4Stack=true \
+            -Dhttps.proxyPort=1234"
         );
     }