Skip to content

expose time_created and time_modified on User and Group API types #9958

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

Open
charliepark wants to merge 7 commits into
base: main
Choose a base branch
from
Open

expose time_created and time_modified on User and Group API types #9958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6783851
expose time_created and time_modified on User and Group API types
charliepark Mar 3, 2026
4a68b9c
cargo fmt
charliepark Mar 3, 2026
2ae7b39
dedupe code for microsecond precision; modify test
charliepark Mar 4, 2026
872240c
cargo fmt
charliepark Mar 4, 2026
22ad5a9
Merge branch 'main' into add_time_fields_to_silo_user_groups
charliepark Mar 4, 2026
ed9f402
no need for new shared truncation utility when the DB does it
charliepark Mar 5, 2026
3da92a4
db_silo_user is already correct return type
charliepark Mar 5, 2026
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
6 changes: 6 additions & 0 deletions nexus/db-queries/src/db/datastore/silo_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ impl From<SiloGroupApiOnly> for user::Group {
// TODO the use of external_id as display_name is temporary
display_name: u.external_id,
silo_id: u.silo_id,
time_created: u.time_created,
time_modified: u.time_modified,
}
}
}
Expand Down Expand Up @@ -252,6 +254,8 @@ impl From<SiloGroupJit> for user::Group {
// TODO the use of external_id as display_name is temporary
display_name: u.external_id,
silo_id: u.silo_id,
time_created: u.time_created,
time_modified: u.time_modified,
}
}
}
Expand Down Expand Up @@ -319,6 +323,8 @@ impl From<SiloGroupScim> for user::Group {
// TODO the use of display name as display_name is temporary
display_name: u.display_name,
silo_id: u.silo_id,
time_created: u.time_created,
time_modified: u.time_modified,
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions nexus/db-queries/src/db/datastore/silo_user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ impl From<SiloUserApiOnly> for user::User {
// TODO the use of external_id as display_name is temporary
display_name: u.external_id,
silo_id: u.silo_id,
time_created: u.time_created,
time_modified: u.time_modified,
}
}
}
Expand Down Expand Up @@ -293,6 +295,8 @@ impl From<SiloUserJit> for user::User {
// TODO the use of external_id as display_name is temporary
display_name: u.external_id,
silo_id: u.silo_id,
time_created: u.time_created,
time_modified: u.time_modified,
}
}
}
Expand Down Expand Up @@ -364,6 +368,8 @@ impl From<SiloUserScim> for user::User {
// TODO the use of user_name as display_name is temporary
display_name: u.user_name,
silo_id: u.silo_id,
time_created: u.time_created,
time_modified: u.time_modified,
}
}
}
Expand Down
202 changes: 202 additions & 0 deletions nexus/external-api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ api_versions!([
// | date-based version should be at the top of the list.
// v
// (next_yyyy_mm_dd_nn, IDENT),
(2026_03_02_00, ADD_TIME_FIELDS_TO_USERS),
(2026_02_25_00, SET_TARGET_RELEASE_UPDATE_RECOVERY),
(2026_02_19_00, REMOVE_SLED_ADD),
(2026_02_13_01, BGP_UNNUMBERED_PEERS),
Expand Down Expand Up @@ -670,24 +671,69 @@ pub trait NexusExternalApi {
method = GET,
path = "/v1/system/users",
tags = ["system/silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn silo_user_list(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById<latest::silo::SiloSelector>>,
) -> Result<HttpResponseOk<ResultsPage<latest::user::User>>, HttpError>;

/// List built-in (system) users in silo
#[endpoint {
operation_id = "silo_user_list",
method = GET,
path = "/v1/system/users",
tags = ["system/silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn silo_user_list_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById<latest::silo::SiloSelector>>,
) -> Result<
HttpResponseOk<ResultsPage<v2025_11_20_00::user::User>>,
HttpError,
> {
Self::silo_user_list(rqctx, query_params).await.map(
|HttpResponseOk(page)| {
HttpResponseOk(ResultsPage {
items: page.items.into_iter().map(Into::into).collect(),
next_page: page.next_page,
})
},
)
}

/// Fetch built-in (system) user
#[endpoint {
method = GET,
path = "/v1/system/users/{user_id}",
tags = ["system/silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn silo_user_view(
rqctx: RequestContext<Self::Context>,
path_params: Path<latest::user::UserParam>,
query_params: Query<latest::silo::SiloSelector>,
) -> Result<HttpResponseOk<latest::user::User>, HttpError>;

/// Fetch built-in (system) user
#[endpoint {
operation_id = "silo_user_view",
method = GET,
path = "/v1/system/users/{user_id}",
tags = ["system/silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn silo_user_view_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
path_params: Path<latest::user::UserParam>,
query_params: Query<latest::silo::SiloSelector>,
) -> Result<HttpResponseOk<v2025_11_20_00::user::User>, HttpError> {
Self::silo_user_view(rqctx, path_params, query_params)
.await
.map(|HttpResponseOk(u)| HttpResponseOk(u.into()))
}

// Silo identity providers

/// List identity providers for silo
Expand Down Expand Up @@ -755,13 +801,37 @@ pub trait NexusExternalApi {
method = POST,
path = "/v1/system/identity-providers/local/users",
tags = ["system/silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn local_idp_user_create(
rqctx: RequestContext<Self::Context>,
query_params: Query<latest::silo::SiloSelector>,
new_user_params: TypedBody<latest::user::UserCreate>,
) -> Result<HttpResponseCreated<latest::user::User>, HttpError>;

/// Create user
///
/// Users can only be created in Silos with `provision_type` == `Fixed`.
/// Otherwise, Silo users are just-in-time (JIT) provisioned when a user
/// first logs in using an external Identity Provider.
#[endpoint {
operation_id = "local_idp_user_create",
method = POST,
path = "/v1/system/identity-providers/local/users",
tags = ["system/silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn local_idp_user_create_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
query_params: Query<latest::silo::SiloSelector>,
new_user_params: TypedBody<latest::user::UserCreate>,
) -> Result<HttpResponseCreated<v2025_11_20_00::user::User>, HttpError>
{
Self::local_idp_user_create(rqctx, query_params, new_user_params)
.await
.map(|HttpResponseCreated(u)| HttpResponseCreated(u.into()))
}

/// Delete user
#[endpoint {
method = DELETE,
Expand Down Expand Up @@ -6461,23 +6531,67 @@ pub trait NexusExternalApi {
method = GET,
path = "/v1/users",
tags = ["silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn user_list(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById<latest::user::OptionalGroupSelector>>,
) -> Result<HttpResponseOk<ResultsPage<latest::user::User>>, HttpError>;

/// List users
#[endpoint {
operation_id = "user_list",
method = GET,
path = "/v1/users",
tags = ["silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn user_list_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById<latest::user::OptionalGroupSelector>>,
) -> Result<
HttpResponseOk<ResultsPage<v2025_11_20_00::user::User>>,
HttpError,
> {
Self::user_list(rqctx, query_params).await.map(
|HttpResponseOk(page)| {
HttpResponseOk(ResultsPage {
items: page.items.into_iter().map(Into::into).collect(),
next_page: page.next_page,
})
},
)
}

/// Fetch user
#[endpoint {
method = GET,
path = "/v1/users/{user_id}",
tags = ["silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn user_view(
rqctx: RequestContext<Self::Context>,
path_params: Path<latest::path_params::UserPath>,
) -> Result<HttpResponseOk<latest::user::User>, HttpError>;

/// Fetch user
#[endpoint {
operation_id = "user_view",
method = GET,
path = "/v1/users/{user_id}",
tags = ["silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn user_view_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
path_params: Path<latest::path_params::UserPath>,
) -> Result<HttpResponseOk<v2025_11_20_00::user::User>, HttpError> {
Self::user_view(rqctx, path_params)
.await
.map(|HttpResponseOk(u)| HttpResponseOk(u.into()))
}

/// List user's access tokens
#[endpoint {
method = GET,
Expand Down Expand Up @@ -6529,23 +6643,67 @@ pub trait NexusExternalApi {
method = GET,
path = "/v1/groups",
tags = ["silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn group_list(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById>,
) -> Result<HttpResponseOk<ResultsPage<latest::user::Group>>, HttpError>;

/// List groups
#[endpoint {
operation_id = "group_list",
method = GET,
path = "/v1/groups",
tags = ["silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn group_list_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById>,
) -> Result<
HttpResponseOk<ResultsPage<v2025_11_20_00::user::Group>>,
HttpError,
> {
Self::group_list(rqctx, query_params).await.map(
|HttpResponseOk(page)| {
HttpResponseOk(ResultsPage {
items: page.items.into_iter().map(Into::into).collect(),
next_page: page.next_page,
})
},
)
}

/// Fetch group
#[endpoint {
method = GET,
path = "/v1/groups/{group_id}",
tags = ["silos"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn group_view(
rqctx: RequestContext<Self::Context>,
path_params: Path<latest::path_params::GroupPath>,
) -> Result<HttpResponseOk<latest::user::Group>, HttpError>;

/// Fetch group
#[endpoint {
operation_id = "group_view",
method = GET,
path = "/v1/groups/{group_id}",
tags = ["silos"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn group_view_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
path_params: Path<latest::path_params::GroupPath>,
) -> Result<HttpResponseOk<v2025_11_20_00::user::Group>, HttpError> {
Self::group_view(rqctx, path_params)
.await
.map(|HttpResponseOk(u)| HttpResponseOk(u.into()))
}

// Built-in (system) users

/// List built-in users
Expand Down Expand Up @@ -6577,22 +6735,66 @@ pub trait NexusExternalApi {
method = GET,
path = "/v1/me",
tags = ["current-user"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn current_user_view(
rqctx: RequestContext<Self::Context>,
) -> Result<HttpResponseOk<latest::user::CurrentUser>, HttpError>;

/// Fetch user for current session
#[endpoint {
operation_id = "current_user_view",
method = GET,
path = "/v1/me",
tags = ["current-user"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn current_user_view_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
) -> Result<HttpResponseOk<v2025_11_20_00::user::CurrentUser>, HttpError>
{
Self::current_user_view(rqctx)
.await
.map(|HttpResponseOk(u)| HttpResponseOk(u.into()))
}

/// Fetch current user's groups
#[endpoint {
method = GET,
path = "/v1/me/groups",
tags = ["current-user"],
versions = VERSION_ADD_TIME_FIELDS_TO_USERS..,
}]
async fn current_user_groups(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById>,
) -> Result<HttpResponseOk<ResultsPage<latest::user::Group>>, HttpError>;

/// Fetch current user's groups
#[endpoint {
operation_id = "current_user_groups",
method = GET,
path = "/v1/me/groups",
tags = ["current-user"],
versions = ..VERSION_ADD_TIME_FIELDS_TO_USERS,
}]
async fn current_user_groups_v2025_11_20_00(
rqctx: RequestContext<Self::Context>,
query_params: Query<PaginatedById>,
) -> Result<
HttpResponseOk<ResultsPage<v2025_11_20_00::user::Group>>,
HttpError,
> {
Self::current_user_groups(rqctx, query_params).await.map(
|HttpResponseOk(page)| {
HttpResponseOk(ResultsPage {
items: page.items.into_iter().map(Into::into).collect(),
next_page: page.next_page,
})
},
)
}

// Per-user SSH public keys

/// List SSH public keys
Expand Down
Loading
Loading