@@ -222,13 +222,16 @@ impl ResolvedNifiAuthorizationConfig {
222222 authorizers_xml
223223 }
224224
225+ /// Returns the expected subject DNs of the NiFi nodes
225226 fn nifi_node_subject_dns (
226227 nifi_cluster : & v1alpha1:: NifiCluster ,
227228 cluster_info : & KubernetesClusterInfo ,
228229 ) -> Vec < String > {
229- let namespace = nifi_cluster. namespace ( ) . expect ( "" ) ;
230+ let namespace = nifi_cluster
231+ . namespace ( )
232+ . expect ( "a NifiCluster must reside in a namespace" ) ;
230233
231- let mut dns = vec ! [ ] ;
234+ let mut distinguished_names = vec ! [ ] ;
232235
233236 let role_groups = nifi_cluster
234237 . spec
@@ -240,15 +243,10 @@ impl ResolvedNifiAuthorizationConfig {
240243 for ( role_group_name, role_group) in role_groups {
241244 let role_group_ref = nifi_cluster. node_rolegroup_ref ( role_group_name) ;
242245
243- let pod_generate_name = format ! (
244- "{}-" ,
245- nifi_cluster
246- . node_rolegroup_ref( role_group_name)
247- . object_name( )
248- ) ;
246+ let pod_generate_name = format ! ( "{}-" , role_group_ref. object_name( ) ) ;
249247
250248 for ordinal in 0 ..role_group. replicas . unwrap_or ( 1 ) {
251- let dc = cluster_info
249+ let domain_components = cluster_info
252250 . cluster_domain
253251 . split ( '.' )
254252 . rev ( )
@@ -260,17 +258,17 @@ impl ResolvedNifiAuthorizationConfig {
260258 ] )
261259 . map ( |component| format ! ( "DC={component}" ) )
262260 . collect :: < Vec < _ > > ( ) ;
263- let cn = "CN=generated certificate for pod" ;
261+ let common_name = "CN=generated certificate for pod" ;
264262
265- let mut dn = dc ;
266- dn . push ( cn . to_owned ( ) ) ;
267- let dn = dn . join ( ", " ) ;
263+ let mut distinguished_name = domain_components ;
264+ distinguished_name . push ( common_name . to_owned ( ) ) ;
265+ let distinguished_name_string = distinguished_name . join ( ", " ) ;
268266
269- dns . push ( dn ) ;
267+ distinguished_names . push ( distinguished_name_string ) ;
270268 }
271269 }
272270
273- dns
271+ distinguished_names
274272 }
275273
276274 pub fn get_env_vars ( & self ) -> Vec < EnvVar > {
0 commit comments