check-msdefender 1.1.2__tar.gz → 1.1.4__tar.gz

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-msdefender
-Version: 1.1.2
+Version: 1.1.4
 Summary: A Nagios plugin for monitoring Microsoft Defender API endpoints
 Keywords: nagios,monitoring,microsoft,graph,api,azure
 Author-Email: ldvchosal <ldvchosal@github.com>
@@ -32,6 +32,7 @@ Requires-Dist: flake8>=3.8; extra == "dev"
 Requires-Dist: mypy>=0.800; extra == "dev"
 Requires-Dist: twine>=6.2.0; extra == "dev"
 Requires-Dist: pdm>=2.0.0; extra == "dev"
+Requires-Dist: ruff>=0.13.0; extra == "dev"
 Description-Content-Type: text/markdown
 
 # 🛡️ Check MS Defender
@@ -294,7 +295,6 @@ source .venv/bin/activate  # Windows: .venv\Scripts\activate
 
 # Install in development mode
 pip install -e .
-pip install -r requirements-dev.txt
 ```
 
 ### Code Quality Tools

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/README.md

@@ -258,7 +258,6 @@ source .venv/bin/activate  # Windows: .venv\Scripts\activate
 
 # Install in development mode
 pip install -e .
-pip install -r requirements-dev.txt
 ```
 
 ### Code Quality Tools

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/cli/decorators.py

@@ -10,7 +10,9 @@ def common_options(func: Callable[..., Any]) -> Callable[..., Any]:
         "-c", "--config", default="check_msdefender.ini", help="Configuration file path"
     )(func)
     func = click.option("-v", "--verbose", count=True, help="Increase verbosity")(func)
-    func = click.option("-m", "--machine-id", "-i", "--id", help="Machine ID (GUID)")(func)
+    func = click.option("-m", "--machine-id", "-i", "--id", help="Machine ID (GUID)")(
+        func
+    )
     func = click.option("-d", "--dns-name", help="Computer DNS Name (FQDN)")(func)
     func = click.option("-W", "--warning", type=float, help="Warning threshold")(func)
     func = click.option("-C", "--critical", type=float, help="Critical threshold")(func)

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/core/auth.py

@@ -20,7 +20,9 @@ def get_authenticator(
     tenant_id = auth_section.get("tenant_id")
 
     if not client_id or not tenant_id:
-        raise ConfigurationError("client_id and tenant_id are required in [auth] section")
+        raise ConfigurationError(
+            "client_id and tenant_id are required in [auth] section"
+        )
 
     # Check for client secret authentication
     client_secret = auth_section.get("client_secret")

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/core/defender.py

@@ -13,7 +13,11 @@ class DefenderClient:
     application_json = "application/json"
 
     def __init__(
-        self, authenticator: Any, timeout: int = 5, region: str = "eu3", verbose_level: int = 0
+        self,
+        authenticator: Any,
+        timeout: int = 5,
+        region: str = "eu",
+        verbose_level: int = 0,
     ) -> None:
         """Initialize with authenticator and optional region.
 
@@ -32,12 +36,12 @@ class DefenderClient:
     def _get_base_url(self, region: str) -> str:
         """Get base URL for the specified region."""
         endpoints = {
-            "eu": "https://api-eu.securitycenter.microsoft.com",
-            "eu3": "https://api-eu3.securitycenter.microsoft.com",
-            "us": "https://api.securitycenter.microsoft.com",
-            "uk": "https://api-uk.securitycenter.microsoft.com",
+            "eu": "https://eu.api.security.microsoft.com",
+            "us": "https://us.api.security.microsoft.com",
+            "uk": "https://uk.api.security.microsoft.com",
+            "api": "https://api.security.microsoft.com",
         }
-        return endpoints.get(region, endpoints["eu3"])
+        return endpoints.get(region, endpoints["eu"])
 
     def get_machine_by_dns_name(self, dns_name: str) -> Dict[str, Any]:
         """Get machine information by DNS name."""
@@ -56,7 +60,9 @@ class DefenderClient:
         try:
             start_time = time.time()
             self.logger.info(f"Querying machine by DNS name: {dns_name}")
-            response = requests.get(url, headers=headers, params=params, timeout=self.timeout)
+            response = requests.get(
+                url, headers=headers, params=params, timeout=self.timeout
+            )
             elapsed = time.time() - start_time
 
             self.logger.api_call("GET", url, response.status_code, elapsed)
@@ -151,7 +157,9 @@ class DefenderClient:
         try:
             start_time = time.time()
             self.logger.info("Querying all machines")
-            response = requests.get(url, headers=headers, params=params, timeout=self.timeout)
+            response = requests.get(
+                url, headers=headers, params=params, timeout=self.timeout
+            )
             elapsed = time.time() - start_time
 
             self.logger.api_call("GET", url, response.status_code, elapsed)
@@ -189,7 +197,9 @@ class DefenderClient:
         try:
             start_time = time.time()
             self.logger.info("Querying alerts")
-            response = requests.get(url, headers=headers, params=params, timeout=self.timeout)
+            response = requests.get(
+                url, headers=headers, params=params, timeout=self.timeout
+            )
             elapsed = time.time() - start_time
 
             self.logger.api_call("GET", url, response.status_code, elapsed)

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/core/logging_config.py

@@ -36,7 +36,8 @@ class VerboseLogger:
         if self.verbose_level >= 3:
             # Full trace format
             formatter = logging.Formatter(
-                "[%(levelname)s] %(asctime)s %(name)s:%(lineno)d - %(message)s", datefmt="%H:%M:%S"
+                "[%(levelname)s] %(asctime)s %(name)s:%(lineno)d - %(message)s",
+                datefmt="%H:%M:%S",
             )
         elif self.verbose_level >= 2:
             # Debug format
@@ -81,7 +82,9 @@ class VerboseLogger:
         """Log API call details if verbose >= 2."""
         if self.verbose_level >= 2:
             if status_code and response_time:
-                self.logger.debug(f"API {method} {url} -> {status_code} ({response_time:.3f}s)")
+                self.logger.debug(
+                    f"API {method} {url} -> {status_code} ({response_time:.3f}s)"
+                )
             else:
                 self.logger.debug(f"API {method} {url}")
 

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/core/nagios.py

@@ -128,7 +128,9 @@ class NagiosPlugin:
 
             # Create Nagios check with custom summary
             # Use 'found' as context name for detail command, otherwise use command name
-            context_name = "found" if self.command_name == "detail" else self.command_name
+            context_name = (
+                "found" if self.command_name == "detail" else self.command_name
+            )
             check = nagiosplugin.Check(
                 DefenderResource(self.command_name, value),
                 DefenderScalarContext(context_name, warning, critical),

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/services/alerts_service.py

@@ -53,12 +53,18 @@ class AlertsService:
             or alert.get("computerDnsName") == target_dns_name
         ]
 
-        self.logger.info(f"Found {len(machine_alerts)} alerts for machine {target_dns_name}")
+        self.logger.info(
+            f"Found {len(machine_alerts)} alerts for machine {target_dns_name}"
+        )
 
         # Categorize alerts by status and severity
-        unresolved_alerts = [alert for alert in machine_alerts if alert.get("status") != "Resolved"]
+        unresolved_alerts = [
+            alert for alert in machine_alerts if alert.get("status") != "Resolved"
+        ]
         informational_alerts = [
-            alert for alert in unresolved_alerts if alert.get("severity") == "Informational"
+            alert
+            for alert in unresolved_alerts
+            if alert.get("severity") == "Informational"
         ]
         critical_warning_alerts = [
             alert
@@ -82,7 +88,9 @@ class AlertsService:
                 title = alert.get("title", "Unknown alert")
                 status = alert.get("status", "Unknown")
                 severity = alert.get("severity", "Unknown")
-                details.append(f"{creation_time} - {title} ({status} {severity.lower()})")
+                details.append(
+                    f"{creation_time} - {title} ({status} {severity.lower()})"
+                )
 
         # Return the number of unresolved alerts as the value
         # This will be used by Nagios plugin for determining status based on thresholds
@@ -93,6 +101,8 @@ class AlertsService:
             "details": details,
         }
 
-        self.logger.info(f"Alert analysis complete: {len(unresolved_alerts)} unresolved alerts")
+        self.logger.info(
+            f"Alert analysis complete: {len(unresolved_alerts)} unresolved alerts"
+        )
         self.logger.method_exit("get_result", result)
         return result

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/services/detail_service.py

@@ -54,10 +54,16 @@ class DetailService:
             # Create detailed output
             details = []
             details.append(f"Machine ID: {machine_details.get('id', 'Unknown')}")
-            details.append(f"Computer Name: {machine_details.get('computerDnsName', 'Unknown')}")
-            details.append(f"OS Platform: {machine_details.get('osPlatform', 'Unknown')}")
+            details.append(
+                f"Computer Name: {machine_details.get('computerDnsName', 'Unknown')}"
+            )
+            details.append(
+                f"OS Platform: {machine_details.get('osPlatform', 'Unknown')}"
+            )
             details.append(f"OS Version: {machine_details.get('osVersion', 'Unknown')}")
-            details.append(f"Health Status: {machine_details.get('healthStatus', 'Unknown')}")
+            details.append(
+                f"Health Status: {machine_details.get('healthStatus', 'Unknown')}"
+            )
             details.append(f"Risk Score: {machine_details.get('riskScore', 'Unknown')}")
 
             result = {"value": 1, "details": details}

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/services/lastseen_service.py

@@ -62,7 +62,9 @@ class LastSeenService:
 
             result = {"value": days_diff, "details": details}
 
-            self.logger.info(f"Machine last seen {days_diff} days ago ({last_seen_str})")
+            self.logger.info(
+                f"Machine last seen {days_diff} days ago ({last_seen_str})"
+            )
             self.logger.method_exit("get_result", result)
             return result
         except (ValueError, TypeError) as e:

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/services/machines_service.py

@@ -23,7 +23,10 @@ class MachinesService:
 
         if not machines_data.get("value"):
             self.logger.info("No machines found")
-            result = {"value": 0, "details": ["No machines found in Microsoft Defender"]}
+            result = {
+                "value": 0,
+                "details": ["No machines found in Microsoft Defender"],
+            }
             self.logger.method_exit("get_result", result)
             return result
 
@@ -39,7 +42,11 @@ class MachinesService:
 
         # Sort by priority
         sorted_machines = sorted(
-            machines, key=lambda x: (status_priority[x["onboardingStatus"]], x["computerDnsName"])
+            machines,
+            key=lambda x: (
+                status_priority[x["onboardingStatus"]],
+                x["computerDnsName"],
+            ),
         )
         for machine in sorted_machines:
             onboarded = "✓" if machine["onboardingStatus"] == "Onboarded" else "✗"

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/services/onboarding_service.py

@@ -54,6 +54,8 @@ class OnboardingService:
 
         result = {"value": result_value, "details": details}
 
-        self.logger.info(f"Machine onboarding status: {onboarding_state} -> {result_value}")
+        self.logger.info(
+            f"Machine onboarding status: {onboarding_state} -> {result_value}"
+        )
         self.logger.method_exit("get_result", result)
         return result

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/check_msdefender/services/vulnerabilities_service.py

@@ -41,7 +41,9 @@ class VulnerabilitiesService:
 
         # Process and deduplicate vulnerabilities
         vulnerabilities = self._process_vulnerabilities(raw_vulnerabilities)
-        self.logger.info(f"Found {len(vulnerabilities)} unique vulnerabilities after deduplication")
+        self.logger.info(
+            f"Found {len(vulnerabilities)} unique vulnerabilities after deduplication"
+        )
 
         # Calculate vulnerability score
         score = VulnerabilityScore()
@@ -54,7 +56,9 @@ class VulnerabilitiesService:
 
         for vuln in sorted_vulnerabilities:
             severity = vuln.severity.lower()
-            self.logger.debug(f"Processing vulnerability {vuln.id} with severity: {severity}")
+            self.logger.debug(
+                f"Processing vulnerability {vuln.id} with severity: {severity}"
+            )
 
             if severity == "critical":
                 score.critical += 1
@@ -75,7 +79,8 @@ class VulnerabilitiesService:
         self.logger.info(f"Total vulnerability score: {score.total_score}")
 
         details.insert(
-            0, f"Vulnerabilities: {len(raw_vulnerabilities)}, score: {score.total_score}"
+            0,
+            f"Vulnerabilities: {len(raw_vulnerabilities)}, score: {score.total_score}",
         )
 
         result = {"value": score.total_score, "details": details}
@@ -125,7 +130,9 @@ class VulnerabilitiesService:
         # Sort by severity
         sorted_vulnerabilities = self._sort_by_severity(vulnerabilities)
 
-        self.logger.method_exit("get_detailed_vulnerabilities", len(sorted_vulnerabilities))
+        self.logger.method_exit(
+            "get_detailed_vulnerabilities", len(sorted_vulnerabilities)
+        )
         return sorted_vulnerabilities
 
     def _process_vulnerabilities(
@@ -156,8 +163,11 @@ class VulnerabilitiesService:
 
         return unique_vulnerabilities
 
-    def _sort_by_severity(self, vulnerabilities: List[Vulnerability]) -> List[Vulnerability]:
+    def _sort_by_severity(
+        self, vulnerabilities: List[Vulnerability]
+    ) -> List[Vulnerability]:
         """Sort vulnerabilities by severity (Critical > High > Medium > Low)."""
         return sorted(
-            vulnerabilities, key=lambda v: self._severity_order.get(v.severity.lower(), 999)
+            vulnerabilities,
+            key=lambda v: self._severity_order.get(v.severity.lower(), 999),
         )

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "check-msdefender"
-version = "1.1.2"
+version = "1.1.4"
 authors = [
     { name = "ldvchosal", email = "ldvchosal@github.com" },
 ]
@@ -52,6 +52,7 @@ dev = [
     "mypy>=0.800",
     "twine>=6.2.0",
     "pdm>=2.0.0",
+    "ruff>=0.13.0",
 ]
 
 [project.urls]
@@ -90,31 +91,27 @@ python_functions = "test_*"
 addopts = "-v"
 
 [tool.pdm.scripts]
-format = "black ."
+format = "ruff format"
 typecheck = "mypy check_msdefender/"
 lint = "flake8 check_msdefender/"
 build = "python -m build"
 publish = "python -m twine upload dist/* --verbose"
 test = "pytest -v tests/"
-msdhelp = "check_msdefender --help"
-msdmachines = "check_msdefender machines"
-msdlastseen = "check_msdefender lastseen -d $MACHINE"
-msddetail = "check_msdefender detail -d $MACHINE"
-msdalerts = "check_msdefender alerts -d $MACHINE"
-msdvulnerabilities = "check_msdefender vulnerabilities -d $MACHINE"
-msdonboarding = "check_msdefender onboarding -d $MACHINE"
+install = "pdm install"
+clihelp = "check_msdefender --help"
+climachines = "check_msdefender machines"
+
+[tool.pdm.scripts.cli]
+composite = [
+    "clihelp",
+    "climachines",
+]
 
 [tool.pdm.scripts.all]
 composite = [
+    "install",
     "format",
     "build",
     "test",
-    "typecheck",
-    "lint",
-]
-
-[tool.pdm.scripts.msdall]
-composite = [
-    "msdhelp",
-    "msdmachines",
+    "cli",
 ]

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/fixtures/mock_defender_client.py

@@ -38,7 +38,9 @@ class MockDefenderClient:
 
     def get_machine_vulnerabilities(self, machine_id):
         """Get vulnerabilities for machine from fixtures."""
-        return self.vulnerability_data["vulnerabilities_by_machine"].get(machine_id, {"value": []})
+        return self.vulnerability_data["vulnerabilities_by_machine"].get(
+            machine_id, {"value": []}
+        )
 
     def get_alerts(self):
         """Get all alerts from fixtures."""

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/fixtures/test_alerts_service.py

@@ -67,7 +67,9 @@ class TestAlertsServiceFixtures:
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
     def test_get_result_nonexistent_dns_name(self):
@@ -135,7 +137,8 @@ class TestAlertsServiceFixtures:
         # Should include alert titles and severity/status
         assert "suspicious activity detected (new high)" in details_text.lower()
         assert (
-            "automated investigation started manually (new informational)" in details_text.lower()
+            "automated investigation started manually (new informational)"
+            in details_text.lower()
         )
 
     def test_dns_name_matching(self):

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/fixtures/test_detail_service.py

@@ -56,7 +56,9 @@ class TestDetailServiceFixtures:
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
     def test_get_result_nonexistent_dns_name(self):
@@ -70,7 +72,9 @@ class TestDetailServiceFixtures:
 
     def test_get_result_nonexistent_machine_id(self):
         """Test error when machine ID doesn't exist."""
-        with pytest.raises(ValidationError, match="Machine not found: nonexistent-machine"):
+        with pytest.raises(
+            ValidationError, match="Machine not found: nonexistent-machine"
+        ):
             self.service.get_result(machine_id="nonexistent-machine")
 
     def test_machine_details_comprehensive(self):
@@ -96,7 +100,9 @@ class TestDetailServiceFixtures:
         ]
 
         for field in expected_fields:
-            assert field in details_dict, f"Field '{field}' missing from machine details"
+            assert field in details_dict, (
+                f"Field '{field}' missing from machine details"
+            )
 
         # Verify specific values for test-machine-3
         assert details_dict["id"] == "test-machine-3"

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/fixtures/test_lastseen_service.py

@@ -44,7 +44,9 @@ class TestLastSeenServiceFixtures:
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
     def test_get_result_nonexistent_dns_name(self):

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/fixtures/test_onboarding_service.py

@@ -43,7 +43,9 @@ class TestOnboardingServiceFixtures:
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
     def test_get_result_nonexistent_dns_name(self):

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/fixtures/test_vulnerabilities_service.py

@@ -41,7 +41,9 @@ class TestVulnerabilitiesServiceFixtures:
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
     def test_get_result_nonexistent_dns_name(self):

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/integration/test_cli_integration.py

@@ -21,7 +21,10 @@ class TestHelpCommand:
         result = cli_runner.invoke(main, ["--help"])
 
         assert result.exit_code == 0
-        assert "Check Microsoft Defender API endpoints and validate values." in result.output
+        assert (
+            "Check Microsoft Defender API endpoints and validate values."
+            in result.output
+        )
         assert "Commands:" in result.output
         assert "lastseen" in result.output
         assert "onboarding" in result.output
@@ -33,7 +36,10 @@ class TestHelpCommand:
         result = cli_runner.invoke(main, ["--help"])
 
         assert result.exit_code == 0
-        assert "Check Microsoft Defender API endpoints and validate values." in result.output
+        assert (
+            "Check Microsoft Defender API endpoints and validate values."
+            in result.output
+        )
 
 
 class TestLastSeenCommand:
@@ -88,7 +94,11 @@ class TestLastSeenCommand:
 
         assert result.exit_code == 0
         mock_plugin.check.assert_called_once_with(
-            machine_id=None, dns_name="machine.domain.tld", warning=7, critical=30, verbose=0
+            machine_id=None,
+            dns_name="machine.domain.tld",
+            warning=7,
+            critical=30,
+            verbose=0,
         )
 
     @patch("check_msdefender.cli.commands.lastseen.load_config")
@@ -129,7 +139,11 @@ class TestOnboardingCommand:
 
         assert result.exit_code == 0
         mock_plugin.check.assert_called_once_with(
-            machine_id=None, dns_name="machine.domain.tld", warning=1, critical=2, verbose=0
+            machine_id=None,
+            dns_name="machine.domain.tld",
+            warning=1,
+            critical=2,
+            verbose=0,
         )
 
     @patch("check_msdefender.cli.commands.onboarding.load_config")
@@ -165,11 +179,17 @@ class TestVulnerabilitiesCommand:
         mock_nagios.return_value = mock_plugin
         mock_plugin.check.return_value = 0
 
-        result = cli_runner.invoke(main, ["vulnerabilities", "-d", "machine.domain.tld"])
+        result = cli_runner.invoke(
+            main, ["vulnerabilities", "-d", "machine.domain.tld"]
+        )
 
         assert result.exit_code == 0
         mock_plugin.check.assert_called_once_with(
-            machine_id=None, dns_name="machine.domain.tld", warning=10, critical=100, verbose=0
+            machine_id=None,
+            dns_name="machine.domain.tld",
+            warning=10,
+            critical=100,
+            verbose=0,
         )
 
     @patch("check_msdefender.cli.commands.vulnerabilities.load_config")
@@ -191,11 +211,17 @@ class TestVulnerabilitiesCommand:
         mock_nagios.return_value = mock_plugin
         mock_plugin.check.return_value = 0
 
-        result = cli_runner.invoke(main, ["vulnerabilities", "-d", "machine.domain.tld", "-v"])
+        result = cli_runner.invoke(
+            main, ["vulnerabilities", "-d", "machine.domain.tld", "-v"]
+        )
 
         assert result.exit_code == 0
         mock_plugin.check.assert_called_once_with(
-            machine_id=None, dns_name="machine.domain.tld", warning=10, critical=100, verbose=1
+            machine_id=None,
+            dns_name="machine.domain.tld",
+            warning=10,
+            critical=100,
+            verbose=1,
         )
 
     @patch("check_msdefender.cli.commands.vulnerabilities.load_config")
@@ -217,11 +243,17 @@ class TestVulnerabilitiesCommand:
         mock_nagios.return_value = mock_plugin
         mock_plugin.check.return_value = 0
 
-        result = cli_runner.invoke(main, ["vulnerabilities", "-d", "machine.domain.tld", "-vvvv"])
+        result = cli_runner.invoke(
+            main, ["vulnerabilities", "-d", "machine.domain.tld", "-vvvv"]
+        )
 
         assert result.exit_code == 0
         mock_plugin.check.assert_called_once_with(
-            machine_id=None, dns_name="machine.domain.tld", warning=10, critical=100, verbose=4
+            machine_id=None,
+            dns_name="machine.domain.tld",
+            warning=10,
+            critical=100,
+            verbose=4,
         )
 
     @patch("check_msdefender.cli.commands.vulnerabilities.load_config")
@@ -229,7 +261,9 @@ class TestVulnerabilitiesCommand:
         """Test vulnerabilities command error handling."""
         mock_config.side_effect = Exception("Service unavailable")
 
-        result = cli_runner.invoke(main, ["vulnerabilities", "-d", "machine.domain.tld"])
+        result = cli_runner.invoke(
+            main, ["vulnerabilities", "-d", "machine.domain.tld"]
+        )
 
         assert result.exit_code == 3
         assert "UNKNOWN: Service unavailable" in result.output
@@ -257,7 +291,9 @@ class TestDetailCommand:
             "value": 1,
             "details": ["Machine ID: test-machine", "Computer Name: test-pc"],
         }
-        mock_service_instance.get_machine_details_json.return_value = '{"id": "test-machine"}'
+        mock_service_instance.get_machine_details_json.return_value = (
+            '{"id": "test-machine"}'
+        )
 
         result = cli_runner.invoke(main, ["detail", "-i", "test-machine-123"])
 
@@ -287,7 +323,9 @@ class TestDetailCommand:
             "value": 1,
             "details": ["Machine ID: test-machine", "Computer Name: test-pc"],
         }
-        mock_service_instance.get_machine_details_json.return_value = '{"id": "test-machine"}'
+        mock_service_instance.get_machine_details_json.return_value = (
+            '{"id": "test-machine"}'
+        )
 
         result = cli_runner.invoke(main, ["detail", "-m", "test-machine-456"])
 
@@ -349,7 +387,9 @@ class TestDetailCommand:
             "details": ["Machine not found with DNS name: nonexistent.domain.com"],
         }
 
-        result = cli_runner.invoke(main, ["detail", "-d", "nonexistent.domain.com", "-W", "0"])
+        result = cli_runner.invoke(
+            main, ["detail", "-d", "nonexistent.domain.com", "-W", "0"]
+        )
 
         assert result.exit_code == 1  # Warning
         assert "DEFENDER WARNING - Machine not found" in result.output
@@ -375,7 +415,9 @@ class TestDetailCommand:
             "details": ["Machine not found with DNS name: nonexistent.domain.com"],
         }
 
-        result = cli_runner.invoke(main, ["detail", "-d", "nonexistent.domain.com", "-C", "0"])
+        result = cli_runner.invoke(
+            main, ["detail", "-d", "nonexistent.domain.com", "-C", "0"]
+        )
 
         assert result.exit_code == 2  # Critical
         assert "DEFENDER CRITICAL - Machine not found" in result.output
@@ -396,6 +438,8 @@ class TestDetailCommand:
         result = cli_runner.invoke(main, ["detail", "--help"])
 
         assert result.exit_code == 0
-        assert "Get detailed machine information from Microsoft Defender." in result.output
+        assert (
+            "Get detailed machine information from Microsoft Defender." in result.output
+        )
         assert "-m, -i, --machine-id, --id TEXT" in result.output
         assert "-d, --dns-name TEXT" in result.output

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/integration/test_lastseen_integration.py

@@ -48,14 +48,26 @@ def test_lastseen_command_success(
     # Execute command
     result = cli_runner.invoke(
         mock_app,
-        ["lastseen", "--machine-id", "test-machine-id", "--warning", "5", "--critical", "10"],
+        [
+            "lastseen",
+            "--machine-id",
+            "test-machine-id",
+            "--warning",
+            "5",
+            "--critical",
+            "10",
+        ],
     )
 
     # Verify result
     assert result.exit_code == 0
     mock_nagios.assert_called_once_with(mock_service_instance, "lastseen")
     mock_plugin.check.assert_called_once_with(
-        machine_id="test-machine-id", dns_name=None, warning=5, critical=10, verbose=False
+        machine_id="test-machine-id",
+        dns_name=None,
+        warning=5,
+        critical=10,
+        verbose=False,
     )
 
 
@@ -66,7 +78,9 @@ def test_lastseen_command_exception(mock_config, cli_runner, mock_app):
     mock_config.side_effect = Exception("Test error")
 
     # Execute command
-    result = cli_runner.invoke(mock_app, ["lastseen", "--machine-id", "test-machine-id"])
+    result = cli_runner.invoke(
+        mock_app, ["lastseen", "--machine-id", "test-machine-id"]
+    )
 
     # Verify error handling
     assert result.exit_code == 3  # Now properly returns exit code 3 for UNKNOWN

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/unit/test_alerts_service.py

@@ -101,7 +101,9 @@ class TestAlertsService:
         assert len(result["details"]) == 2  # Summary line + 1 alert detail
 
         # Should call DNS lookup
-        self.mock_client.get_machine_by_dns_name.assert_called_once_with("test.example.com")
+        self.mock_client.get_machine_by_dns_name.assert_called_once_with(
+            "test.example.com"
+        )
         self.mock_client.get_alerts.assert_called_once()
 
     def test_get_result_by_dns_name_not_found(self):
@@ -113,12 +115,16 @@ class TestAlertsService:
         with pytest.raises(ValidationError, match="Machine not found with DNS name"):
             self.service.get_result(dns_name="nonexistent.domain.com")
 
-        self.mock_client.get_machine_by_dns_name.assert_called_once_with("nonexistent.domain.com")
+        self.mock_client.get_machine_by_dns_name.assert_called_once_with(
+            "nonexistent.domain.com"
+        )
         self.mock_client.get_alerts.assert_not_called()
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
         self.mock_client.get_machine_by_dns_name.assert_not_called()

{check_msdefender-1.1.2 → check_msdefender-1.1.4}/tests/unit/test_detail_service.py

@@ -49,7 +49,10 @@ class TestDetailService:
         """Test successful retrieval by DNS name."""
         # Mock DNS lookup response
         mock_dns_response = {"value": [{"id": "test-machine-456"}]}
-        mock_machine_data = {"id": "test-machine-456", "computerDnsName": "test.domain.com"}
+        mock_machine_data = {
+            "id": "test-machine-456",
+            "computerDnsName": "test.domain.com",
+        }
 
         self.mock_client.get_machine_by_dns_name.return_value = mock_dns_response
         self.mock_client.get_machine_by_id.return_value = mock_machine_data
@@ -60,7 +63,9 @@ class TestDetailService:
         assert result["value"] == 1
 
         # Should call both DNS lookup and machine ID retrieval
-        self.mock_client.get_machine_by_dns_name.assert_called_once_with("test.domain.com")
+        self.mock_client.get_machine_by_dns_name.assert_called_once_with(
+            "test.domain.com"
+        )
         self.mock_client.get_machine_by_id.assert_called_once_with("test-machine-456")
 
     def test_get_result_by_dns_name_not_found(self):
@@ -75,12 +80,16 @@ class TestDetailService:
         assert result["value"] == 0
 
         # Should not call get_machine_by_id since DNS lookup failed
-        self.mock_client.get_machine_by_dns_name.assert_called_once_with("nonexistent.domain.com")
+        self.mock_client.get_machine_by_dns_name.assert_called_once_with(
+            "nonexistent.domain.com"
+        )
         self.mock_client.get_machine_by_id.assert_not_called()
 
     def test_get_result_no_parameters(self):
         """Test error when no parameters provided."""
-        with pytest.raises(ValidationError, match="Either machine_id or dns_name must be provided"):
+        with pytest.raises(
+            ValidationError, match="Either machine_id or dns_name must be provided"
+        ):
             self.service.get_result()
 
         # Should not make any API calls
@@ -152,9 +161,15 @@ class TestDetailService:
         self.mock_client.get_machine_by_id.return_value = mock_machine_data
 
         # Call with both parameters - DNS name should be used first
-        result = self.service.get_result(machine_id="direct-machine", dns_name="test.domain.com")
+        result = self.service.get_result(
+            machine_id="direct-machine", dns_name="test.domain.com"
+        )
 
         assert result["value"] == 1
         # Should resolve via DNS first
-        self.mock_client.get_machine_by_dns_name.assert_called_once_with("test.domain.com")
-        self.mock_client.get_machine_by_id.assert_called_once_with("dns-resolved-machine")
+        self.mock_client.get_machine_by_dns_name.assert_called_once_with(
+            "test.domain.com"
+        )
+        self.mock_client.get_machine_by_id.assert_called_once_with(
+            "dns-resolved-machine"
+        )