Skip to content

feat: Introduce "service_account" user type #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Feb 3, 2026
Merged

feat: Introduce "service_account" user type #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions src/api/v3/auth/token/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ mod tests {
use crate::config::Config;
use crate::identity::{
MockIdentityProvider,
types::{UserPasswordAuthRequest, UserResponse},
types::{UserPasswordAuthRequest, UserResponseBuilder},
};
use crate::keystone::Service;
use crate::policy::MockPolicyFactory;
Expand All @@ -165,12 +165,15 @@ mod tests {
let config = Config::default();
let auth_info = AuthenticatedInfo::builder()
.user_id("uid")
.user(UserResponse {
id: "uid".to_string(),
domain_id: "udid".into(),
enabled: true,
..Default::default()
})
.user(
UserResponseBuilder::default()
.id("uid")
.domain_id("udid")
.enabled(true)
.name("name")
.build()
.unwrap(),
)
.build()
.unwrap();
let auth_clone = auth_info.clone();
Expand Down Expand Up @@ -247,12 +250,15 @@ mod tests {
.expect_get_user()
.withf(|_, id: &'_ str| id == "uid")
.returning(|_, id: &'_ str| {
Ok(Some(UserResponse {
id: id.to_string(),
domain_id: "user_domain_id".into(),
enabled: true,
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id(id)
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let provider = Provider::mocked_builder()
Expand All @@ -275,12 +281,15 @@ mod tests {
assert_eq!(
AuthenticatedInfo::builder()
.user_id("uid")
.user(UserResponse {
id: "uid".to_string(),
domain_id: "user_domain_id".into(),
enabled: true,
..Default::default()
})
.user(
UserResponseBuilder::default()
.id("uid")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
)
.build()
.unwrap(),
authenticate_request(
Expand Down
60 changes: 37 additions & 23 deletions src/api/v3/auth/token/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ mod tests {
use crate::config::Config;
use crate::identity::{
MockIdentityProvider,
types::{UserPasswordAuthRequest, UserResponse},
types::{UserPasswordAuthRequest, UserResponseBuilder},
};
use crate::keystone::Service;
use crate::policy::MockPolicyFactory;
Expand Down Expand Up @@ -170,12 +170,15 @@ mod tests {
.returning(|_, _| {
Ok(AuthenticatedInfo::builder()
.user_id("uid")
.user(UserResponse {
id: "uid".to_string(),
domain_id: "udid".into(),
enabled: true,
..Default::default()
})
.user(
UserResponseBuilder::default()
.id("uid")
.domain_id("udid")
.enabled(true)
.name("name")
.build()
.unwrap(),
)
.build()
.unwrap())
});
Expand All @@ -198,11 +201,15 @@ mod tests {
Ok(ProviderToken::ProjectScope(ProjectScopePayload {
user_id: "bar".into(),
methods: Vec::from(["password".to_string()]),
user: Some(UserResponse {
id: "uid".to_string(),
domain_id: "user_domain_id".into(),
..Default::default()
}),
user: Some(
UserResponseBuilder::default()
.id("uid")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
),
project_id: "pid".into(),
..Default::default()
}))
Expand All @@ -216,11 +223,15 @@ mod tests {
Ok(ProviderToken::ProjectScope(ProjectScopePayload {
user_id: "bar".into(),
methods: Vec::from(["password".to_string()]),
user: Some(UserResponse {
id: "uid".to_string(),
domain_id: "user_domain_id".into(),
..Default::default()
}),
user: Some(
UserResponseBuilder::default()
.id("uid")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
),
project_id: "pid".into(),
project: Some(Project {
id: "pid".into(),
Expand Down Expand Up @@ -321,12 +332,15 @@ mod tests {
.returning(|_, _| {
Ok(AuthenticatedInfo::builder()
.user_id("uid")
.user(UserResponse {
id: "uid".to_string(),
domain_id: "udid".into(),
enabled: true,
..Default::default()
})
.user(
UserResponseBuilder::default()
.id("uid")
.domain_id("udid")
.enabled(true)
.name("name")
.build()
.unwrap(),
)
.build()
.unwrap())
});
Expand Down
30 changes: 19 additions & 11 deletions src/api/v3/auth/token/show.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ mod tests {
use crate::api::v3::auth::token::types::*;
use crate::catalog::MockCatalogProvider;
use crate::config::Config;
use crate::identity::{MockIdentityProvider, types::UserResponse};
use crate::identity::{MockIdentityProvider, types::UserResponseBuilder};
use crate::keystone::Service;
use crate::provider::Provider;
use crate::resource::{MockResourceProvider, types::Domain};
Expand All @@ -155,11 +155,15 @@ mod tests {
async fn test_get() {
let mut identity_mock = MockIdentityProvider::default();
identity_mock.expect_get_user().returning(|_, id: &'_ str| {
Ok(Some(UserResponse {
id: id.to_string(),
domain_id: "user_domain_id".into(),
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id(id)
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let mut resource_mock = MockResourceProvider::default();
Expand Down Expand Up @@ -251,11 +255,15 @@ mod tests {
async fn test_get_allow_expired() {
let mut identity_mock = MockIdentityProvider::default();
identity_mock.expect_get_user().returning(|_, id: &'_ str| {
Ok(Some(UserResponse {
id: id.to_string(),
domain_id: "user_domain_id".into(),
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id(id)
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let mut resource_mock = MockResourceProvider::default();
Expand Down
58 changes: 37 additions & 21 deletions src/api/v3/auth/token/token_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ mod tests {
use crate::assignment::types::Role as ProviderRole;

use crate::config::Config;
use crate::identity::{MockIdentityProvider, types::UserResponse};
use crate::identity::{MockIdentityProvider, types::UserResponseBuilder};
use crate::keystone::Service;
use crate::policy::MockPolicyFactory;
use crate::provider::Provider;
Expand All @@ -233,11 +233,15 @@ mod tests {
.expect_get_user()
.withf(|_, id: &'_ str| id == "bar")
.returning(|_, _| {
Ok(Some(UserResponse {
id: "bar".into(),
domain_id: "user_domain_id".into(),
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id("bar")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let mut resource_mock = MockResourceProvider::default();
Expand Down Expand Up @@ -288,11 +292,15 @@ mod tests {
.expect_get_user()
.withf(|_, id: &'_ str| id == "bar")
.returning(|_, _| {
Ok(Some(UserResponse {
id: "bar".into(),
domain_id: "user_domain_id".into(),
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id("bar")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let mut resource_mock = MockResourceProvider::default();
Expand Down Expand Up @@ -347,11 +355,15 @@ mod tests {
.expect_get_user()
.withf(|_, id: &'_ str| id == "bar")
.returning(|_, _| {
Ok(Some(UserResponse {
id: "bar".into(),
domain_id: "user_domain_id".into(),
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id("bar")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let mut resource_mock = MockResourceProvider::default();
Expand Down Expand Up @@ -423,11 +435,15 @@ mod tests {
.expect_get_user()
.withf(|_, id: &'_ str| id == "bar")
.returning(|_, _| {
Ok(Some(UserResponse {
id: "bar".into(),
domain_id: "user_domain_id".into(),
..Default::default()
}))
Ok(Some(
UserResponseBuilder::default()
.id("bar")
.domain_id("user_domain_id")
.enabled(true)
.name("name")
.build()
.unwrap(),
))
});

let mut resource_mock = MockResourceProvider::default();
Expand Down
Loading
Loading