update ruff and mypy and fix issues

Author: gruebel

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
 #      - id: terraform_docs
 #        args: ['--sort-by-required', '--no-providers']
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.5.3
     hooks:
       - id: ruff
         files: ^policy_sentry/

policy_sentry/command/create_template.py

@@ -54,13 +54,13 @@ def create_template(output_file: str | Path, template_type: str, verbose: str) -
     filename = Path(output_file).resolve()
     if template_type == "actions":
         actions_template = create_actions_template()
-        with open(filename, "a") as file_obj:
+        with open(filename, "a", encoding="utf-8") as file_obj:
             for line in actions_template:
                 file_obj.write(line)
 
     if template_type == "crud":
         crud_template = create_crud_template()
-        with open(filename, "a") as file_obj:
+        with open(filename, "a", encoding="utf-8") as file_obj:
             for line in crud_template:
                 file_obj.write(line)
 

policy_sentry/command/write_policy.py

@@ -53,12 +53,12 @@ def parse_args(self, ctx: Context, args: list[str]) -> list[str]:
             if a_tuple[0] in prefixes:
                 if len(a_tuple) > 1:
                     args[i] = a_tuple[0]
-                    args.insert(i + 1, a_tuple[0] + "_length=" + a_tuple[1])
+                    args.insert(i + 1, a_tuple[0] + "_length=" + a_tuple[1])  # noqa: B909
                 else:
                     # check if next argument is naked
                     if len(args) > i + 1 and not args[i + 1].startswith("--"):
                         value = args[i + 1]
-                        args[i + 1] = a_tuple[0] + "_length=" + value
+                        args[i + 1] = a_tuple[0] + "_length=" + value  # noqa: B909
         return super().parse_args(ctx, args)
 
 

policy_sentry/shared/awsdocs.py

@@ -131,7 +131,9 @@ def update_html_docs_directory(html_docs_destination: str) -> None:
                 logger.warning(a_e)
                 logger.warning(script)
 
-        with open(os.path.join(html_docs_destination, page), "w") as file:
+        with open(
+            os.path.join(html_docs_destination, page), "w", encoding="utf-8"
+        ) as file:
             # file.write(str(soup.html))
             file.write(str(soup.prettify()))
             file.close()
@@ -449,6 +451,6 @@ def create_database(
         # schema.update(this_service_schema)
 
     iam_definition_file = os.path.join(destination_directory, "iam-definition.json")
-    with open(iam_definition_file, "w") as file:
+    with open(iam_definition_file, "w", encoding="utf-8") as file:
         json.dump(schema, file, indent=2)
-    logger.info("Wrote IAM definition file to path: ", iam_definition_file)
+    logger.info(f"Wrote IAM definition file to path: {iam_definition_file}")

policy_sentry/util/file.py

@@ -20,7 +20,7 @@ def read_yaml_file(filename: str | Path) -> dict[str, Any]:
     :param filename: name of the yaml file
     :return: dictionary of YAML file contents
     """
-    with open(filename) as yaml_file:
+    with open(filename, encoding="utf-8") as yaml_file:
         try:
             cfg = cast("dict[str, Any]", yaml.safe_load(yaml_file))
         except yaml.YAMLError as exc:

policy_sentry/util/policy_files.py

@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-import json
 import logging
 from pathlib import Path
 from typing import Any
 
+import orjson
+
 from policy_sentry.querying.actions import get_action_data
 
 logger = logging.getLogger(__name__)
@@ -69,11 +70,10 @@ def get_actions_from_json_policy_file(file: str | Path) -> list[str]:
 
     # FIXME use a try/expect here to validate the json file. I would create a generic json
     try:
-        with open(file) as json_file:
-            # validation function/parser as there is a lot of json floating around
-            # in this tool. [MJ]
-            data = json.load(json_file)
-            actions_list = get_actions_from_policy(data)
+        # validation function/parser as there is a lot of json floating around
+        # in this tool. [MJ]
+        data = orjson.loads(Path(file).read_bytes())
+        actions_list = get_actions_from_policy(data)
     except:  # noqa: E722
         logger.debug("General Error at get_actions_from_json_policy_file.")
         actions_list = []

policy_sentry/writing/minimize.py

@@ -108,9 +108,9 @@ def minimize_statement_actions(
                 continue
             # If the action name is not empty
             if prefix not in denied_prefixes and permission:
-                if prefix not in desired_actions:
-                    prefix = f"{prefix}*"
-                minimized_actions.add(prefix)
+                minimized_actions.add(
+                    prefix if prefix in desired_actions else f"{prefix}*"
+                )
                 found_prefix = True
                 break
 

pyproject.toml

@@ -28,6 +28,8 @@ select = [
     "N",
     "PERF",
     "PIE",
+    "PLE",
+    "PLW",
     "RUF",
     "S",
     "SIM",

requirements-dev.txt

@@ -6,7 +6,7 @@ coverage==7.6.0
 # Integration tests and tasks
 invoke==2.2.0
 # Type hints
-mypy==1.10.1
+mypy==1.11.0
 types-pyyaml==6.0.12.20240311
 types-requests==2.32.0.20240712
 types-beautifulsoup4==4.12.0.20240511