Rename ValidatedSecurity::config to settings

Author: siegfriedweber

rust/operator-binary/src/controller.rs

@@ -184,7 +184,7 @@ impl ValidatedLogging {
 #[derive(Clone, Debug, PartialEq)]
 pub struct ValidatedSecurity {
     pub managing_role_group: Option<RoleGroupName>,
-    pub config: v1alpha1::SecurityConfig,
+    pub settings: v1alpha1::SecurityConfig,
     pub tls: v1alpha1::OpenSearchTls,
 }
 
@@ -577,7 +577,7 @@ mod tests {
             .into(),
             Some(ValidatedSecurity {
                 managing_role_group: None,
-                config: v1alpha1::SecurityConfig::default(),
+                settings: v1alpha1::SecurityConfig::default(),
                 tls: v1alpha1::OpenSearchTls::default(),
             }),
             vec![],

rust/operator-binary/src/controller/build/node_config.rs

@@ -242,9 +242,9 @@ impl NodeConfig {
         if let Some(security) = &self.cluster.security {
             config.insert(
                 CONFIG_OPTION_PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX.to_owned(),
-                json!(security.config.is_only_managed_by_api()),
+                json!(security.settings.is_only_managed_by_api()),
             );
-            if !security.config.is_only_managed_by_api() {
+            if !security.settings.is_only_managed_by_api() {
                 config.insert(
                     CONFIG_OPTION_PLUGINS_SECURITY_AUTHCZ_ADMIN_DN.to_owned(),
                     json!(self.super_admin_dn()),
@@ -628,7 +628,7 @@ mod tests {
             .into(),
             Some(ValidatedSecurity {
                 managing_role_group: Some(RoleGroupName::from_str_unsafe("default")),
-                config: v1alpha1::SecurityConfig {
+                settings: v1alpha1::SecurityConfig {
                     config: v1alpha1::SecurityConfigFileType {
                         managed_by: v1alpha1::SecurityConfigFileTypeManagedBy::Operator,
                         content: v1alpha1::SecurityConfigFileTypeContent::ValueFrom(

rust/operator-binary/src/controller/build/role_builder.rs

@@ -429,7 +429,7 @@ mod tests {
             .into(),
             Some(ValidatedSecurity {
                 managing_role_group: None,
-                config: v1alpha1::SecurityConfig::default(),
+                settings: v1alpha1::SecurityConfig::default(),
                 tls: v1alpha1::OpenSearchTls::default(),
             }),
             vec![],

rust/operator-binary/src/controller/build/role_group_builder.rs

@@ -211,7 +211,7 @@ impl<'a> RoleGroupBuilder<'a> {
             && self.security_managing_container(security).is_some()
         {
             for file_type in SecurityConfigFileType::iter() {
-                if let Some(value) = security.config.value(file_type) {
+                if let Some(value) = security.settings.value(file_type) {
                     data.insert(file_type.filename(), value.to_string());
                 }
             }
@@ -442,7 +442,7 @@ impl<'a> RoleGroupBuilder<'a> {
 
             if self.security_managing_container(security).is_some() {
                 volumes.extend(RoleGroupBuilder::security_config_volumes(
-                    &security.config,
+                    &security.settings,
                     self.resource_names.role_group_config_map(),
                 ));
             }
@@ -737,7 +737,7 @@ cp --archive config/opensearch.keystore {OPENSEARCH_INITIALIZED_KEYSTORE_DIRECTO
             );
 
         for file_type in SecurityConfigFileType::iter() {
-            let managed_by_operator = security.config.security_config(file_type).managed_by
+            let managed_by_operator = security.settings.security_config(file_type).managed_by
                 == v1alpha1::SecurityConfigFileTypeManagedBy::Operator;
 
             env_vars = env_vars.with_value(
@@ -1332,7 +1332,7 @@ mod tests {
             .into(),
             Some(ValidatedSecurity {
                 managing_role_group: None,
-                config: v1alpha1::SecurityConfig::default(),
+                settings: v1alpha1::SecurityConfig::default(),
                 tls: v1alpha1::OpenSearchTls::default(),
             }),
             vec![v1alpha1::OpenSearchKeystore {

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

@@ -313,7 +313,7 @@ fn validate_security_config(
 
         Some(ValidatedSecurity {
             managing_role_group,
-            config: spec.cluster_config.security.settings.clone(),
+            settings: spec.cluster_config.security.settings.clone(),
             tls: spec.cluster_config.tls.clone(),
         })
     } else {
@@ -659,7 +659,7 @@ mod tests {
                 .into(),
                 Some(ValidatedSecurity {
                     managing_role_group: Some(RoleGroupName::from_str_unsafe("default")),
-                    config: v1alpha1::SecurityConfig {
+                    settings: v1alpha1::SecurityConfig {
                         config: v1alpha1::SecurityConfigFileType {
                             managed_by: v1alpha1::SecurityConfigFileTypeManagedBy::Operator,
                             content: v1alpha1::SecurityConfigFileTypeContent::ValueFrom(