python: Sort imports with isort (#2275)

Enables isort for import sorting

https://pycqa.github.io/isort/

Author: orestisfl

.ci/scripts/get_versions.py

@@ -17,9 +17,10 @@
 - main:
     Retrieves available versions of Elastic Agent and performs operations on them.
 """
-import os
-import json
 import argparse
+import json
+import os
+
 import requests
 
 

.ci/scripts/prepare_slack_data.py

@@ -4,9 +4,8 @@
 It reads environment variables set by the GitHub Actions runtime, validates them, and
 constructs a Slack payload based on the workflow status.
 """
-import os
 import json
-
+import os
 
 color_by_job_status = {
     "success": "#36a64f",

.pre-commit-config.yaml

@@ -52,6 +52,12 @@ repos:
         # TODO: Apply pylint in security-policies
         exclude: security-policies.*
 
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        name: isort (python)
+
   - repo: https://github.com/psf/black
     rev: 24.4.2
     hooks:

pyproject.toml

@@ -1,2 +1,5 @@
 [tool.black]
 line-length = 120
+
+[tool.isort]
+profile = "black"

security-policies/dev/generate_rule_metadata.py

@@ -1,12 +1,10 @@
 import argparse
 import os
 import uuid
-
-import pandas as pd
+from dataclasses import asdict, dataclass
 
 import common
-from dataclasses import dataclass, asdict
-
+import pandas as pd
 from ruamel.yaml import YAML
 
 yml = YAML()

security-policies/dev/generate_rule_templates.py

@@ -1,10 +1,11 @@
 import argparse
-import os
-import yaml
 import json
-import common
+import os
 from pathlib import Path
 
+import common
+import yaml
+
 INTEGRATION_RULE_TEMPLATE_DIR = "../../../integrations/packages/cloud_security_posture/kibana/csp_rule_template/"
 
 

tests/commonlib/agents_map.py

@@ -2,11 +2,10 @@
 Generate agent parameterization for pytest.
 """
 
+from configuration import agent, elasticsearch
+from fleet_api.agent_policy_api import get_agents
 from loguru import logger
 from munch import Munch
-from configuration import elasticsearch, agent
-from fleet_api.agent_policy_api import get_agents
-
 
 CIS_AWS_COMPONENT = "cloudbeat/cis_aws"
 CIS_GCP_COMPONENT = "cloudbeat/cis_gcp"

tests/commonlib/framework/reporting.py

@@ -3,10 +3,12 @@
 """
 
 from __future__ import annotations
+
 from dataclasses import dataclass
+
+import allure
 import pytest
 from allure_commons.types import LinkType
-import allure
 
 
 @dataclass

tests/commonlib/io_utils.py

@@ -7,13 +7,12 @@
 import os
 import shutil
 import subprocess
-
 from datetime import datetime
 from pathlib import Path
 
 import yaml
-from munch import Munch, munchify
 from loguru import logger
+from munch import Munch, munchify
 
 
 def get_events_from_index(

tests/commonlib/kubernetes.py

@@ -2,16 +2,15 @@
 This module provides kubernetes functionality based on original kubernetes python library.
 """
 
+from pathlib import Path
 from subprocess import CalledProcessError
 from typing import Union
-from pathlib import Path
 
+from commonlib.io_utils import get_k8s_yaml_objects
 from kubernetes import client, config, utils
 from kubernetes.client import ApiException
-from kubernetes.watch import watch
 from kubernetes.stream import stream
-
-from commonlib.io_utils import get_k8s_yaml_objects
+from kubernetes.watch import watch
 from loguru import logger
 
 RESOURCE_POD = "Pod"

tests/commonlib/utils.py

@@ -2,10 +2,11 @@
 import datetime
 import json
 import time
-from typing import Union
 from functools import reduce
+from typing import Union
+
 import allure
-from commonlib.io_utils import get_logs_from_stream, get_events_from_index
+from commonlib.io_utils import get_events_from_index, get_logs_from_stream
 from loguru import logger
 
 FINDINGS_BACKOFF_SECONDS = 5

tests/configuration.py

@@ -5,8 +5,9 @@
 """
 
 import os
-from munch import Munch
+
 from loguru import logger
+from munch import Munch
 
 FINDINGS_INDEX_PATTERN = "*cloud_security_posture.findings*"
 VULNERABILITIES_INDEX_PATTERN = "*cloud_security_posture.vulnerabilities*"

tests/conftest.py

@@ -2,19 +2,19 @@
 Global pytest file for fixtures and test configs
 """
 
+import functools
 import logging
 import sys
-import functools
 import time
 
-import pytest
 import configuration
-from commonlib.agents_map import AgentExpectedMapping, AgentComponentMapping
-from commonlib.kubernetes import KubernetesHelper
-from commonlib.elastic_wrapper import ElasticWrapper
+import pytest
+from _pytest.logging import LogCaptureFixture
+from commonlib.agents_map import AgentComponentMapping, AgentExpectedMapping
 from commonlib.docker_wrapper import DockerWrapper
+from commonlib.elastic_wrapper import ElasticWrapper
 from commonlib.io_utils import FsClient
-from _pytest.logging import LogCaptureFixture
+from commonlib.kubernetes import KubernetesHelper
 from loguru import logger
 
 

tests/fleet_api/agent_policy_api.py

@@ -3,9 +3,10 @@
 """
 
 from typing import Optional
-from munch import Munch, munchify
-from loguru import logger
+
 from fleet_api.base_call_api import APICallException, perform_api_call
+from loguru import logger
+from munch import Munch, munchify
 
 
 def create_agent_policy(cfg: Munch, json_policy: dict) -> str:

tests/fleet_api/common_api.py

@@ -2,18 +2,15 @@
 This module contains API calls related to Fleet settings
 """
 
-import time
-import json
 import codecs
-from typing import Dict, Any, List
-from munch import Munch, munchify
-from loguru import logger
+import json
+import time
+from typing import Any, Dict, List
+
 from fleet_api.base_call_api import APICallException, perform_api_call
-from fleet_api.utils import (
-    replace_image_field,
-    add_capabilities,
-    add_tags,
-)
+from fleet_api.utils import add_capabilities, add_tags, replace_image_field
+from loguru import logger
+from munch import Munch, munchify
 
 AGENT_ARTIFACT_SUFFIX = "/downloads/beats/elastic-agent"
 AGENT_ARTIFACT_SUFFIX_SHORT = "/downloads/"

tests/fleet_api/package_policy_api.py

@@ -2,10 +2,10 @@
 This module contains API calls related to the package policy API.
 """
 
-from munch import Munch, munchify
-from loguru import logger
 from fleet_api.base_call_api import APICallException, perform_api_call
-from fleet_api.utils import update_key, delete_key
+from fleet_api.utils import delete_key, update_key
+from loguru import logger
+from munch import Munch, munchify
 
 
 def create_kspm_unmanaged_integration(cfg: Munch, pkg_policy: dict, agent_policy_id: str) -> str:

tests/integration/tests/conftest.py

@@ -2,8 +2,9 @@
 Integration tests setup configurations and fixtures
 """
 
-from pathlib import Path
 import time
+from pathlib import Path
+
 import pytest
 from commonlib.io_utils import get_k8s_yaml_objects
 from commonlib.kubernetes import ApiException

tests/integration/tests/test_cloudbeat_integration.py

@@ -5,10 +5,9 @@
 Cloudbeat -> ElasticSearch
 """
 
-import pytest
 import configuration
-
-from commonlib.utils import wait_for_cycle_completion, get_findings
+import pytest
+from commonlib.utils import get_findings, wait_for_cycle_completion
 from loguru import logger
 
 CONFIG_TIMEOUT = 45

tests/integration/tests/test_sanity_checks.py

@@ -8,11 +8,17 @@
 """
 
 import time
+
 import pytest
-from loguru import logger
-from configuration import elasticsearch
+from commonlib.agents_map import (
+    CIS_AWS_COMPONENT,
+    CIS_AZURE_COMPONENT,
+    AgentComponentMapping,
+    AgentExpectedMapping,
+)
 from commonlib.utils import get_findings
-from commonlib.agents_map import CIS_AWS_COMPONENT, CIS_AZURE_COMPONENT, AgentExpectedMapping, AgentComponentMapping
+from configuration import elasticsearch
+from loguru import logger
 
 CONFIG_TIMEOUT = 120
 GCP_CONFIG_TIMEOUT = 600

tests/integration/tests/test_standalone_agent_integration.py

@@ -6,9 +6,8 @@
 """
 
 import pytest
-
-from commonlib.utils import get_findings
 from commonlib.io_utils import FsClient
+from commonlib.utils import get_findings
 from loguru import logger
 
 testdata = ["file", "process", "k8s_object"]

tests/integrations_setup/agents_enrolled.py

@@ -3,14 +3,15 @@
 If the expected number of agents is not enrolled within the timeout, the test will fail
 """
 
+import re
 import sys
 import time
-import re
 from dataclasses import dataclass
-from fleet_api.agent_policy_api import get_agents
+
 import configuration_fleet as cnfg
-from state_file_manager import state_manager
+from fleet_api.agent_policy_api import get_agents
 from loguru import logger
+from state_file_manager import state_manager
 
 TIMEOUT = 600
 

tests/integrations_setup/configuration_fleet.py

@@ -17,6 +17,7 @@
 """
 
 import os
+
 from munch import Munch
 
 # CNVM_TAGS format: "Key=<key1>,Value=<value1> Key=<key2>,Value=<value2> ..."

tests/integrations_setup/install_agentless_integrations.py

@@ -8,9 +8,10 @@
 """
 
 import json
+
 import configuration_fleet as cnfg
-from loguru import logger
 from fleet_api.package_policy_api import create_cspm_integration
+from loguru import logger
 from package_policy import (
     generate_package_policy,
     generate_policy_template,

tests/integrations_setup/install_cnvm_integration.py

@@ -7,31 +7,32 @@
 2. Create a CNVM AWS integration.
 3. Create a deploy/cloudformation/config.json file to be used by the just deploy-cloudformation command.
 """
-import sys
 import json
+import sys
 from pathlib import Path
-from munch import Munch
+
 import configuration_fleet as cnfg
 from fleet_api.agent_policy_api import create_agent_policy
-from fleet_api.package_policy_api import create_cnvm_integration
-from fleet_api.utils import rename_file_by_suffix
 from fleet_api.common_api import (
+    get_artifact_server,
+    get_cnvm_template,
     get_enrollment_token,
     get_fleet_server_host,
-    get_artifact_server,
     get_package_version,
-    get_cnvm_template,
 )
+from fleet_api.package_policy_api import create_cnvm_integration
+from fleet_api.utils import rename_file_by_suffix
 from loguru import logger
-from state_file_manager import state_manager, PolicyState, HostType
+from munch import Munch
 from package_policy import (
-    version_compatible,
     VERSION_MAP,
-    load_data,
+    extract_template_url,
     generate_random_name,
     get_package_default_url,
-    extract_template_url,
+    load_data,
+    version_compatible,
 )
+from state_file_manager import HostType, PolicyState, state_manager
 
 CNVM_EXPECTED_AGENTS = 1
 CNVM_CLOUDFORMATION_CONFIG = "../../deploy/cloudformation/config.json"