Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/checkout-4…
Browse files Browse the repository at this point in the history
….1.7
  • Loading branch information
maxlambrecht authored Aug 26, 2024
2 parents cbb702c + ceef673 commit 231dff0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.PHONY: lint
lint:
@cargo +nightly fmt --check
@cargo clippy
1 change: 1 addition & 0 deletions spiffe/src/proto/workload.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// This file is @generated by prost-build.
/// The X509SVIDRequest message conveys parameters for requesting an X.509-SVID.
/// There are currently no request parameters.
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
2 changes: 1 addition & 1 deletion spiffe/src/spiffe_id/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ impl TrustDomain {
/// # Arguments
///
/// * `id_or_name` - Name of a trust domain, it also can be a SPIFFE ID string from which the domain name
/// is extracted.
/// is extracted.
///
/// # Errors
///
Expand Down
5 changes: 0 additions & 5 deletions spiffe/src/svid/jwt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ impl Claims {
}
}

#[derive(Debug, Clone, PartialEq)]
struct Header {
inner: jsonwebtoken::Header,
}

impl JwtSvid {
/// Parses the given token verifying the token signature using the provided [`BundleSource`] as
/// a source of [`JwtBundle`], validating the audience in the token with the expected audience,
Expand Down
2 changes: 1 addition & 1 deletion spiffe/src/svid/x509/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl X509Svid {
/// # Arguments
///
/// * `cert_chain_der` - Slice of bytes representing a chain of certificates as ASN.1 DER-encoded (concatenated
/// with no intermediate padding if there are more than one certificate).
/// with no intermediate padding if there are more than one certificate).
///
/// * `private_key_der` - Slice of bytes representing a private key as ASN.1 DER in PKCS#8 format.
///
Expand Down
4 changes: 2 additions & 2 deletions spiffe/src/workload_api/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ impl WorkloadApiClient {
///
/// * `audience` - A list of audiences to include in the JWT token. Cannot be empty nor contain only empty strings.
/// * `spiffe_id` - Optional [`SpiffeId`] for the token 'sub' claim. If not provided, the Workload API returns the
/// default identity.
/// default identity.
///
/// # Errors
///
Expand Down Expand Up @@ -322,7 +322,7 @@ impl WorkloadApiClient {
///
/// * `audience` - A list of audiences to include in the JWT token. Cannot be empty nor contain only empty strings.
/// * `spiffe_id` - Optional reference [`SpiffeId`] for the token 'sub' claim. If not provided, the Workload API returns the
/// default identity,
/// default identity,
///
/// # Errors
///
Expand Down

0 comments on commit 231dff0

Please sign in to comment.