Merge pull request wazuh#29162 from wazuh/enhancement/28702-remove-cluster-resources

Remove cluster tasks and components

Author: fdalmaup

apis/communications/comms_api/authentication/test/conftest.py

@@ -1,18 +1,15 @@
+# Copyright (C) 2015, Wazuh Inc.
+# Created by Wazuh, Inc. <[email protected]>.
+# This program is a free software; you can redistribute it and/or modify it under the terms of GPLv2
+
 from wazuh.core.config.client import Config
 from wazuh.core.config.models.indexer import IndexerConfig, IndexerNode
-from wazuh.core.config.models.server import NodeConfig, NodeType, ServerConfig, SSLConfig
+from wazuh.core.config.models.server import ServerConfig
 
 
 def get_default_configuration():
     """Get default configuration for the tests."""
     return Config(
-        server=ServerConfig(
-            nodes=['0'],
-            node=NodeConfig(
-                name='node_name',
-                type=NodeType.MASTER,
-                ssl=SSLConfig(key='example', cert='example', ca='example'),
-            ),
-        ),
+        server=ServerConfig(),
         indexer=IndexerConfig(hosts=[IndexerNode(host='example', port=1516)], username='wazuh', password='wazuh'),
     )

apis/server_management/server_management_api/controllers/manager_controller.py

@@ -13,12 +13,11 @@
 from server_management_api.constants import INSTALLATION_UID_KEY, UPDATE_INFORMATION_KEY
 from server_management_api.controllers.util import json_response
 from server_management_api.signals import cti_context
-from server_management_api.util import only_master_endpoint, raise_if_exc
+from server_management_api.util import raise_if_exc
 
 logger = logging.getLogger('wazuh-api')
 
 
-@only_master_endpoint
 async def check_available_version(pretty: bool = False, force_query: bool = False) -> ConnexionResponse:
     """Get available update information.
 

apis/server_management/server_management_api/controllers/test/utils.py

@@ -4,21 +4,14 @@
 
 from wazuh.core.config.client import Config
 from wazuh.core.config.models.indexer import IndexerConfig, IndexerNode
-from wazuh.core.config.models.server import NodeConfig, NodeType, ServerConfig, SSLConfig
+from wazuh.core.config.models.server import ServerConfig
 from wazuh.core.results import AffectedItemsWazuhResult
 
 
 def get_default_configuration():
     """Get default configuration for the tests."""
     return Config(
-        server=ServerConfig(
-            nodes=['0'],
-            node=NodeConfig(
-                name='node_name',
-                type=NodeType.MASTER,
-                ssl=SSLConfig(key='example', cert='example', ca='example'),
-            ),
-        ),
+        server=ServerConfig(),
         indexer=IndexerConfig(hosts=[IndexerNode(host='example', port=1516)], username='wazuh', password='wazuh'),
     )
 

apis/server_management/server_management_api/signals.py

@@ -12,7 +12,6 @@
 
 from connexion import ConnexionMiddleware
 from wazuh.core import common
-from wazuh.core.cluster.utils import running_in_master_node
 from wazuh.core.commands_manager import CommandsManager
 from wazuh.core.config.client import CentralizedConfig
 from wazuh.core.configuration import update_check_is_enabled
@@ -101,12 +100,12 @@ async def lifespan_handler(_: ConnexionMiddleware, commands_manager: CommandsMan
     t = Thread(target=asyncio.run, args=(get_rbac_info(logger, commands_manager, rbac_manager),))
     t.start()
 
-    tasks: list[asyncio.Task] = []
+    tasks: list[asyncio.Task] = [
+        asyncio.create_task(check_installation_uid()),
+    ]
 
-    if running_in_master_node():
-        tasks.append(asyncio.create_task(check_installation_uid()))
-        if update_check_is_enabled():
-            tasks.append(asyncio.create_task(get_update_information()))
+    if update_check_is_enabled():
+        tasks.append(asyncio.create_task(get_update_information()))
 
     # Log the initial server startup message.
     management_api_config = CentralizedConfig.get_management_api_config()

apis/server_management/server_management_api/test/test_error_handler.py

@@ -166,11 +166,11 @@ async def test_http_error_handler(detail, mock_request):
         ('', '', {}, None),
         ('', 'detail', {'status': 'status'}, None),
         ('', 'detail', {'type': 'type'}, None),
-        ('', 'detail', {'code': 3005}, None),
-        ('', 'detail', {'code': 3005}, None),
-        ('', 'detail', {'code': 3005}, 'type'),
-        ('', {'detail_1': 'detail_1'}, {'code': 3005}, 'type'),
-        ('', {}, {'code': 3005}, 'type'),
+        ('', 'detail', {'code': 3002}, None),
+        ('', 'detail', {'code': 3002}, None),
+        ('', 'detail', {'code': 3002}, 'type'),
+        ('', {'detail_1': 'detail_1'}, {'code': 3002}, 'type'),
+        ('', {}, {'code': 3002}, 'type'),
         ('', {}, {'status': 'status'}, 'type'),
         ('', {}, {'type': 'type'}, 'type'),
         ('', {}, {'type': 'type', 'more': 'more'}, 'type'),

apis/server_management/server_management_api/test/test_signals.py

@@ -140,24 +140,19 @@ async def test_get_update_information_schedule(query_update_check_service_mock):
 
 
 @pytest.mark.parametrize(
-    'cluster_config,update_check_config,registered_tasks',
+    'update_check_config,registered_tasks',
     [
-        (True, True, 2),
-        (True, False, 1),
-        (False, True, 0),
-        (False, False, 0),
+        (True, 2),
+        (False, 1),
     ],
 )
 @patch('server_management_api.signals.check_installation_uid')
 @patch('server_management_api.signals.get_update_information')
 @patch('server_management_api.signals.update_check_is_enabled')
-@patch('server_management_api.signals.running_in_master_node')
 async def test_register_background_tasks(
-    running_in_master_node_mock,
     update_check_mock,
     get_update_information_mock,
     check_installation_uid_mock,
-    cluster_config,
     update_check_config,
     registered_tasks,
 ):
@@ -168,7 +163,6 @@ def __await__(self):
             self.await_count += 1
             return iter([])
 
-    running_in_master_node_mock.return_value = cluster_config
     update_check_mock.return_value = update_check_config
 
     with patch('server_management_api.signals.asyncio') as create_task_mock:

apis/server_management/server_management_api/test/test_util.py

@@ -257,24 +257,6 @@ def dummy_func():
     assert response.headers == {}, f'Unexpected deprecation headers were found: {response.headers}'
 
 
-@patch('server_management_api.util.raise_if_exc')
-@pytest.mark.asyncio
-async def test_only_master_endpoint(mock_exc):
-    """Test that only_master_endpoint decorator raise the correct exception when running_in_master_node is False."""
-
-    @util.only_master_endpoint
-    async def func_():
-        return ret_val
-
-    ret_val = 'foo'
-
-    with patch('server_management_api.util.running_in_master_node', return_value=False):
-        await func_()
-        mock_exc.assert_called_once_with(WazuhResourceNotFound(902))
-    with patch('server_management_api.util.running_in_master_node', return_value=True):
-        assert await func_() == ret_val
-
-
 @patch('yaml.safe_load')
 def test_load_api_spec(mock_safe_load):
     """Validate that the function `load_api_spec` works properly."""

apis/server_management/server_management_api/test/test_validator.py

@@ -8,7 +8,6 @@
 
 import jsonschema as js
 import pytest
-from wazuh import WazuhError
 
 from server_management_api.validator import (
     _active_response_command,
@@ -41,7 +40,6 @@
     _wpk_path,
     _yes_no_boolean,
     allowed_fields,
-    check_component_configuration_pair,
     check_exp,
     is_safe_path,
 )
@@ -286,18 +284,3 @@ def test_validation_json_ko(value, format):
             schema={'type': 'object', 'properties': {'key': {'type': 'string', 'format': format}}},
             format_checker=js.Draft4Validator.FORMAT_CHECKER,
         )
-
-
-@pytest.mark.parametrize(
-    'component, configuration, expected_response', [('agent', 'client', None), ('agent', 'wmodules', WazuhError(1128))]
-)
-def test_check_component_configuration_pair(component, configuration, expected_response):
-    """Verify that `check_component_configuration_pair` function returns an exception when the configuration does
-    not belong to a Wazuh component.
-    """
-    response = check_component_configuration_pair(component, configuration)
-    if isinstance(response, Exception):
-        assert isinstance(response, expected_response.__class__)
-        assert response.code == expected_response.code
-    else:
-        assert response is expected_response

apis/server_management/server_management_api/util.py

@@ -13,7 +13,6 @@
 import yaml
 from connexion import ProblemException
 from wazuh.core import common, exception
-from wazuh.core.cluster.utils import running_in_master_node
 
 from server_management_api import __path__ as api_path
 
@@ -351,12 +350,7 @@ def _create_problem(exc: Exception, code: int = None):
     """
     ext = None
     if isinstance(exc, exception.WazuhException):
-        ext = remove_nones_to_dict(
-            {
-                'remediation': exc.remediation,
-                'code': exc.code
-            }
-        )
+        ext = remove_nones_to_dict({'remediation': exc.remediation, 'code': exc.code})
 
     if isinstance(exc, exception.WazuhInternalError):
         raise ProblemException(
@@ -452,19 +446,6 @@ async def wrapper(*args, **kwargs):
     return add_deprecation_headers
 
 
-def only_master_endpoint(func):
-    """Restrict endpoints to the master node."""
-
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        if not running_in_master_node():
-            raise_if_exc(exception.WazuhResourceNotFound(902))
-        else:
-            return await func(*args, **kwargs)
-
-    return wrapper
-
-
 @lru_cache(maxsize=None)
 def load_api_spec():
     """Load API specification."""

apis/server_management/server_management_api/validator.py

@@ -4,13 +4,11 @@
 
 import os
 import re
-from types import MappingProxyType
 from typing import Dict, List
 
 from jsonschema import Draft4Validator
 from uuid6 import UUID
 from wazuh.core import common
-from wazuh.core.exception import WazuhError
 
 _alphanumeric_param = re.compile(r'^[\w,\-.+\s:]+$')
 _symbols_alphanumeric_param = re.compile(r'^[\w,*<>!\-.+\s:/()\[\]\'\"|=~#]+$')
@@ -60,25 +58,6 @@
     },
 }
 
-WAZUH_COMPONENT_CONFIGURATION_MAPPING = MappingProxyType(
-    {
-        'agent': {'client', 'buffer', 'labels', 'internal'},
-        'agentless': {'agentless'},
-        'analysis': {'global', 'active_response', 'alerts', 'command', 'rules', 'decoders', 'internal', 'rule_test'},
-        'auth': {'auth'},
-        'com': {'active-response', 'logging', 'internal', 'cluster'},
-        'csyslog': {'csyslog'},
-        'integrator': {'integration'},
-        'logcollector': {'localfile', 'socket', 'internal'},
-        'mail': {'global', 'alerts', 'internal'},
-        'monitor': {'global', 'internal', 'reports'},
-        'request': {'global', 'remote', 'internal'},
-        'syscheck': {'syscheck', 'rootcheck', 'internal'},
-        'wazuh-db': {'wdb', 'internal'},
-        'wmodules': {'wmodules'},
-    }
-)
-
 
 def check_exp(exp: str, regex: re.Pattern) -> bool:
     """Function to check if an expression matches a regex.
@@ -145,28 +124,6 @@ def is_safe_path(path: str, basedir: str = common.WAZUH_ETC, relative: bool = Tr
     return os.path.commonpath([full_path, full_basedir]) == full_basedir
 
 
-def check_component_configuration_pair(component: str, configuration: str) -> WazuhError:
-    """Parameters
-    ----------
-    component : str
-        Wazuh component name.
-    configuration : str
-        Component configuration.
-
-    Returns
-    -------
-    WazuhError
-        It can either return a `WazuhError` or `None`, depending on the given component and configuration. The exception
-        is returned and not raised because we use the object to create a problem on API level.
-    """
-    if configuration not in WAZUH_COMPONENT_CONFIGURATION_MAPPING[component]:
-        return WazuhError(
-            1128,
-            extra_message=f"Valid configuration values for '{component}': "
-            f'{WAZUH_COMPONENT_CONFIGURATION_MAPPING[component]}',
-        )
-
-
 @Draft4Validator.FORMAT_CHECKER.checks('alphanumeric')
 def format_alphanumeric(value):
     return check_exp(value, _alphanumeric_param)