address comments

Author: MikeZappa87

Cargo.lock

@@ -121,7 +121,6 @@ educe = "0.6"
 spire-api = "0.3.6"
 spiffe = "0.7"
 tempfile = { version = "3.23", optional = true}
-hyperlocal = "0.9.1"
 mockall = "0.14.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]

Cargo.toml

@@ -57,7 +57,7 @@ pub enum Error {
     Forgotten,
     #[error("BUG: identity requested {0}, but only allowed {1:?}")]
     BugInvalidIdentityRequest(Identity, Arc<WorkloadInfo>),
-    #[error("failed to fetch pid for workload: {0}")]
+    #[error("failed to fetch bundle for workload: {0}")]
     FailedToFetchBundle(String),
     #[error("certificate is in invalid format")]
     CertificateInvalidFormat(),

src/identity.rs

@@ -1377,10 +1377,7 @@ mod tests {
         test.caclient.set_error(true).await;
         assert!(
             test.caclient
-                .fetch_certificate(&CompositeId::with_key(
-                    id.clone(),
-                    id.clone(),
-                ))
+                .fetch_certificate(&CompositeId::with_key(id.clone(), id.clone(),))
                 .await
                 .is_err()
         );

src/identity/manager.rs

@@ -473,10 +473,8 @@ pub mod spire_tests {
 
         assert!(identity.to_string() == "spiffe://example.org/ns/default/sa/test-sa");
 
-        let composite_id = CompositeId::with_key(
-            identity,
-            WorkloadUid::new("uid-123456".to_string()),
-        );
+        let composite_id =
+            CompositeId::with_key(identity, WorkloadUid::new("uid-123456".to_string()));
 
         let fetch_result = spire_client.fetch_certificate(&composite_id).await;
 
@@ -676,10 +674,8 @@ pub mod spire_tests {
 
         assert!(identity.to_string() == "spiffe://example.org/ns/default/sa/test-sa");
 
-        let composite_id = CompositeId::with_key(
-            identity,
-            WorkloadUid::new("uid-123456".to_string()),
-        );
+        let composite_id =
+            CompositeId::with_key(identity, WorkloadUid::new("uid-123456".to_string()));
 
         let fetch_result = spire_client.fetch_certificate(&composite_id).await;
 
@@ -793,8 +789,6 @@ pub mod spire_tests {
     fn mock_stream_svid_success_response(
         spiffe_id: String,
     ) -> Box<dyn Stream<Item = Result<X509Svid, GrpcClientError>> + Send + Unpin> {
-        // build a stream that yields X509Svid responses
-        // can you provide a minimal example of building such a stream?
         let (mut tx, rx) = mpsc::channel(10);
         tokio::spawn(async move {
             let svid = generate_svid(&spiffe_id, "example.org");
@@ -806,8 +800,6 @@ pub mod spire_tests {
     fn mock_stream_svid_success_delay_response(
         spiffe_id: String,
     ) -> Box<dyn Stream<Item = Result<X509Svid, GrpcClientError>> + Send + Unpin> {
-        // build a stream that yields X509Svid responses
-        // can you provide a minimal example of building such a stream?
         let (mut tx, rx) = mpsc::channel(10);
         tokio::spawn(async move {
             tx.send(Err(GrpcClientError::EmptyResponse)).await.unwrap();
@@ -823,8 +815,6 @@ pub mod spire_tests {
     fn mock_stream_svid_success_delay_response_timeout(
         _: String,
     ) -> Box<dyn Stream<Item = Result<X509Svid, GrpcClientError>> + Send + Unpin> {
-        // build a stream that yields X509Svid responses
-        // can you provide a minimal example of building such a stream?
         let (_, rx) = mpsc::channel(10);
         tokio::spawn(async move {
             tokio::time::sleep(std::time::Duration::from_secs(10)).await;
@@ -835,8 +825,6 @@ pub mod spire_tests {
     fn mock_stream_svid_success_delay_response_timeout_empty(
         _: String,
     ) -> Box<dyn Stream<Item = Result<X509Svid, GrpcClientError>> + Send + Unpin> {
-        // build a stream that yields X509Svid responses
-        // can you provide a minimal example of building such a stream?
         let (mut tx, rx) = mpsc::channel(10);
         tokio::spawn(async move {
             tx.send(Err(GrpcClientError::EmptyResponse)).await.unwrap();