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

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

@@ -1,14 +1,10 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: check-msdefender
-Version: 1.1.1
+Version: 1.1.2
 Summary: A Nagios plugin for monitoring Microsoft Defender API endpoints
-Author-email: ldvchosal <ldvchosal@github.com>
-License: MIT
-Project-URL: Homepage, https://github.com/lduchosal/check_msdefender
-Project-URL: Bug Reports, https://github.com/lduchosal/check_msdefender/issues
-Project-URL: Source, https://github.com/lduchosal/check_msdefender
-Project-URL: Documentation, https://github.com/lduchosal/check_msdefender/blob/main/README.md
 Keywords: nagios,monitoring,microsoft,graph,api,azure
+Author-Email: ldvchosal <ldvchosal@github.com>
+License: MIT
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
@@ -19,9 +15,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: System :: Monitoring
 Classifier: Topic :: System :: Systems Administration
+Project-URL: Homepage, https://github.com/lduchosal/check_msdefender
+Project-URL: Bug Reports, https://github.com/lduchosal/check_msdefender/issues
+Project-URL: Source, https://github.com/lduchosal/check_msdefender
+Project-URL: Documentation, https://github.com/lduchosal/check_msdefender/blob/main/README.md
 Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: nagiosplugin>=1.4.0
 Requires-Dist: azure-identity>=1.12.0
 Requires-Dist: click<9.0,>=8.0
@@ -33,7 +31,8 @@ Requires-Dist: black>=21.0; extra == "dev"
 Requires-Dist: flake8>=3.8; extra == "dev"
 Requires-Dist: mypy>=0.800; extra == "dev"
 Requires-Dist: twine>=6.2.0; extra == "dev"
-Dynamic: license-file
+Requires-Dist: pdm>=2.0.0; extra == "dev"
+Description-Content-Type: text/markdown
 
 # 🛡️ Check MS Defender
 
@@ -428,4 +427,4 @@ This project is licensed under the **MIT License** - see the [LICENSE](LICENSE)
 
 [🐛 Report Bug](https://github.com/lduchosal/check_msdefender/issues) • [💡 Request Feature](https://github.com/lduchosal/check_msdefender/issues) • [📖 Documentation](https://github.com/lduchosal/check_msdefender/blob/main/README.md)
 
-</div>
+</div>

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/check_msdefender.py

@@ -1,6 +1,5 @@
 """Main entry point for check_msdefender Nagios plugin."""
 
-import sys
 from check_msdefender.cli import main
 
 if __name__ == "__main__":

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/cli/commands/alerts.py

@@ -1,7 +1,6 @@
 """Alerts commands for CLI."""
 
 import sys
-import click
 from typing import Optional, Any
 
 from check_msdefender.core.auth import get_authenticator

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/cli/commands/detail.py

@@ -16,7 +16,6 @@ def register_detail_commands(main_group: Any) -> None:
     """Register detail commands with the main CLI group."""
 
     @main_group.command("detail")
-    @click.option("-i", "--id", "machine_id_alt", help="Machine ID (GUID)")
     @common_options
     def detail_cmd(
         config: str,
@@ -25,7 +24,6 @@ def register_detail_commands(main_group: Any) -> None:
         dns_name: Optional[str],
         warning: Optional[float],
         critical: Optional[float],
-        machine_id_alt: Optional[str],
     ) -> None:
         """Get detailed machine information from Microsoft Defender."""
         try:
@@ -44,9 +42,6 @@ def register_detail_commands(main_group: Any) -> None:
             # Create custom Nagios plugin for detail output
             plugin = NagiosPlugin(service, "detail")
 
-            # Use -i option if provided, otherwise fallback to -m
-            final_machine_id = machine_id_alt or machine_id
-
             # Set default thresholds for detail command to show proper performance data
             # Based on expected test output patterns
             if warning is not None and critical is None:
@@ -58,7 +53,7 @@ def register_detail_commands(main_group: Any) -> None:
 
             # Execute check
             result = plugin.check(
-                machine_id=final_machine_id,
+                machine_id=machine_id,
                 dns_name=dns_name,
                 warning=warning,
                 critical=critical,

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/cli/commands/lastseen.py

@@ -1,7 +1,6 @@
 """Last seen commands for CLI."""
 
 import sys
-import click
 from typing import Optional, Any
 
 from check_msdefender.core.auth import get_authenticator

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/cli/commands/machines.py

@@ -1,7 +1,6 @@
 """List machines commands for CLI."""
 
 import sys
-import click
 from typing import Optional, Any
 
 from check_msdefender.core.auth import get_authenticator

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/cli/commands/onboarding.py

@@ -1,7 +1,6 @@
 """Onboarding status commands for CLI."""
 
 import sys
-import click
 from typing import Optional, Any
 
 from check_msdefender.core.auth import get_authenticator

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/cli/commands/vulnerabilities.py

@@ -1,7 +1,6 @@
 """Vulnerability commands for CLI."""
 
 import sys
-import click
 from typing import Optional, Any
 
 from check_msdefender.core.auth import get_authenticator

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

@@ -10,7 +10,7 @@ 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", 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.1 → check_msdefender-1.1.2}/check_msdefender/cli/handlers.py

@@ -1,7 +1,6 @@
 """Error handlers and formatters for click CLI."""
 
 import click
-from typing import Any
 
 
 class ClickErrorHandler:

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

@@ -1,7 +1,7 @@
 """Alerts service implementation."""
 
-from datetime import datetime
-from typing import Dict, Optional, Any, List
+from typing import Dict, Optional, Any
+
 from check_msdefender.core.exceptions import ValidationError
 from check_msdefender.core.logging_config import get_verbose_logger
 

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

@@ -1,7 +1,7 @@
 """Machines service implementation."""
 
 from typing import Dict, List, Any
-from check_msdefender.core.exceptions import ValidationError
+
 from check_msdefender.core.logging_config import get_verbose_logger
 
 

{check_msdefender-1.1.1 → check_msdefender-1.1.2}/check_msdefender/services/models.py

@@ -2,8 +2,8 @@
 
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Optional, List
 from enum import Enum
+from typing import Optional
 
 
 class OnboardingStatus(Enum):

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

@@ -1,16 +1,17 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2"]
-build-backend = "setuptools.build_meta"
+requires = [
+    "pdm-backend",
+]
+build-backend = "pdm.backend"
 
 [project]
 name = "check-msdefender"
-version = "1.1.1"
+version = "1.1.2"
 authors = [
-    {name = "ldvchosal", email = "ldvchosal@github.com"},
+    { name = "ldvchosal", email = "ldvchosal@github.com" },
 ]
 description = "A Nagios plugin for monitoring Microsoft Defender API endpoints"
 readme = "README.md"
-license = {text = "MIT"}
 requires-python = ">=3.9"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -24,13 +25,23 @@ classifiers = [
     "Topic :: System :: Monitoring",
     "Topic :: System :: Systems Administration",
 ]
-keywords = ["nagios", "monitoring", "microsoft", "graph", "api", "azure"]
+keywords = [
+    "nagios",
+    "monitoring",
+    "microsoft",
+    "graph",
+    "api",
+    "azure",
+]
 dependencies = [
     "nagiosplugin>=1.4.0",
     "azure-identity>=1.12.0",
-    "click>=8.0,<9.0"
+    "click>=8.0,<9.0",
 ]
 
+[project.license]
+text = "MIT"
+
 [project.optional-dependencies]
 dev = [
     "pytest>=6.0",
@@ -40,6 +51,7 @@ dev = [
     "flake8>=3.8",
     "mypy>=0.800",
     "twine>=6.2.0",
+    "pdm>=2.0.0",
 ]
 
 [project.urls]
@@ -52,11 +64,15 @@ Documentation = "https://github.com/lduchosal/check_msdefender/blob/main/README.
 check_msdefender = "check_msdefender.cli:main"
 
 [tool.setuptools.package-data]
-"*" = ["*.ini"]
+"*" = [
+    "*.ini",
+]
 
 [tool.black]
 line-length = 100
-target-version = ['py39']
+target-version = [
+    "py39",
+]
 
 [tool.mypy]
 python_version = "3.9"
@@ -65,8 +81,40 @@ warn_unused_configs = true
 disallow_untyped_defs = true
 
 [tool.pytest.ini_options]
-testpaths = ["tests"]
+testpaths = [
+    "tests",
+]
 python_files = "test_*.py"
 python_classes = "Test*"
 python_functions = "test_*"
-addopts = "-v"
+addopts = "-v"
+
+[tool.pdm.scripts]
+format = "black ."
+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"
+
+[tool.pdm.scripts.all]
+composite = [
+    "format",
+    "build",
+    "test",
+    "typecheck",
+    "lint",
+]
+
+[tool.pdm.scripts.msdall]
+composite = [
+    "msdhelp",
+    "msdmachines",
+]

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

@@ -1,8 +1,8 @@
 """Mock Defender client for fixture tests."""
 
 import json
-import os
 from pathlib import Path
+
 from check_msdefender.core.exceptions import ValidationError
 
 

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

@@ -1,11 +1,12 @@
 """Fixture tests for LastSeenService."""
 
-import pytest
 from datetime import datetime, timezone
 from unittest.mock import patch
 
-from check_msdefender.services.lastseen_service import LastSeenService
+import pytest
+
 from check_msdefender.core.exceptions import ValidationError
+from check_msdefender.services.lastseen_service import LastSeenService
 from tests.fixtures.mock_defender_client import MockDefenderClient
 
 
@@ -85,7 +86,6 @@ class TestLastSeenServiceFixtures:
 
     def test_get_result_high_precision_microseconds_regression(self):
         """Test parsing timestamp with high precision microseconds - regression test."""
-        import re
 
         # Create a mock client that returns timestamp with 7-digit microseconds
         class MockClientHighPrecision:

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

@@ -397,6 +397,5 @@ class TestDetailCommand:
 
         assert result.exit_code == 0
         assert "Get detailed machine information from Microsoft Defender." in result.output
-        assert "-i, --id TEXT" in result.output
-        assert "-m, --machine-id TEXT" 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.1 → check_msdefender-1.1.2}/tests/unit/test_detail_service.py

@@ -1,11 +1,12 @@
 """Unit tests for DetailService."""
 
-import pytest
 import json
-from unittest.mock import Mock, MagicMock
+from unittest.mock import Mock
+
+import pytest
 
-from check_msdefender.services.detail_service import DetailService
 from check_msdefender.core.exceptions import ValidationError
+from check_msdefender.services.detail_service import DetailService
 
 
 class TestDetailService:

check_msdefender-1.1.1/.claude/settings.local.json

@@ -1,19 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(mkdir:*)",
-      "Bash(python -m check_msdefender:*)",
-      "Bash(python.exe -m check_msdefender:*)",
-      "Bash(check_msdefender:*)",
-      "Bash(pip install:*)",
-      "Bash(pytest:*)",
-      "Bash(python:*)",
-      "Bash(find:*)",
-      "Bash(echo \"Exit code: $?\")",
-      "Bash(mypy:*)",
-      "Bash(black:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

check_msdefender-1.1.1/.env.example

@@ -1,10 +0,0 @@
-# Azure Active Directory credentials for integration testing
-# Copy this file to .env and fill in your actual values
-
-# Required for Microsoft Graph API authentication
-AZURE_TENANT_ID=your-tenant-id-here
-AZURE_CLIENT_ID=your-client-id-here  
-AZURE_CLIENT_SECRET=your-client-secret-here
-
-# Optional: Set to 1 to run integration tests
-RUN_INTEGRATION_TESTS=0

check_msdefender-1.1.1/.github/workflows/python-package.yml

@@ -1,40 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
-name: Python package
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest

check_msdefender-1.1.1/.github/workflows/python-publish.yml

@@ -1,70 +0,0 @@
-# This workflow will upload a Python Package to PyPI when a release is created
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Upload Python Package
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-jobs:
-  release-build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: Build release distributions
-        run: |
-          # NOTE: put your own distribution build steps here.
-          python -m pip install build
-          python -m build
-
-      - name: Upload distributions
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-  pypi-publish:
-    runs-on: ubuntu-latest
-    needs:
-      - release-build
-    permissions:
-      # IMPORTANT: this permission is mandatory for trusted publishing
-      id-token: write
-
-    # Dedicated environments with protections for publishing are strongly recommended.
-    # For more information, see: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#deployment-protection-rules
-    environment:
-      name: pypi
-      # OPTIONAL: uncomment and update to include your PyPI project URL in the deployment status:
-      url: https://pypi.org/p/nagios-check-msdefender
-      #
-      # ALTERNATIVE: if your GitHub Release name is the PyPI project version string
-      # ALTERNATIVE: exactly, uncomment the following line instead:
-      # url: https://pypi.org/project/YOURPROJECT/${{ github.event.release.name }}
-
-    steps:
-      - name: Retrieve release distributions
-        uses: actions/download-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-      - name: Publish release distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: dist/

check_msdefender-1.1.1/.gitignore

@@ -1,6 +0,0 @@
-/build/
-/check_msdefender.egg-info/
-/dist/
-/.env
-/check_msdefender.ini
-/doc/private

check_msdefender-1.1.1/.idea/.gitignore

@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/

check_msdefender-1.1.1/.idea/check_msdefender.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/check_msdefender" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.venv" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.12 (check_msdefender)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

check_msdefender-1.1.1/.idea/dictionaries/project.xml

@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="project">
-    <words>
-      <w>lastseen</w>
-    </words>
-  </dictionary>
-</component>

check_msdefender-1.1.1/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

check_msdefender-1.1.1/.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

check_msdefender-1.1.1/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.13 (check_msdefender)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (check_msdefender)" project-jdk-type="Python SDK" />
-</project>

check_msdefender-1.1.1/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/check_msdefender.iml" filepath="$PROJECT_DIR$/.idea/check_msdefender.iml" />
-    </modules>
-  </component>
-</project>

check_msdefender-1.1.1/.idea/runConfigurations/Integration_Tests.xml

@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Integration Tests" type="tests" factoryName="py.test">
-    <module name="check_msdefender" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs />
-    <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/bin/python" />
-    <option name="SDK_NAME" value="Python 3.12 (check_msdefender)" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="" />
-    <option name="CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="FOLDER_NAME" value="$PROJECT_DIR$/tests/integration" />
-    <option name="TEST_TYPE" value="TEST_FOLDER" />
-    <option name="PATTERN" value="" />
-    <option name="USE_PATTERN" value="false" />
-    <method v="2" />
-  </configuration>
-</component>

check_msdefender-1.1.1/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>