Naming feedback from review

Author: sbernauer

CHANGELOG.md

@@ -19,7 +19,7 @@
 ### Fixed
 
 - Invalid `SupersetCluster`, `DruidConnection` or `AuthenticationClass` objects don't stop the operator from reconciling ([#551]).
-- Fix OIDC endpoint calculation in case the `rootPath` does have a trailing slash ([#569]).
+- Fix OIDC endpoint construction in case the `rootPath` does have a trailing slash ([#569]).
 
 [#528]: https://github.com/stackabletech/superset-operator/pull/528
 [#530]: https://github.com/stackabletech/superset-operator/pull/530

rust/crd/src/authentication.rs

@@ -141,7 +141,7 @@ pub enum SupersetAuthenticationClassResolved {
     },
     Oidc {
         provider: oidc::AuthenticationProvider,
-        oidc: oidc::ClientAuthenticationOptions<()>,
+        client_auth_options: oidc::ClientAuthenticationOptions<()>,
     },
 }
 
@@ -310,7 +310,7 @@ impl SupersetClientAuthenticationDetailsResolved {
 
         Ok(SupersetAuthenticationClassResolved::Oidc {
             provider: provider.to_owned(),
-            oidc: auth_details
+            client_auth_options: auth_details
                 .common
                 .oidc_or_error(auth_class_name)
                 .context(OidcConfigurationInvalidSnafu)?
@@ -465,7 +465,7 @@ mod tests {
                             vec!["openid".into(), "email".into(), "profile".into()],
                             Some(IdentityProviderHint::Keycloak)
                         ),
-                        oidc: oidc::ClientAuthenticationOptions {
+                        client_auth_options: oidc::ClientAuthenticationOptions {
                             client_credentials_secret_ref: "superset-oidc-client1".into(),
                             extra_scopes: vec!["groups".into()],
                             product_specific_fields: ()
@@ -481,7 +481,7 @@ mod tests {
                             vec!["openid".into(), "email".into(), "profile".into()],
                             None
                         ),
-                        oidc: oidc::ClientAuthenticationOptions {
+                        client_auth_options: oidc::ClientAuthenticationOptions {
                             client_credentials_secret_ref: "superset-oidc-client2".into(),
                             extra_scopes: Vec::new(),
                             product_specific_fields: ()

rust/operator-binary/src/config.rs

@@ -22,8 +22,8 @@ pub enum Error {
         source: stackable_operator::commons::authentication::oidc::Error,
     },
 
-    #[snafu(display("invalid OIDC well known URL"))]
-    InvalidOidcWellKnownUrl {
+    #[snafu(display("invalid well-known OIDC configuration URL"))]
+    InvalidWellKnownConfigUrl {
         source: stackable_operator::commons::authentication::oidc::Error,
     },
 }
@@ -89,7 +89,11 @@ fn append_authentication_config(
         .authentication_classes_resolved
         .iter()
         .filter_map(|auth_class| {
-            if let SupersetAuthenticationClassResolved::Oidc { provider, oidc } = auth_class {
+            if let SupersetAuthenticationClassResolved::Oidc {
+                provider,
+                client_auth_options: oidc,
+            } = auth_class
+            {
                 Some((provider, oidc))
             } else {
                 None
@@ -229,7 +233,7 @@ fn append_oidc_config(
                 api_base_url.push_str("/protocol/");
                 let known_config_url = oidc
                     .well_known_config_url()
-                    .context(InvalidOidcWellKnownUrlSnafu)?;
+                    .context(InvalidWellKnownConfigUrlSnafu)?;
                 formatdoc!(
                     "
                       {{ 'name': 'keycloak',

rust/operator-binary/src/superset_controller.rs

@@ -991,7 +991,7 @@ fn authentication_env_vars(
     for auth_class_resolved in &auth_config.authentication_classes_resolved {
         match auth_class_resolved {
             SupersetAuthenticationClassResolved::Ldap { .. } => {}
-            SupersetAuthenticationClassResolved::Oidc { oidc, .. } => {
+            SupersetAuthenticationClassResolved::Oidc { client_auth_options: oidc, .. } => {
                 oidc_client_credentials_secrets
                     .insert(oidc.client_credentials_secret_ref.to_owned());
             }