Apply suggestions from code review

Co-authored-by: Lorenzo Affetti <lorenzo.affetti@gmail.com>

Author: morazow

helm/templates/_security.tpl

@@ -33,9 +33,9 @@ Usage:
 Returns the ZooKeeper SASL authentication mechanism value.
 Allowed mechanism values: '', 'plain'
 Usage:
-  include "fluss.security.zookeeper.mechanism" .
+  include "fluss.security.zookeeper.sasl.mechanism" .
 */}}
-{{- define "fluss.security.zookeeper.mechanism" -}}
+{{- define "fluss.security.zookeeper.sasl.mechanism" -}}
 {{- $sasl := .Values.security.zookeeper.sasl | default (dict) -}}
 {{- $mechanism := lower (default "" $sasl.mechanism) -}}
 {{- $mechanism -}}
@@ -47,7 +47,7 @@ Usage:
   include "fluss.security.zookeeper.sasl.enabled" .
 */}}
 {{- define "fluss.security.zookeeper.sasl.enabled" -}}
-{{- $mechanism := include "fluss.security.zookeeper.mechanism" . -}}
+{{- $mechanism := include "fluss.security.zookeeper.sasl.mechanism" . -}}
 {{- if ne $mechanism "" -}}true{{- end -}}
 {{- end -}}
 
@@ -143,11 +143,11 @@ Usage:
 Validates that ZooKeeper SASL mechanism is valid.
 Returns an error message if invalid, empty string otherwise.
 Usage:
-  include "fluss.security.sasl.validateZookeeperMechanism" .
+  include "fluss.security.zookeeper.sasl.validateMechanism" .
 */}}
-{{- define "fluss.security.sasl.validateZookeeperMechanism" -}}
+{{- define "fluss.security.zookeeper.sasl.validateMechanism" -}}
 {{- $allowedMechanisms := list "" "plain" -}}
-{{- $mechanism := include "fluss.security.zookeeper.mechanism" . -}}
+{{- $mechanism := include "fluss.security.zookeeper.sasl.mechanism" . -}}
 {{- if not (has $mechanism $allowedMechanisms) -}}
   {{- print "security.zookeeper.sasl.mechanism must be empty or: plain" -}}
 {{- end -}}
@@ -157,9 +157,9 @@ Usage:
 Validates that ZooKeeper SASL loginModuleClass is not empty when ZK SASL is enabled.
 Returns an error message if invalid, empty string otherwise.
 Usage:
-  include "fluss.security.sasl.validateZookeeperLoginModuleClass" .
+  include "fluss.security.zookeeper.sasl.validateLoginModuleClass" .
 */}}
-{{- define "fluss.security.sasl.validateZookeeperLoginModuleClass" -}}
+{{- define "fluss.security.zookeeper.sasl.validateLoginModuleClass" -}}
 {{- if and (include "fluss.security.zookeeper.sasl.enabled" .) (not .Values.security.zookeeper.sasl.plain.loginModuleClass) -}}
   {{- print "security.zookeeper.sasl.plain.loginModuleClass must not be empty when security.zookeeper.sasl.mechanism is plain" -}}
 {{- end -}}
@@ -169,9 +169,9 @@ Usage:
 Validates that ZooKeeper SASL username is not empty when ZK SASL is enabled.
 Returns an error message if invalid, empty string otherwise.
 Usage:
-  include "fluss.security.sasl.validateZookeeperUsername" .
+  include "fluss.security.zookeeper.sasl.validateUsername" .
 */}}
-{{- define "fluss.security.sasl.validateZookeeperUsername" -}}
+{{- define "fluss.security.zookeeper.sasl.validateUsername" -}}
 {{- if and (include "fluss.security.zookeeper.sasl.enabled" .) (not .Values.security.zookeeper.sasl.plain.username) -}}
   {{- print "security.zookeeper.sasl.plain.username must not be empty when security.zookeeper.sasl.mechanism is plain" -}}
 {{- end -}}
@@ -181,9 +181,9 @@ Usage:
 Validates that ZooKeeper SASL password is not empty when ZK SASL is enabled.
 Returns an error message if invalid, empty string otherwise.
 Usage:
-  include "fluss.security.sasl.validateZookeeperPassword" .
+  include "fluss.security.zookeeper.sasl.validatePassword" .
 */}}
-{{- define "fluss.security.sasl.validateZookeeperPassword" -}}
+{{- define "fluss.security.zookeeper.sasl.validatePassword" -}}
 {{- if and (include "fluss.security.zookeeper.sasl.enabled" .) (not .Values.security.zookeeper.sasl.plain.password) -}}
   {{- print "security.zookeeper.sasl.plain.password must not be empty when security.zookeeper.sasl.mechanism is plain" -}}
 {{- end -}}
@@ -262,10 +262,10 @@ Usage:
 {{- $errMessages := list -}}
 {{- $errMessages = append $errMessages (include "fluss.security.sasl.validateMechanisms" .) -}}
 {{- $errMessages = append $errMessages (include "fluss.security.sasl.validateClientPlainUsers" .) -}}
-{{- $errMessages = append $errMessages (include "fluss.security.sasl.validateZookeeperMechanism" .) -}}
-{{- $errMessages = append $errMessages (include "fluss.security.sasl.validateZookeeperLoginModuleClass" .) -}}
-{{- $errMessages = append $errMessages (include "fluss.security.sasl.validateZookeeperUsername" .) -}}
-{{- $errMessages = append $errMessages (include "fluss.security.sasl.validateZookeeperPassword" .) -}}
+{{- $errMessages = append $errMessages (include "fluss.security.zookeeper.sasl.validateMechanism" .) -}}
+{{- $errMessages = append $errMessages (include "fluss.security.zookeeper.sasl.validateLoginModuleClass" .) -}}
+{{- $errMessages = append $errMessages (include "fluss.security.zookeeper.sasl.validateUsername" .) -}}
+{{- $errMessages = append $errMessages (include "fluss.security.zookeeper.sasl.validatePassword" .) -}}
 
 {{- $errMessages = without $errMessages "" -}}
 {{- $errMessage := join "\n" $errMessages -}}