Skip to content

Commit 54cf547

Browse files
committed
fix: rename resolved_authentication_classes to authentication_classes in dereference step.
1 parent 0e9329a commit 54cf547

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

rust/operator-binary/src/zk_controller/dereference.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ type Result<T, E = Error> = std::result::Result<T, E>;
2424
/// Kubernetes objects referenced from the [`v1alpha1::ZookeeperCluster`] spec, already fetched but
2525
/// not yet validated.
2626
pub struct DereferencedObjects {
27-
pub resolved_authentication_classes: ResolvedAuthenticationClasses,
27+
pub authentication_classes: ResolvedAuthenticationClasses,
2828
}
2929

3030
/// Fetches all Kubernetes objects referenced from the [`v1alpha1::ZookeeperCluster`] spec.
3131
pub async fn dereference(
3232
client: &Client,
3333
zk: &v1alpha1::ZookeeperCluster,
3434
) -> Result<DereferencedObjects> {
35-
let resolved_authentication_classes = ResolvedAuthenticationClasses::fetch_references(
35+
let authentication_classes = ResolvedAuthenticationClasses::fetch_references(
3636
client,
3737
&zk.spec.cluster_config.authentication,
3838
)
3939
.await
4040
.context(FetchAuthenticationClassesSnafu)?;
4141

4242
Ok(DereferencedObjects {
43-
resolved_authentication_classes,
43+
authentication_classes,
4444
})
4545
}

rust/operator-binary/src/zk_controller/validate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pub fn validate(
7373
.context(ResolveProductImageSnafu)?;
7474

7575
let resolved_authentication_classes = dereferenced_objects
76-
.resolved_authentication_classes
76+
.authentication_classes
7777
.validate()
7878
.context(InvalidAuthenticationClassConfigurationSnafu)?;
7979

rust/operator-binary/src/znode_controller.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ pub async fn reconcile_znode(
267267
// block finalizer removal.
268268
let zookeeper_security = ZookeeperSecurity::new(
269269
&dereferenced.zk,
270-
dereferenced.resolved_authentication_classes.clone(),
270+
dereferenced.authentication_classes.clone(),
271271
);
272272
reconcile_cleanup(client, dereferenced.zk, &zookeeper_security, &znode_path)
273273
.await

rust/operator-binary/src/znode_controller/dereference.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type Result<T, E = Error> = std::result::Result<T, E>;
4242
/// Kubernetes objects referenced from the [`v1alpha1::ZookeeperZnode`] spec, already fetched.
4343
pub struct DereferencedObjects {
4444
pub zk: v1alpha1::ZookeeperCluster,
45-
pub resolved_authentication_classes: ResolvedAuthenticationClasses,
45+
pub authentication_classes: ResolvedAuthenticationClasses,
4646
}
4747

4848
/// Fetches all Kubernetes objects referenced from the [`v1alpha1::ZookeeperZnode`] spec.
@@ -52,7 +52,7 @@ pub async fn dereference(
5252
) -> Result<DereferencedObjects> {
5353
let zk = find_zk_of_znode(client, znode).await?;
5454

55-
let resolved_authentication_classes = ResolvedAuthenticationClasses::fetch_references(
55+
let authentication_classes = ResolvedAuthenticationClasses::fetch_references(
5656
client,
5757
&zk.spec.cluster_config.authentication,
5858
)
@@ -61,7 +61,7 @@ pub async fn dereference(
6161

6262
Ok(DereferencedObjects {
6363
zk,
64-
resolved_authentication_classes,
64+
authentication_classes,
6565
})
6666
}
6767

rust/operator-binary/src/znode_controller/validate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub fn validate(
5151
.context(ResolveProductImageSnafu)?;
5252

5353
let resolved_authentication_classes = dereferenced_objects
54-
.resolved_authentication_classes
54+
.authentication_classes
5555
.validate()
5656
.context(InvalidAuthenticationClassConfigurationSnafu)?;
5757

0 commit comments

Comments
 (0)