refact: Refactor code style #2947

wazuh · Aug 17, 2022 · f61b25e · f61b25e
1 parent 9e240e2
commit f61b25e
Show file tree

Hide file tree

Showing 29 changed files with 153 additions and 153 deletions.
diff --git a/deps/wazuh_testing/wazuh_testing/modules/eps/__init__.py b/deps/wazuh_testing/wazuh_testing/modules/eps/__init__.py
@@ -18,4 +18,4 @@
 # wazuh-analysisd.state file default update configuration
 ANALYSISD_STATE_INTERNAL_DEFAULT = '5'
 PERCENTAGE_PROCESS_MSGS = 0.95
-QUEUE_SIZE = 16384
+QUEUE_SIZE = 16384
diff --git a/deps/wazuh_testing/wazuh_testing/modules/eps/event_monitor.py b/deps/wazuh_testing/wazuh_testing/modules/eps/event_monitor.py
@@ -77,7 +77,6 @@ def get_words_from_file(words, filename):
  """
  with open(filename, 'r') as file:
  for _, line in enumerate(file):
- # search string
  if words in line:
  return line
 
@@ -116,5 +115,5 @@ def get_msg_with_number(message):
  message (str): Message to find
  """
  check_analysisd_event(timeout=eps.T_20, callback=message,
- error_message=fr"Could not find the event: {message}", prefix="", \
- file_to_monitor=ALERT_LOGS_PATH)
+ error_message=fr"Could not find the event: {message}", prefix="",
+ file_to_monitor=ALERT_LOGS_PATH)
diff --git a/deps/wazuh_testing/wazuh_testing/processes/__init__.py b/deps/wazuh_testing/wazuh_testing/processes/__init__.py
@@ -13,4 +13,4 @@ def check_if_deamon_is_running(daemon):
 
 def check_if_deamon_is_not_running(daemon):
  """Check if the specified daemon is running"""
- assert check_if_process_is_running(daemon) == False, f"{daemon} is running. It may have crashed"
+ assert not check_if_process_is_running(daemon), f"{daemon} is running. It may have crashed"
diff --git a/deps/wazuh_testing/wazuh_testing/scripts/simulate_agents.py b/deps/wazuh_testing/wazuh_testing/scripts/simulate_agents.py
@@ -46,7 +46,6 @@ def process_script_parameters(args):
  args.modules.append('keepalive')
  args.modules_eps.append('0')
 
-
  if args.disable_receive is False:
  if 'receive_messages' not in args.modules:
  args.modules.append('receive_messages')
@@ -360,4 +359,4 @@ def main():
 
 
 if __name__ == "__main__":
- main()
+ main()
diff --git a/deps/wazuh_testing/wazuh_testing/tools/__init__.py b/deps/wazuh_testing/wazuh_testing/tools/__init__.py
@@ -78,7 +78,7 @@
  HOSTS_FILE_PATH = os.path.join('/', 'etc', 'hosts')
  GLOBAL_DB_PATH = os.path.join(WAZUH_PATH, 'queue', 'db', 'global.db')
  ANALYSISD_STATE = os.path.join(WAZUH_PATH, 'var', 'run', 'wazuh-analysisd.state')
- SIMULATE_AGENT =  os.path.join('deps','wazuh_testing','wazuh_testing','scripts','simulate_agents.py')
+ SIMULATE_AGENT = os.path.join('deps', 'wazuh_testing', 'wazuh_testing','scripts', 'simulate_agents.py')
  WAZUH_INTERNAL_OPTIONS = os.path.join(WAZUH_PATH, 'etc', 'internal_options.conf')
 
  try:

diff --git a/tests/integration/test_analysisd/test_eps/conftest.py b/tests/integration/test_analysisd/test_eps/conftest.py
@@ -10,7 +10,8 @@
 import pytest
 
 from wazuh_testing.tools.services import control_service
-from wazuh_testing.tools import configuration, SIMULATE_AGENT, ARCHIVES_LOG_FILE_PATH, ALERT_LOGS_PATH, ALERT_FILE_PATH, ALERT_PATH, WAZUH_INTERNAL_OPTIONS
+from wazuh_testing.tools import configuration, SIMULATE_AGENT, ARCHIVES_LOG_FILE_PATH, \
+ ALERT_LOGS_PATH, ALERT_FILE_PATH, ALERT_PATH, WAZUH_INTERNAL_OPTIONS
 
 
 @pytest.fixture(scope='function')
@@ -25,7 +26,7 @@ def restart_analysisd_function():
 def configure_local_internal_options_eps(request):
  """Fixture to configure the local internal options file."""
  # Define local internal options for vulnerability detector tests
- local_internal_options = {'wazuh_modules.debug': '2', 'monitord.rotate_log': '0',\
+ local_internal_options = {'wazuh_modules.debug': '2', 'monitord.rotate_log': '0',
  'analysisd.state_interval': f"{request.param[0]}"}
 
  # Backup the old local internal options
@@ -55,7 +56,7 @@ def set_wazuh_configuration_eps(configuration, set_wazuh_configuration, configur
 @pytest.fixture(scope='function')
 def simulate_agent(request):
  """Fixture to execute the script simulate_agent.py"""
- #Get IP address of the host
+ # Get IP address of the host
  hostname = socket.gethostname()
  IPAddr = socket.gethostbyname(hostname)
 
@@ -65,7 +66,6 @@ def simulate_agent(request):
  -f {request.param['msg_size']} -e {request.param['total_msg']} \
  -k {request.param['keepalive_disabled']} -d {request.param['receive_msg_disabled']}", shell=True)
 
-
  yield
 
 

diff --git a/tests/integration/test_analysisd/test_eps/data/configuration_simulate_agent.yaml b/tests/integration/test_analysisd/test_eps/data/configuration_simulate_agent.yaml
@@ -1,8 +1,8 @@
-- name: 'Simulate agent params configuration'
- description: 'Simulate agent params configuration'
+- name: Simulate agent params configuration
+ description: Simulate agent params configuration
  configuration_parameters:
  num_agent: '1'
- modules: 'logcollector'
+ modules: logcollector
  eps: '10000'
  time: '15'
  msg_size: '1'

diff --git a/...tegration/test_analysisd/test_eps/data/configuration_template/configuration_disabled.yaml b/...tegration/test_analysisd/test_eps/data/configuration_template/configuration_disabled.yaml
@@ -3,21 +3,21 @@
  elements:
  - limits:
  elements:
- - eps:
- elements:
- - maximum:
- value: MAXIMUM
- - timeframe:
- value: TIMEFRAME
+  - eps:
+  elements:
+  - maximum:
+  value: MAXIMUM
+  - timeframe:
+  value: TIMEFRAME
 
  - section: remote
  elements:
- - connection:
- value: 'secure'
+  - connection:
+  value: secure
  - port:
  value: '1514'
  - protocol:
- value: 'TCP'
+ value: TCP
 
  - section: sca
  elements:
@@ -36,14 +36,14 @@
 
  - section: wodle
  attributes:
- - name: 'syscollector'
+ - name: syscollector
  elements:
  - disabled:
  value: 'yes'
 
  - section: wodle
  attributes:
- - name: 'osquery'
+ - name: osquery
  elements:
  - disabled:
  value: 'yes'
diff --git a/...ntegration/test_analysisd/test_eps/data/configuration_template/configuration_enabled.yaml b/...ntegration/test_analysisd/test_eps/data/configuration_template/configuration_enabled.yaml
@@ -3,21 +3,21 @@
  elements:
  - limits:
  elements:
- - eps:
- elements:
- - maximum:
- value: MAXIMUM
- - timeframe:
- value: TIMEFRAME
+  - eps:
+  elements:
+  - maximum:
+  value: MAXIMUM
+  - timeframe:
+  value: TIMEFRAME
 
  - section: remote
  elements:
- - connection:
- value: 'secure'
+  - connection:
+  value: secure
  - port:
  value: '1514'
  - protocol:
- value: 'TCP'
+ value: TCP
 
  - section: sca
  elements:
@@ -36,14 +36,14 @@
 
  - section: wodle
  attributes:
- - name: 'syscollector'
+ - name: syscollector
  elements:
  - disabled:
  value: 'yes'
 
  - section: wodle
  attributes:
- - name: 'osquery'
+ - name: osquery
  elements:
  - disabled:
  value: 'yes'
diff --git a/...ion/test_analysisd/test_eps/data/configuration_template/configuration_invalid_values.yaml b/...ion/test_analysisd/test_eps/data/configuration_template/configuration_invalid_values.yaml
@@ -3,21 +3,21 @@
  elements:
  - limits:
  elements:
- - eps:
- elements:
- - maximum:
- value: MAXIMUM
- - timeframe:
- value: TIMEFRAME
+  - eps:
+  elements:
+  - maximum:
+  value: MAXIMUM
+  - timeframe:
+  value: TIMEFRAME
 
  - section: remote
  elements:
- - connection:
- value: 'secure'
+  - connection:
+  value: secure
  - port:
  value: '1514'
  - protocol:
- value: 'TCP'
+ value: TCP
 
  - section: sca
  elements:
@@ -36,14 +36,14 @@
 
  - section: wodle
  attributes:
- - name: 'syscollector'
+ - name: syscollector
  elements:
  - disabled:
  value: 'yes'
 
  - section: wodle
  attributes:
- - name: 'osquery'
+ - name: osquery
  elements:
  - disabled:
  value: 'yes'
diff --git a/...st_analysisd/test_eps/data/configuration_template/configuration_no_eps_configuration.yaml b/...st_analysisd/test_eps/data/configuration_template/configuration_no_eps_configuration.yaml
@@ -1,12 +1,12 @@
 - sections:
  - section: remote
  elements:
- - connection:
- value: 'secure'
- - port:
- value: '1514'
- - protocol:
- value: 'TCP'
+  - connection:
+  value: secure
+  - port:
+  value: '1514'
+  - protocol:
+  value: TCP
 
  - section: sca
  elements:
@@ -25,14 +25,14 @@
 
  - section: wodle
  attributes:
- - name: 'syscollector'
+ - name: syscollector
  elements:
  - disabled:
  value: 'yes'
 
  - section: wodle
  attributes:
- - name: 'osquery'
+ - name: osquery
  elements:
  - disabled:
  value: 'yes'
diff --git a/..._eps/data/configuration_template/configuration_process_old_events_instead_new_events.yaml b/..._eps/data/configuration_template/configuration_process_old_events_instead_new_events.yaml
@@ -3,21 +3,21 @@
  elements:
  - limits:
  elements:
- - eps:
- elements:
- - maximum:
- value: MAXIMUM
- - timeframe:
- value: TIMEFRAME
+  - eps:
+  elements:
+  - maximum:
+  value: MAXIMUM
+  - timeframe:
+  value: TIMEFRAME
 
  - section: remote
  elements:
- - connection:
- value: 'secure'
+  - connection:
+  value: secure
  - port:
  value: '1514'
  - protocol:
- value: 'TCP'
+ value: TCP
 
  - section: sca
  elements:
@@ -36,14 +36,14 @@
 
  - section: wodle
  attributes:
- - name: 'syscollector'
+ - name: syscollector
  elements:
  - disabled:
  value: 'yes'
 
  - section: wodle
  attributes:
- - name: 'osquery'
+ - name: osquery
  elements:
  - disabled:
  value: 'yes'
diff --git a/..._eps/data/configuration_template/configuration_start_dropping_events_when_queue_full.yaml b/..._eps/data/configuration_template/configuration_start_dropping_events_when_queue_full.yaml
@@ -3,21 +3,21 @@
  elements:
  - limits:
  elements:
- - eps:
- elements:
- - maximum:
- value: MAXIMUM
- - timeframe:
- value: TIMEFRAME
+  - eps:
+  elements:
+  - maximum:
+  value: MAXIMUM
+  - timeframe:
+  value: TIMEFRAME
 
  - section: remote
  elements:
- - connection:
- value: 'secure'
+  - connection:
+  value: secure
  - port:
  value: '1514'
  - protocol:
- value: 'TCP'
+ value: TCP
 
  - section: sca
  elements:
@@ -36,14 +36,14 @@
 
  - section: wodle
  attributes:
- - name: 'syscollector'
+ - name: syscollector
  elements:
  - disabled:
  value: 'yes'
 
  - section: wodle
  attributes:
- - name: 'osquery'
+ - name: osquery
  elements:
  - disabled:
  value: 'yes'