run make fix

Author: MikeZappa87

src/admin.rs

@@ -515,11 +515,14 @@ mod tests {
         });
         for i in 0..2 {
             manager
-                .fetch_certificate(&identity::Identity::Spiffe {
-                    trust_domain: "trust_domain".into(),
-                    namespace: "namespace".into(),
-                    service_account: strng::format!("sa-{i}"),
-                }.to_composite_id())
+                .fetch_certificate(
+                    &identity::Identity::Spiffe {
+                        trust_domain: "trust_domain".into(),
+                        namespace: "namespace".into(),
+                        service_account: strng::format!("sa-{i}"),
+                    }
+                    .to_composite_id(),
+                )
                 .await
                 .unwrap();
             // Make sure certificates are a significant amount of time apart, for better
@@ -528,15 +531,19 @@ mod tests {
         }
 
         manager
-            .fetch_certificate(&identity("spiffe://error/ns/forgotten/sa/sa-failed").to_composite_id())
+            .fetch_certificate(
+                &identity("spiffe://error/ns/forgotten/sa/sa-failed").to_composite_id(),
+            )
             .await
             .unwrap_err();
 
         // Start a fetch asynchronously and proceed enough to have it pending, but not finish.
         let pending_manager = manager.clone();
         let pending_fetch = tokio::task::spawn(async move {
             pending_manager
-                .fetch_certificate(&identity("spiffe://test/ns/test/sa/sa-pending").to_composite_id())
+                .fetch_certificate(
+                    &identity("spiffe://test/ns/test/sa/sa-pending").to_composite_id(),
+                )
                 .await
         });
         tokio::time::sleep(Duration::from_nanos(1)).await;

src/app.rs

@@ -316,13 +316,11 @@ fn new_data_plane_pool(num_worker_threads: usize) -> mpsc::Sender<DataPlaneTask>
 pub async fn build(config: Arc<config::Config>) -> anyhow::Result<Bound> {
     let cert_manager = if config.fake_ca {
         mock_secret_manager()
+    } else if config.spire_enabled {
+        let dc = DelegatedIdentityClient::default().await?;
+        Arc::new(SecretManager::new_with_spire_client(config.clone(), dc).await?)
     } else {
-        if config.spire_enabled {
-            let dc = DelegatedIdentityClient::default().await?;
-            Arc::new(SecretManager::new_with_spire_client(config.clone(), dc).await?)
-        } else {
-            Arc::new(SecretManager::new(config.clone()).await?)
-        }
+        Arc::new(SecretManager::new(config.clone()).await?)
     };
     build_with_cert(config, cert_manager).await
 }

src/cert_fetcher.rs

@@ -109,10 +109,7 @@ impl CertFetcherImpl {
                 RequestKeyEnum::Workload(WorkloadUid::new(w.uid.to_string())),
             )
         } else {
-            CompositeId::new(
-                w.identity(),
-                RequestKeyEnum::Identity(w.identity().clone()),
-            )
+            CompositeId::new(w.identity(), RequestKeyEnum::Identity(w.identity().clone()))
         }
     }
 }

src/config.rs

@@ -878,9 +878,15 @@ pub fn construct_config(pc: ProxyConfig) -> Result<Config, Error> {
         ztunnel_workload,
         ipv6_enabled,
         spire_enabled: parse_default(SPIRE_ENABLED, false)?,
-        container_runtime_sock_path: parse_default(CONTAINER_RUNTIME_SOCK_PATH, "/run/containerd/containerd.sock".to_string())?,
+        container_runtime_sock_path: parse_default(
+            CONTAINER_RUNTIME_SOCK_PATH,
+            "/run/containerd/containerd.sock".to_string(),
+        )?,
         spire_timeout: parse_duration_default(SPIRE_TIMEOUT, Duration::from_secs(10))?,
-        spire_admin_socket: parse_default(SPIRE_ADMIN_SOCKET, "unix:///run/spire/sockets/admin.sock".to_string())?,
+        spire_admin_socket: parse_default(
+            SPIRE_ADMIN_SOCKET,
+            "unix:///run/spire/sockets/admin.sock".to_string(),
+        )?,
     })
 }