rustfmt update

Author: lfrancke

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

@@ -132,7 +132,9 @@ mod tests {
         let coordinator_jvm_config = construct_jvm_config_for_test(input, &DruidRole::Coordinator);
         let historical_jvm_config = construct_jvm_config_for_test(input, &DruidRole::Historical);
 
-        assert_eq!(coordinator_jvm_config, indoc! {"
+        assert_eq!(
+            coordinator_jvm_config,
+            indoc! {"
               -server
               -Xmx468m
               -Xms468m
@@ -147,8 +149,11 @@ mod tests {
               -Djavax.net.ssl.trustStore=/stackable/truststore.p12
               -Djavax.net.ssl.trustStorePassword=changeit
               -Djavax.net.ssl.trustStoreType=pkcs12
-              -Dderby.stream.error.file=/stackable/var/druid/derby.log"});
-        assert_eq!(historical_jvm_config, indoc! {"
+              -Dderby.stream.error.file=/stackable/var/druid/derby.log"}
+        );
+        assert_eq!(
+            historical_jvm_config,
+            indoc! {"
               -server
               -Xmx900m
               -Xms900m
@@ -163,7 +168,8 @@ mod tests {
               -Dlog4j.configurationFile=/stackable/rwconfig/log4j2.properties
               -Djavax.net.ssl.trustStore=/stackable/truststore.p12
               -Djavax.net.ssl.trustStorePassword=changeit
-              -Djavax.net.ssl.trustStoreType=pkcs12"});
+              -Djavax.net.ssl.trustStoreType=pkcs12"}
+        );
     }
 
     #[test]
@@ -237,7 +243,9 @@ mod tests {
         let coordinator_jvm_config = construct_jvm_config_for_test(input, &DruidRole::Coordinator);
         let historical_jvm_config = construct_jvm_config_for_test(input, &DruidRole::Historical);
 
-        assert_eq!(coordinator_jvm_config, indoc! {"
+        assert_eq!(
+            coordinator_jvm_config,
+            indoc! {"
               -server
               -Xms42708m
               -XX:+ExitOnOutOfMemoryError
@@ -255,8 +263,11 @@ mod tests {
               -Dhttps.proxyHost=proxy.my.corp
               -Djava.net.preferIPv4Stack=true
               -Xmx40000m
-              -Dhttps.proxyPort=1234"});
-        assert_eq!(historical_jvm_config, indoc! {"
+              -Dhttps.proxyPort=1234"}
+        );
+        assert_eq!(
+            historical_jvm_config,
+            indoc! {"
               -server
               -Xmx9759m
               -Xms9759m
@@ -272,7 +283,8 @@ mod tests {
               -Djavax.net.ssl.trustStore=/stackable/truststore.p12
               -Djavax.net.ssl.trustStorePassword=changeit
               -Djavax.net.ssl.trustStoreType=pkcs12
-              -Dfoo=bar"});
+              -Dfoo=bar"}
+        );
     }
 
     fn construct_jvm_config_for_test(druid_cluster: &str, druid_role: &DruidRole) -> String {

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

@@ -257,39 +257,45 @@ mod tests {
             _ => (),
         };
 
-        assert_eq!(merged_config.affinity, StackableAffinity {
-            pod_affinity: Some(PodAffinity {
-                preferred_during_scheduling_ignored_during_execution: Some(expected_affinities),
-                required_during_scheduling_ignored_during_execution: None,
-            }),
-            pod_anti_affinity: Some(PodAntiAffinity {
-                preferred_during_scheduling_ignored_during_execution: Some(vec![
-                    WeightedPodAffinityTerm {
-                        pod_affinity_term: PodAffinityTerm {
-                            label_selector: Some(LabelSelector {
-                                match_expressions: None,
-                                match_labels: Some(BTreeMap::from([
-                                    ("app.kubernetes.io/name".to_string(), "druid".to_string(),),
-                                    (
-                                        "app.kubernetes.io/instance".to_string(),
-                                        "simple-druid".to_string(),
-                                    ),
-                                    ("app.kubernetes.io/component".to_string(), role.to_string(),)
-                                ]))
-                            }),
-                            match_label_keys: None,
-                            mismatch_label_keys: None,
-                            namespace_selector: None,
-                            namespaces: None,
-                            topology_key: "kubernetes.io/hostname".to_string(),
-                        },
-                        weight: 70
-                    }
-                ]),
-                required_during_scheduling_ignored_during_execution: None,
-            }),
-            node_affinity: None,
-            node_selector: None,
-        });
+        assert_eq!(
+            merged_config.affinity,
+            StackableAffinity {
+                pod_affinity: Some(PodAffinity {
+                    preferred_during_scheduling_ignored_during_execution: Some(expected_affinities),
+                    required_during_scheduling_ignored_during_execution: None,
+                }),
+                pod_anti_affinity: Some(PodAntiAffinity {
+                    preferred_during_scheduling_ignored_during_execution: Some(vec![
+                        WeightedPodAffinityTerm {
+                            pod_affinity_term: PodAffinityTerm {
+                                label_selector: Some(LabelSelector {
+                                    match_expressions: None,
+                                    match_labels: Some(BTreeMap::from([
+                                        ("app.kubernetes.io/name".to_string(), "druid".to_string(),),
+                                        (
+                                            "app.kubernetes.io/instance".to_string(),
+                                            "simple-druid".to_string(),
+                                        ),
+                                        (
+                                            "app.kubernetes.io/component".to_string(),
+                                            role.to_string(),
+                                        )
+                                    ]))
+                                }),
+                                match_label_keys: None,
+                                mismatch_label_keys: None,
+                                namespace_selector: None,
+                                namespaces: None,
+                                topology_key: "kubernetes.io/hostname".to_string(),
+                            },
+                            weight: 70
+                        }
+                    ]),
+                    required_during_scheduling_ignored_during_execution: None,
+                }),
+                node_affinity: None,
+                node_selector: None,
+            }
+        );
     }
 }

rust/operator-binary/src/main.rs

@@ -87,10 +87,13 @@ async fn main() -> anyhow::Result<()> {
             )
             .await?;
 
-            let event_recorder = Arc::new(Recorder::new(client.as_kube_client(), Reporter {
-                controller: FULL_CONTROLLER_NAME.to_string(),
-                instance: None,
-            }));
+            let event_recorder = Arc::new(Recorder::new(
+                client.as_kube_client(),
+                Reporter {
+                    controller: FULL_CONTROLLER_NAME.to_string(),
+                    instance: None,
+                },
+            ));
 
             let druid_controller = Controller::new(
                 watch_namespace.get_api::<DeserializeGuard<v1alpha1::DruidCluster>>(&client),