Fix mypy3

bridgecrewio · Jan 15, 2025 · c0ae911 · c0ae911
1 parent bb1970c
commit c0ae911
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/checkov/arm/checks/resource/AKSMaxPodsMinimum.py b/checkov/arm/checks/resource/AKSMaxPodsMinimum.py
@@ -23,8 +23,8 @@ def scan_resource_conf(self, conf: dict[str, Any]) -> CheckResult:
 
         max_pods = properties.get("maxPods")
 
-        if "agentPoolProfiles" in properties and isinstance(properties["agentPoolProfiles"], list) and properties[
-            "agentPoolProfiles"]:
+        if ("agentPoolProfiles" in properties and isinstance(properties["agentPoolProfiles"], list) and
+                properties["agentPoolProfiles"]):
             agent_pool = properties["agentPoolProfiles"][0]
             if isinstance(agent_pool, dict) and "maxPods" in agent_pool:
                 max_pods = agent_pool["maxPods"]

diff --git a/checkov/secrets/scan_git_history.py b/checkov/secrets/scan_git_history.py
@@ -241,6 +241,8 @@ def _get_first_commit(self) -> Commit:
 
         for file_diff in git_diff:
             file_name = file_diff.b_path
+            if not file_name:  # Add null check
+                continue
             if file_name.endswith(FILES_TO_IGNORE_IN_GIT_HISTORY):
                 continue
             file_path = os.path.join(self.root_folder, file_name)
@@ -250,9 +252,11 @@ def _get_first_commit(self) -> Commit:
         return first_commit_diff
 
     @staticmethod
-    def get_decoded_diff(diff: bytes | None) -> str:
+    def get_decoded_diff(diff: str | bytes | None) -> str:
         if not diff:
             return ''
+        if isinstance(diff, str):
+            return diff
         try:
             decoded_diff = diff.decode('utf-8')
         except UnicodeDecodeError as ue: