Skip to content

Commit 855dde2

Browse files
committed
Shorten generic name to OidcProductSpecificOptions
1 parent dbc0599 commit 855dde2

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

crates/stackable-operator/src/crd/authentication/core/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pub mod versioned {
128128
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
129129
#[serde(rename_all = "camelCase")]
130130
#[schemars(description = "")]
131-
pub struct ClientAuthenticationDetails<OidcProductSpecificClientAuthenticationOptions = ()> {
131+
pub struct ClientAuthenticationDetails<OidcProductSpecificOptions = ()> {
132132
/// Name of the [`AuthenticationClass`] used to authenticate users.
133133
///
134134
/// To get the concrete [`AuthenticationClass`], we must resolve it. This resolution can be
@@ -152,10 +152,6 @@ pub mod versioned {
152152
#[schemars(
153153
description = "This field contains OIDC-specific configuration. It is only required in case OIDC is used."
154154
)]
155-
oidc: Option<
156-
oidc::v1alpha1::ClientAuthenticationOptions<
157-
OidcProductSpecificClientAuthenticationOptions,
158-
>,
159-
>,
155+
oidc: Option<oidc::v1alpha1::ClientAuthenticationOptions<OidcProductSpecificOptions>>,
160156
}
161157
}

crates/stackable-operator/src/crd/authentication/core/v1alpha1_impl.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ impl AuthenticationClass {
3030
}
3131
}
3232

33-
impl<OidcProductSpecificClientAuthenticationOptions>
34-
ClientAuthenticationDetails<OidcProductSpecificClientAuthenticationOptions>
35-
{
33+
impl<OidcProductSpecificOptions> ClientAuthenticationDetails<OidcProductSpecificOptions> {
3634
/// Resolves this specific [`AuthenticationClass`]. Usually products support
3735
/// a list of authentication classes, which individually need to be resolved.crate::client
3836
pub async fn resolve_class(
@@ -52,9 +50,7 @@ impl<OidcProductSpecificClientAuthenticationOptions>
5250
pub fn oidc_or_error(
5351
&self,
5452
auth_class_name: &str,
55-
) -> Result<
56-
&oidc_v1alpha1::ClientAuthenticationOptions<OidcProductSpecificClientAuthenticationOptions>,
57-
> {
53+
) -> Result<&oidc_v1alpha1::ClientAuthenticationOptions<OidcProductSpecificOptions>> {
5854
self.oidc
5955
.as_ref()
6056
.with_context(|| OidcAuthenticationDetailsNotSpecifiedSnafu {

0 commit comments

Comments
 (0)