From 516857b29b756fcb8f91e969765a9b52841125e0 Mon Sep 17 00:00:00 2001 From: Benjamin Leggett Date: Tue, 3 Sep 2024 15:32:01 -0400 Subject: [PATCH] Fixup existing tests Signed-off-by: Benjamin Leggett --- .../delegated_identity_api_client_test.rs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spire-api/tests/delegated_identity_api_client_test.rs b/spire-api/tests/delegated_identity_api_client_test.rs index fc673f7..2f7da93 100644 --- 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, DelegatedIdentityClient}; + use spire_api::{selectors, DelegateAttestationRequest, DelegatedIdentityClient}; use std::process::Command; use tokio_stream::StreamExt; @@ -38,9 +38,9 @@ mod integration_tests_delegate_identity_api_client { let svid = client .fetch_jwt_svids( &["my_audience"], - vec![selectors::Selector::Unix(selectors::Unix::Uid( - get_uid() + 1, - ))], + DelegateAttestationRequest::Selectors(vec![selectors::Selector::Unix( + selectors::Unix::Uid(get_uid() + 1), + )]), ) .await .expect("Failed to fetch JWT SVID"); @@ -52,9 +52,9 @@ mod integration_tests_delegate_identity_api_client { async fn fetch_delegate_x509_svid() { let mut client = get_client().await; let response: spiffe::svid::x509::X509Svid = client - .fetch_x509_svid(vec![selectors::Selector::Unix(selectors::Unix::Uid( - get_uid() + 1, - ))]) + .fetch_x509_svid(DelegateAttestationRequest::Selectors(vec![ + selectors::Selector::Unix(selectors::Unix::Uid(get_uid() + 1)), + ])) .await .expect("Failed to fetch delegate SVID"); // Not checking the chain as the root is generated by spire. @@ -71,9 +71,9 @@ mod integration_tests_delegate_identity_api_client { let test_duration = std::time::Duration::from_secs(60); let mut client = get_client().await; let mut stream = client - .stream_x509_svids(vec![selectors::Selector::Unix(selectors::Unix::Uid( - get_uid() + 1, - ))]) + .stream_x509_svids(DelegateAttestationRequest::Selectors(vec![ + selectors::Selector::Unix(selectors::Unix::Uid(get_uid() + 1)), + ])) .await .expect("Failed to fetch delegate SVID"); @@ -124,9 +124,9 @@ mod integration_tests_delegate_identity_api_client { let svids = client .fetch_jwt_svids( &["my_audience"], - vec![selectors::Selector::Unix(selectors::Unix::Uid( - get_uid() + 1, - ))], + DelegateAttestationRequest::Selectors(vec![selectors::Selector::Unix( + selectors::Unix::Uid(get_uid() + 1), + )]), ) .await .expect("Failed to fetch JWT SVID");