Update editions to 2024 (#185)

maxlambrecht · web-flow · commit b4d947e76f1b · 2025-12-23T12:32:40.000-03:00
Signed-off-by: Max Lambrecht &lt;maxlambrecht@gmail.com&gt;
diff --git a/.github/actions/setup-env/action.yaml b/.github/actions/setup-env/action.yaml
@@ -1,14 +1,18 @@
 name: 'Setup Environment'
-description: 'Install Protoc and Rust toolchain, and set up Rust dependencies cache'
+description: 'Install Protoc and Rust toolchain'
 inputs:
   github_token:
     description: 'GitHub Token for authentication'
     required: true
+
 runs:
   using: 'composite'
   steps:
     - name: Install Protoc
       uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b  #v3.0.0
+      with:
+        version: "25.3"
+        repo-token: ${{ inputs.github_token }}
 
     - name: Setup Rust stable toolchain
       uses: actions-rs/toolchain@4d3830945c2fde0cba21123066096384613b8558  # v1.0.6
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,12 +62,6 @@ jobs:
         with:
           shared-key: ${{ runner.os }}-cargo
 
-      - name: Install protoc
-        uses: arduino/setup-protoc@v3
-        with:
-          version: "25.3"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build Rust project
         run: cargo build --all-targets --all-features
 
@@ -78,4 +72,5 @@ jobs:
         run: cargo test --features integration-tests
 
       - name: Clean up SPIRE
+        if: ${{ always() }}
         run: .github/workflows/scripts/cleanup-spire.sh
diff --git a/spiffe/Cargo.toml b/spiffe/Cargo.toml
@@ -4,7 +4,7 @@ name = "spiffe"
 # - Update CHANGELOG.md.
 # - Create a new tag
 version = "0.6.7"
-edition = "2021"
+edition = "2024"
 authors = ["Max Lambrecht <maxlambrecht@gmail.com>"]
 description = "Rust client library implementation for SPIFFE"
 license = "Apache-2.0"
diff --git a/spiffe/build.rs b/spiffe/build.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 use std::{env, fs};
 
-use anyhow::{ensure, Context as _};
+use anyhow::{Context as _, ensure};
 
 fn main() -> anyhow::Result<()> {
     println!("cargo:rerun-if-changed=src/proto");
diff --git a/spiffe/src/bundle/jwt/mod.rs b/spiffe/src/bundle/jwt/mod.rs
@@ -76,9 +76,11 @@ impl JwtBundle {
     /// let trust_domain = TrustDomain::new("example.org").unwrap();
     /// let jwt_bundle = JwtBundle::from_jwt_authorities(trust_domain, jwt_authorities).unwrap();
     ///
-    /// assert!(jwt_bundle
-    ///     .find_jwt_authority("C6vs25welZOx6WksNYfbMfiw9l96pMnD")
-    ///     .is_some());
+    /// assert!(
+    ///     jwt_bundle
+    ///         .find_jwt_authority("C6vs25welZOx6WksNYfbMfiw9l96pMnD")
+    ///         .is_some()
+    /// );
     /// ```
     pub fn from_jwt_authorities(
         trust_domain: TrustDomain,
@@ -181,9 +183,11 @@ mod jwt_bundle_test {
         .as_bytes();
         let trust_domain = TrustDomain::new("example.org").unwrap();
         let jwt_bundle = JwtBundle::from_jwt_authorities(trust_domain, bundle_bytes).unwrap();
-        assert!(jwt_bundle
-            .find_jwt_authority("C6vs25welZOx6WksNYfbMfiw9l96pMnD")
-            .is_some());
+        assert!(
+            jwt_bundle
+                .find_jwt_authority("C6vs25welZOx6WksNYfbMfiw9l96pMnD")
+                .is_some()
+        );
     }
 
     #[test]
@@ -210,12 +214,16 @@ mod jwt_bundle_test {
 
         let trust_domain = TrustDomain::new("example.org").unwrap();
         let jwt_bundle = JwtBundle::from_jwt_authorities(trust_domain, bundle_bytes).unwrap();
-        assert!(jwt_bundle
-            .find_jwt_authority("C6vs25welZOx6WksNYfbMfiw9l96pMnD")
-            .is_some());
-        assert!(jwt_bundle
-            .find_jwt_authority("gHTCunJbefYtnZnTctd84xeRWyMrEsWD")
-            .is_some());
+        assert!(
+            jwt_bundle
+                .find_jwt_authority("C6vs25welZOx6WksNYfbMfiw9l96pMnD")
+                .is_some()
+        );
+        assert!(
+            jwt_bundle
+                .find_jwt_authority("gHTCunJbefYtnZnTctd84xeRWyMrEsWD")
+                .is_some()
+        );
     }
 
     #[test]
diff --git a/spiffe/src/bundle/x509/mod.rs b/spiffe/src/bundle/x509/mod.rs
@@ -1,9 +1,9 @@
 //! X.509 bundle types.
 
 use crate::bundle::{Bundle, BundleRefSource};
+use crate::cert::Certificate;
 use crate::cert::errors::CertificateError;
 use crate::cert::parsing::{parse_der_encoded_bytes_as_x509_certificate, to_certificate_vec};
-use crate::cert::Certificate;
 use crate::spiffe_id::TrustDomain;
 use std::collections::HashMap;
 use std::convert::TryFrom;
diff --git a/spiffe/src/cert/parsing.rs b/spiffe/src/cert/parsing.rs
@@ -1,5 +1,5 @@
-use crate::cert::errors::CertificateError;
 use crate::cert::Certificate;
+use crate::cert::errors::CertificateError;
 use x509_parser::certificate::X509Certificate;
 use x509_parser::der_parser::oid::Oid;
 use x509_parser::error::X509Error;
@@ -35,7 +35,7 @@ pub(crate) fn parse_der_encoded_bytes_as_x509_certificate(
                 Incomplete(_) => X509Error::InvalidCertificate,
                 Err::Error(e) => e,
                 Err::Failure(e) => e,
-            }))
+            }));
         }
     };
     Ok(x509)
diff --git a/spiffe/src/endpoint.rs b/spiffe/src/endpoint.rs
@@ -81,7 +81,7 @@ mod tests {
     }
 
     macro_rules! validate_socket_path_error_tests {
-        ($($name:ident: $value:expr,)*) => {
+        ($($name:ident: $value:expr_2021,)*) => {
         $(
             #[test]
             fn $name() {
diff --git a/spiffe/src/lib.rs b/spiffe/src/lib.rs
@@ -110,13 +110,13 @@ pub(crate) mod proto {
 pub mod workload_api;
 
 // Core SPIFFE types and utilities re-exported for simplified access.
+pub use bundle::BundleSource;
 pub use bundle::jwt::{JwtBundle, JwtBundleError, JwtBundleSet};
 pub use bundle::x509::{X509Bundle, X509BundleError, X509BundleSet};
-pub use bundle::BundleSource;
 pub use spiffe_id::{SpiffeId, SpiffeIdError, TrustDomain};
+pub use svid::SvidSource;
 pub use svid::jwt::{JwtSvid, JwtSvidError};
 pub use svid::x509::{X509Svid, X509SvidError};
-pub use svid::SvidSource;
 
 #[cfg(feature = "workload-api")]
 pub use workload_api::client::WorkloadApiClient;
diff --git a/spiffe/src/spiffe_id/mod.rs b/spiffe/src/spiffe_id/mod.rs
@@ -352,7 +352,7 @@ mod spiffe_id_tests {
     use super::*;
 
     macro_rules! spiffe_id_success_tests {
-        ($($name:ident: $value:expr,)*) => {
+        ($($name:ident: $value:expr_2021,)*) => {
         $(
             #[test]
             fn $name() {
@@ -429,7 +429,7 @@ mod spiffe_id_tests {
     }
 
     macro_rules! spiffe_id_error_tests {
-        ($($name:ident: $value:expr,)*) => {
+        ($($name:ident: $value:expr_2021,)*) => {
         $(
             #[test]
             fn $name() {
@@ -577,7 +577,7 @@ mod trust_domain_tests {
     use std::str::FromStr;
 
     macro_rules! trust_domain_success_tests {
-        ($($name:ident: $value:expr,)*) => {
+        ($($name:ident: $value:expr_2021,)*) => {
         $(
             #[test]
             fn $name() {
@@ -596,7 +596,7 @@ mod trust_domain_tests {
     }
 
     macro_rules! trust_domain_error_tests {
-        ($($name:ident: $value:expr,)*) => {
+        ($($name:ident: $value:expr_2021,)*) => {
         $(
             #[test]
             fn $name() {
diff --git a/spiffe/src/svid/jwt/mod.rs b/spiffe/src/svid/jwt/mod.rs
@@ -4,12 +4,12 @@ use std::str::FromStr;
 
 use jsonwebtoken::jwk::Jwk;
 use jsonwebtoken::{Algorithm, DecodingKey, Validation};
-use serde::{de, Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, de};
 use thiserror::Error;
 use zeroize::Zeroize;
 
-use crate::bundle::jwt::JwtBundle;
 use crate::bundle::BundleRefSource;
+use crate::bundle::jwt::JwtBundle;
 use crate::spiffe_id::{SpiffeId, SpiffeIdError, TrustDomain};
 use crate::svid::Svid;
 use std::error::Error;
diff --git a/spiffe/src/svid/x509/mod.rs b/spiffe/src/svid/x509/mod.rs
@@ -6,8 +6,8 @@ use crate::cert::errors::{CertificateError, PrivateKeyError};
 use crate::cert::parsing::to_certificate_vec;
 use crate::cert::{Certificate, PrivateKey};
 use crate::spiffe_id::{SpiffeId, SpiffeIdError};
-use crate::svid::x509::validations::{validate_leaf_certificate, validate_signing_certificates};
 use crate::svid::Svid;
+use crate::svid::x509::validations::{validate_leaf_certificate, validate_signing_certificates};
 use std::convert::TryFrom;
 
 /// This type represents a [SPIFFE X509-SVID](https://github.com/spiffe/spiffe/blob/main/standards/X509-SVID.md).
diff --git a/spiffe/src/svid/x509/validations.rs b/spiffe/src/svid/x509/validations.rs
@@ -1,6 +1,6 @@
+use crate::cert::Certificate;
 use crate::cert::errors::CertificateError;
 use crate::cert::parsing::{get_x509_extension, parse_der_encoded_bytes_as_x509_certificate};
-use crate::cert::Certificate;
 use crate::spiffe_id::SpiffeId;
 use crate::svid::x509::X509SvidError;
 use std::convert::TryFrom;
@@ -43,7 +43,7 @@ fn validate_signing_certificate(cert: &X509Certificate<'_>) -> Result<(), X509Sv
     let basic_constraints = get_x509_extension(cert, oid_registry::OID_X509_EXT_BASIC_CONSTRAINTS)?;
     match basic_constraints {
         ParsedExtension::BasicConstraints(b) if !b.ca => {
-            return Err(X509SvidError::SigningCertificatedNoCa)
+            return Err(X509SvidError::SigningCertificatedNoCa);
         }
         _ => {}
     };
diff --git a/spiffe/src/workload_api/client.rs b/spiffe/src/workload_api/client.rs
@@ -293,7 +293,8 @@ impl WorkloadApiClient {
     /// Streams X.509 context updates from the Workload API.
     pub async fn stream_x509_contexts(
         &mut self,
-    ) -> Result<impl Stream<Item = Result<X509Context, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<X509Context, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = X509svidRequest::default();
         let response = self.client.fetch_x509svid(request).await?;
         let stream = response.into_inner().map(|message| {
@@ -307,7 +308,8 @@ impl WorkloadApiClient {
     /// Streams X.509 SVID updates from the Workload API.
     pub async fn stream_x509_svids(
         &mut self,
-    ) -> Result<impl Stream<Item = Result<X509Svid, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<X509Svid, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = X509svidRequest::default();
         let response = self.client.fetch_x509svid(request).await?;
         let stream = response.into_inner().map(|message| {
@@ -321,7 +323,8 @@ impl WorkloadApiClient {
     /// Streams X.509 bundle set updates from the Workload API.
     pub async fn stream_x509_bundles(
         &mut self,
-    ) -> Result<impl Stream<Item = Result<X509BundleSet, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<X509BundleSet, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = X509BundlesRequest::default();
         let response = self.client.fetch_x509_bundles(request).await?;
         let stream = response.into_inner().map(|message| {
@@ -335,7 +338,8 @@ impl WorkloadApiClient {
     /// Streams JWT bundle set updates from the Workload API.
     pub async fn stream_jwt_bundles(
         &mut self,
-    ) -> Result<impl Stream<Item = Result<JwtBundleSet, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<JwtBundleSet, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = JwtBundlesRequest::default();
         let response = self.client.fetch_jwt_bundles(request).await?;
         let stream = response.into_inner().map(|message| {
diff --git a/spiffe/src/workload_api/x509_source.rs b/spiffe/src/workload_api/x509_source.rs
@@ -34,12 +34,12 @@ use std::error::Error as StdError;
 use std::fmt::Debug;
 use std::future::Future;
 use std::pin::Pin;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use thiserror::Error;
-use tokio::sync::{watch, Mutex};
+use tokio::sync::{Mutex, watch};
 use tokio::task::JoinHandle;
-use tokio::time::{sleep, Duration};
+use tokio::time::{Duration, sleep};
 use tokio_stream::StreamExt;
 use tokio_util::sync::CancellationToken;
 
@@ -408,13 +408,14 @@ impl X509Source {
                 }
 
                 match stream.next().await {
-                    Some(Ok(ctx)) => {
-                        if let Err(e) = self.set_x509_context(ctx) {
+                    Some(Ok(ctx)) => match self.set_x509_context(ctx) {
+                        Err(e) => {
                             error!("Error updating X509 context: {e}");
-                        } else {
+                        }
+                        _ => {
                             debug!("X509 context updated.");
                         }
-                    }
+                    },
                     Some(Err(e)) => {
                         warn!("Workload API stream error: {e}. Reconnecting...");
                         break;
@@ -494,9 +495,5 @@ async fn sleep_or_cancel(token: &CancellationToken, dur: Duration) -> bool {
 
 fn next_backoff(current: Duration, max: Duration) -> Duration {
     let doubled = current.saturating_mul(2);
-    if doubled > max {
-        max
-    } else {
-        doubled
-    }
+    if doubled > max { max } else { doubled }
 }
diff --git a/spire-api/Cargo.toml b/spire-api/Cargo.toml
@@ -4,7 +4,7 @@ name = "spire-api"
 # - Update CHANGELOG.md.
 # - Create a new tag
 version = "0.3.6"
-edition = "2021"
+edition = "2024"
 authors = ["Max Lambrecht <maxlambrecht@gmail.com>"]
 description = "Rust library for the SPIRE APIs"
 license = "Apache-2.0"
diff --git a/spire-api/src/agent/delegated_identity.rs b/spire-api/src/agent/delegated_identity.rs
@@ -194,7 +194,8 @@ impl DelegatedIdentityClient {
     pub async fn stream_x509_svids(
         &mut self,
         attest_type: DelegateAttestationRequest,
-    ) -> Result<impl Stream<Item = Result<X509Svid, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<X509Svid, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = match attest_type {
             DelegateAttestationRequest::Selectors(selectors) => SubscribeToX509sviDsRequest {
                 selectors: selectors.into_iter().map(|s| s.into()).collect(),
@@ -255,7 +256,8 @@ impl DelegatedIdentityClient {
     /// Individual stream items might also be errors if there's an issue processing the response for a specific update.
     pub async fn stream_x509_bundles(
         &mut self,
-    ) -> Result<impl Stream<Item = Result<X509BundleSet, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<X509BundleSet, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = SubscribeToX509BundlesRequest::default();
 
         let response: tonic::Response<tonic::Streaming<SubscribeToX509BundlesResponse>> =
@@ -328,7 +330,8 @@ impl DelegatedIdentityClient {
     /// Individual stream items might also be errors if there's an issue processing the response for a specific update.
     pub async fn stream_jwt_bundles(
         &mut self,
-    ) -> Result<impl Stream<Item = Result<JwtBundleSet, GrpcClientError>>, GrpcClientError> {
+    ) -> Result<impl Stream<Item = Result<JwtBundleSet, GrpcClientError>> + use<>, GrpcClientError>
+    {
         let request = SubscribeToJwtBundlesRequest::default();
         let response = self.client.subscribe_to_jwt_bundles(request).await?;
         Ok(response.into_inner().map(|message| {
diff --git a/spire-api/tests/delegated_identity_api_client_test.rs b/spire-api/tests/delegated_identity_api_client_test.rs
@@ -7,7 +7,7 @@ mod integration_tests_delegate_identity_api_client {
     use once_cell::sync::Lazy;
     use spiffe::bundle::BundleRefSource;
     use spiffe::{JwtBundleSet, TrustDomain};
-    use spire_api::{selectors, DelegateAttestationRequest, DelegatedIdentityClient};
+    use spire_api::{DelegateAttestationRequest, DelegatedIdentityClient, selectors};
     use std::process::Command;
     use tokio_stream::StreamExt;
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ mod tests {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`macro_rules! validate_socket_path_error_tests {`
`84`		`- ($($name:ident: $value:expr,)*) => {`
	`84`	`+ ($($name:ident: $value:expr_2021,)*) => {`
`85`	`85`	`$(`
`86`	`86`	`#[test]`
`87`	`87`	`fn $name() {`