Improve secret fields detection.

Now the `_flags` fields must have a corresponding field without
`_flags` suffix.
Fixes several fields which were not secret but mark as is.

sdbus_async/networkmanager/settings/connection.py

@@ -3,15 +3,13 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import List, Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class ConnectionSettings(NetworkManagerSettingsMixin):
     """General Connection Profile Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['mptcp']
-    secret_name = 'connection'
 
     auth_retries: Optional[int] = field(
         metadata={

sdbus_async/networkmanager/settings/dcb.py

@@ -10,7 +10,7 @@
 @dataclass
 class DcbSettings(NetworkManagerSettingsMixin):
     """Data Center Bridging Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['app_fcoe', 'app_fip', 'app_iscsi', 'priority_flow_control', 'priority_group']
+    secret_fields_names: ClassVar[List[str]] = ['priority_flow_control']
     secret_name = 'dcb'
 
     app_fcoe_flags: Optional[int] = field(

sdbus_async/networkmanager/settings/eapol.py

@@ -10,7 +10,7 @@
 @dataclass
 class EapolSettings(NetworkManagerSettingsMixin):
     """IEEE 802.1x Authentication Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['ca_cert_password', 'client_cert_password', 'password', 'password_raw', 'phase1_auth', 'phase2_ca_cert_password', 'phase2_client_cert_password', 'phase2_private_key_password', 'pin', 'private_key_password']
+    secret_fields_names: ClassVar[List[str]] = ['ca_cert_password', 'client_cert_password', 'password', 'password_raw', 'phase2_ca_cert_password', 'phase2_client_cert_password', 'phase2_private_key_password', 'pin', 'private_key_password']
     secret_name = '802-1x'
 
     altsubject_matches: Optional[List[str]] = field(

sdbus_async/networkmanager/settings/wireless_security.py

@@ -10,7 +10,7 @@
 @dataclass
 class WirelessSecuritySettings(NetworkManagerSettingsMixin):
     """Wi-Fi Security Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['leap_password', 'psk', 'wep_key']
+    secret_fields_names: ClassVar[List[str]] = ['leap_password', 'psk']
     secret_name = '802-11-wireless-security'
 
     auth_alg: Optional[str] = field(

tools/generate-settings-dataclasses-jinja.py

@@ -24,7 +24,7 @@
 from typing import List, Optional, Set
 from xml.etree.ElementTree import Element, parse
 
-from jinja2 import Environment, FileSystemLoader
+from jinja2 import Environment, FileSystemLoader, StrictUndefined
 
 dbus_to_python_extra_typing_imports = {
     "as": ("List", ),
@@ -150,7 +150,7 @@ def __init__(self, name: str, description: str, name_upper: str,
         self.properties: List[NmSettingPropertyIntrospection] = []
 
     @cached_property
-    def typing_imports(self) -> List[str]:
+    def typing_imports(self) -> Set[str]:
         typing_imports: Set[str] = self.properties_want_imports.copy()
 
         if self.secret_fields:
@@ -198,14 +198,19 @@ def is_optional_setting(self) -> bool:
         return True
 
     @cached_property
-    def secret_fields(self) -> List[str]:
-        secret_fields: List[str] = []
+    def secret_fields(self) -> Set[str]:
+        all_fields: Set[str] = set()
+        possible_secret_fields: Set[str] = set()
 
         for x in self.properties:
+
             if x.python_name.endswith('_flags') and x.python_type == 'int':
-                secret_fields.append(x.python_name.removesuffix('_flags'))
+                possible_secret_fields.add(
+                    x.python_name.removesuffix('_flags'))
+            else:
+                all_fields.add(x.python_name)
 
-        return secret_fields
+        return all_fields.intersection(possible_secret_fields)
 
 
 def extract_docbook_paragraphs(docbook_node: Element) -> List[str]:
@@ -307,6 +312,7 @@ def main(
 ) -> None:
     jinja_env = Environment(
         loader=FileSystemLoader(Path('./tools/jinja_templates/')),
+        undefined=StrictUndefined,
     )
     settings_template = jinja_env.get_template('setting.py.jinja2')