[confcom] Fix lint errors

Author: MahatiC

src/confcom/azext_confcom/container.py

@@ -795,7 +795,6 @@ def _populate_policy_json_elements(self, omit_id: bool = False) -> Dict[str, Any
             if self._mounted_cim:
                 elements[config.POLICY_FIELD_CONTAINERS_ELEMENTS_MOUNTED_CIM] = self._mounted_cim
 
-
         if not omit_id:
             elements[config.POLICY_FIELD_CONTAINERS_ID] = self._identifier
         # if we are omitting the id, we should remove the id value from the policy if it's in the name field
@@ -822,7 +821,10 @@ def from_json(
             image.get_mounts().extend(_DEFAULT_MOUNTS_VN2)
 
         # Start with the customer environment rules
-        env_rules = copy.deepcopy(_INJECTED_CUSTOMER_ENV_RULES) if container_json["platform"].startswith("linux") else dict()
+        env_rules = (
+            copy.deepcopy(_INJECTED_CUSTOMER_ENV_RULES)
+            if container_json["platform"].startswith("linux") else dict()
+        )
         # If is_vn2, add the VN2 environment rules
         if is_vn2:
             env_rules += _INJECTED_SERVICE_VN2_ENV_RULES

src/confcom/azext_confcom/lib/containers.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from typing import Optional
+
 from dataclasses import asdict
 from azext_confcom.lib.images import get_image_layers, get_image_config, get_image_platform
 from azext_confcom.lib.platform import ACI_MOUNTS, VN2_MOUNTS

src/confcom/azext_confcom/lib/defaults.py

@@ -1,13 +1,13 @@
 from azext_confcom import config
 
+
 def get_debug_mode_exec_procs(debug_mode: bool, platform: str) -> list:
 
     if not debug_mode:
         return []
 
     if platform.startswith("linux"):
         return config.DEBUG_MODE_SETTINGS.get(config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES)
-    elif platform.startswith("windows"):
+    if platform.startswith("windows"):
         return config.DEBUG_MODE_SETTINGS_WINDOWS.get(config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES)
-    else:
-        raise ValueError(f"Unsupported platform for debug mode settings: {platform}")
+    raise ValueError(f"Unsupported platform for debug mode settings: {platform}")

src/confcom/azext_confcom/rootfs_proxy.py

@@ -85,7 +85,7 @@ def __init__(self):
             st = os.stat(self.policy_bin)
             os.chmod(self.policy_bin, st.st_mode | stat.S_IXUSR)
 
-    def get_policy_image_layers(
+    def get_policy_image_layers(  # pylint: disable=redefined-outer-name
         self,
         image: str,
         tag: str,
@@ -149,7 +149,7 @@ def get_policy_image_layers(
                     if "mounted_cim" in json_output:
                         result["mounted_cim"] = json_output["mounted_cim"]
                 except json.JSONDecodeError as e:
-                    logger.error(f"Failed to parse JSON output: {e}")
+                    logger.error("Failed to parse JSON output: %s", e)
                     sys.exit(1)
             else:
                 # Fallback: line-by-line parsing for older dmverity-vhd versions

src/confcom/azext_confcom/security_policy.py

@@ -236,7 +236,7 @@ def _add_rego_boilerplate(self, output: str) -> str:
                 pretty_print_func(self._allow_unencrypted_scratch),
                 pretty_print_func(self._allow_capability_dropping),
             )
-        elif self._platform.startswith("windows"):
+        if self._platform.startswith("windows"):
             return config.CUSTOMER_REGO_POLICY_WINDOWS % (
                 pretty_print_func(self._api_version),
                 pretty_print_func(sanitized_fragments),
@@ -841,7 +841,9 @@ def load_policy_from_arm_template_str(
                     or [],
                     config.ACI_FIELD_CONTAINERS_MOUNTS: process_mounts(image_properties, volumes)
                     + process_configmap(image_properties),
-                    config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES: exec_processes + get_debug_mode_exec_procs(debug_mode, platform),
+                    config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES: (
+                        exec_processes + get_debug_mode_exec_procs(debug_mode, platform)
+                    ),
                     config.ACI_FIELD_CONTAINERS_SIGNAL_CONTAINER_PROCESSES: [],
                     config.ACI_FIELD_CONTAINERS_ALLOW_STDIO_ACCESS: not disable_stdio,
                     config.ACI_FIELD_CONTAINERS_SECURITY_CONTEXT: case_insensitive_dict_get(
@@ -1081,7 +1083,9 @@ def load_policy_from_json(
                     container_properties, config.ACI_FIELD_TEMPLATE_COMMAND
                 ) or [],
                 config.ACI_FIELD_CONTAINERS_MOUNTS: mounts,
-                config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES: exec_processes + get_debug_mode_exec_procs(debug_mode, platform),
+                config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES: (
+                    exec_processes + get_debug_mode_exec_procs(debug_mode, platform)
+                ),
                 config.ACI_FIELD_CONTAINERS_SIGNAL_CONTAINER_PROCESSES: [],
                 config.ACI_FIELD_CONTAINERS_ALLOW_STDIO_ACCESS: not disable_stdio,
                 config.ACI_FIELD_CONTAINERS_SECURITY_CONTEXT: case_insensitive_dict_get(
@@ -1351,7 +1355,9 @@ def load_policy_from_virtual_node_yaml_str(
                     config.ACI_FIELD_TEMPLATE_ENTRYPOINT: command,
                     config.ACI_FIELD_CONTAINERS_COMMAND: args,
                     config.ACI_FIELD_CONTAINERS_MOUNTS: mounts,
-                    config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES: exec_processes + get_debug_mode_exec_procs(debug_mode, platform),
+                    config.ACI_FIELD_CONTAINERS_EXEC_PROCESSES: (
+                        exec_processes + get_debug_mode_exec_procs(debug_mode, platform)
+                    ),
                     config.ACI_FIELD_CONTAINERS_SIGNAL_CONTAINER_PROCESSES: [],
                     config.ACI_FIELD_CONTAINERS_ALLOW_STDIO_ACCESS: not disable_stdio,
                     config.ACI_FIELD_CONTAINERS_SECURITY_CONTEXT: security_context,