Skip to content

Commit e4f8617

Browse files
committed
fix: rename missing resolved leftovers.
1 parent 0fcfd88 commit e4f8617

1 file changed

Lines changed: 16 additions & 13 deletions

File tree

rust/operator-binary/src/crd/authentication.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub mod versioned {
5353
#[derive(Clone, Debug)]
5454
/// Helper struct that contains dereferenced AuthenticationClasses to reduce network API calls.
5555
pub struct DereferencedAuthenticationClasses {
56-
resolved_authentication_classes: Vec<core::v1alpha1::AuthenticationClass>,
56+
dereferenced_authentication_classes: Vec<core::v1alpha1::AuthenticationClass>,
5757
}
5858

5959
impl DereferencedAuthenticationClasses {
@@ -64,10 +64,11 @@ impl DereferencedAuthenticationClasses {
6464
client: &Client,
6565
auth_classes: &Vec<v1alpha1::ZookeeperAuthentication>,
6666
) -> Result<DereferencedAuthenticationClasses, Error> {
67-
let mut resolved_authentication_classes: Vec<core::v1alpha1::AuthenticationClass> = vec![];
67+
let mut dereferenced_authentication_classes: Vec<core::v1alpha1::AuthenticationClass> =
68+
vec![];
6869

6970
for auth_class in auth_classes {
70-
resolved_authentication_classes.push(
71+
dereferenced_authentication_classes.push(
7172
core::v1alpha1::AuthenticationClass::resolve(
7273
client,
7374
&auth_class.authentication_class,
@@ -82,30 +83,32 @@ impl DereferencedAuthenticationClasses {
8283
}
8384

8485
Ok(DereferencedAuthenticationClasses {
85-
resolved_authentication_classes,
86+
dereferenced_authentication_classes,
8687
})
8788
}
8889

8990
/// Return the (first) TLS `AuthenticationClass` if available
9091
pub fn get_tls_authentication_class(&self) -> Option<&core::v1alpha1::AuthenticationClass> {
91-
self.resolved_authentication_classes.iter().find(|auth| {
92-
matches!(
93-
auth.spec.provider,
94-
core::v1alpha1::AuthenticationClassProvider::Tls(_)
95-
)
96-
})
92+
self.dereferenced_authentication_classes
93+
.iter()
94+
.find(|auth| {
95+
matches!(
96+
auth.spec.provider,
97+
core::v1alpha1::AuthenticationClassProvider::Tls(_)
98+
)
99+
})
97100
}
98101

99102
/// Validates the dereferenced AuthenticationClasses.
100103
/// Currently errors out if:
101104
/// - More than one AuthenticationClass was provided
102105
/// - AuthenticationClass mechanism was not supported
103106
pub fn validate(&self) -> Result<Self, Error> {
104-
if self.resolved_authentication_classes.len() > 1 {
107+
if self.dereferenced_authentication_classes.len() > 1 {
105108
return Err(Error::MultipleAuthenticationClassesProvided);
106109
}
107110

108-
for auth_class in &self.resolved_authentication_classes {
111+
for auth_class in &self.dereferenced_authentication_classes {
109112
match &auth_class.spec.provider {
110113
core::v1alpha1::AuthenticationClassProvider::Tls(_) => {}
111114
core::v1alpha1::AuthenticationClassProvider::Ldap(_)
@@ -126,7 +129,7 @@ impl DereferencedAuthenticationClasses {
126129
/// USE ONLY IN TESTS! We can not put it behind `#[cfg(test)]` because of <https://github.com/rust-lang/cargo/issues/8379>
127130
pub fn new_for_tests() -> Self {
128131
DereferencedAuthenticationClasses {
129-
resolved_authentication_classes: vec![],
132+
dereferenced_authentication_classes: vec![],
130133
}
131134
}
132135
}

0 commit comments

Comments
 (0)