Skip to content

Commit

Permalink
Merge pull request #5071 from wazuh/merge-4.9.0-into-master
Browse files Browse the repository at this point in the history
Merge 4.9.0 into master
  • Loading branch information
rauldpm authored Mar 4, 2024
2 parents ef98f91 + 4de1216 commit 5061544
Show file tree
Hide file tree
Showing 43 changed files with 2,806 additions and 267 deletions.
32 changes: 28 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ All notable changes to this project will be documented in this file.

## [4.9.0] - TBD

### Changed

- Removed conventional commits, changelog, linter and CodeQL of GitHub Action.

### Added

- Add Workflow module to Wazuh-qa repository ([#4990](https://github.com/wazuh/wazuh-qa/pull/4990)) \- (Tests)
- Add integration tests for Update field to CPE_Helper. ([#4574](https://github.com/wazuh/wazuh-qa/pull/4574)) \- (Core)

### Changed

- Enhance the PR template. ([#4881](https://github.com/wazuh/wazuh-qa/pull/4881)) \- (Framework)

### Fixed

- Add an IT to check that the agent erases its wazuh-agent.state file ([#4716](https://github.com/wazuh/wazuh-qa/pull/4716)) \- (Core)

## [4.8.2] - TBD

## [4.8.1] - TBD
Expand Down Expand Up @@ -49,6 +50,11 @@ All notable changes to this project will be documented in this file.

### Changed

- Reduced test_shutdown_message runtime ([#4986](https://github.com/wazuh/wazuh-qa/pull/4986)) \- (Tests)
- Change e2e vd configuration keystore ([#4952](https://github.com/wazuh/wazuh-qa/pull/4952)) \- (Framework)
- Updating tests after removing references to the legacy vulnerability detector module ([#4872](https://github.com/wazuh/wazuh-qa/pull/4872)) \- (Tests)
- Fix wazuhdb API statistics parsing ([#5007](https://github.com/wazuh/wazuh-qa/pull/5007)) \- (Framework)
- Enhance StatisticMonitor with API support ([#4970](https://github.com/wazuh/wazuh-qa/pull/4970)) \- (Framework)
- Deactivate tests and update vulnerability-detector configuration ([#4784](https://github.com/wazuh/wazuh-qa/pull/4784)) \- (Framework + Tests)
- Fix body format for get_api_token ([#4797](https://github.com/wazuh/wazuh-qa/pull/4797)) \- (Framework)
- Fix one_manager_agent_env pytest marker for System Tests ([#4782](https://github.com/wazuh/wazuh-qa/pull/4782)) \- (Tests)
Expand All @@ -68,13 +74,31 @@ All notable changes to this project will be documented in this file.

### Fixed

- Fix initial scans tests ([#5032](https://github.com/wazuh/wazuh-qa/pull/5032)) \- (Framework + Tests)
- Handle VDT data missing in wazuh-db API ([#5014](https://github.com/wazuh/wazuh-qa/pull/5014)) \- (Framework + Tests)
- Fixed x-axis labels in data-visualizer script ([#4987](https://github.com/wazuh/wazuh-qa/pull/4987)) \- (Framework)
- Fix monitoring module for e2e tests ([#4959](https://github.com/wazuh/wazuh-qa/pull/4959)) \- (Framework)
- Fix get_host_variables for system tests ([#4958](https://github.com/wazuh/wazuh-qa/pull/4958)) \- (Framework)
- Fix install package HostManager method ([#4954](https://github.com/wazuh/wazuh-qa/pull/4954)) \- (Framework)
- Fix Modify file method in system module ([#4953](https://github.com/wazuh/wazuh-qa/pull/4953)) \- (Framework)
- Fix timeout and performance issues in E2E Vulnerability Detector tests ([#5003](https://github.com/wazuh/wazuh-qa/pull/5003)) \- (Framework)
- Fixed Filebeat provisioning role with pre-release and staging URLs ([#4950](https://github.com/wazuh/wazuh-qa/pull/4950)) \- (Framework)
- Fix macOS Vulnerability Detection handler provision in E2E tests ([#4948](https://github.com/wazuh/wazuh-qa/pull/4948)) \- (Framework)
- Migrate Vulnerability Detection timeouts variables to the waiters module ([#4949](https://github.com/wazuh/wazuh-qa/pull/4949)) \- (Framework)
- Migrate HostMonitor to system_monitoring to avoid Windows import of ansible module ([#4917](https://github.com/wazuh/wazuh-qa/pull/4917/)) \- (Framework)
- Fixed ansible_runner import conditional to avoid errors on Windows and python 3.6 ([#4916](https://github.com/wazuh/wazuh-qa/pull/4916)) \- (Framework)
- Fixed IT control_service Windows loop ([#4765](https://github.com/wazuh/wazuh-qa/pull/4765)) \- (Framework)
- Fix macOS agents provision to enable registration and connection with managers. ([#4770](https://github.com/wazuh/wazuh-qa/pull/4770/)) \- (Framework)
- Fix hardcoded python interpreter in qa_framework role. ([#4658](https://github.com/wazuh/wazuh-qa/pull/4658)) \- (Framework)
- Fix duplicated jq dependency ([#4678](https://github.com/wazuh/wazuh-qa/pull/4678)) \- (Framework)
- Fix test_file_checker in check_mtime case ([#4873](https://github.com/wazuh/wazuh-qa/pull/4873)) \- (Tests)
- Fix test cluster performance. ([#4780](https://github.com/wazuh/wazuh-qa/pull/4780)) \- (Framework)

## [4.7.3] - 04/03/2024

### Changed

- Upgrade wazuh-db agent database version. ([#4992](https://github.com/wazuh/wazuh-qa/pull/4992)) \- (Tests)

## [4.7.2] - 10/01/2024

Expand Down
4 changes: 4 additions & 0 deletions deployability/deps/remote_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pytest>=7.4.2,<8.0.0
chardet==5.2.0
chardet==5.2.0
pytest-tinybird==0.2.0
10 changes: 10 additions & 0 deletions deployability/deps/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ansible_runner==2.3.4
boto3==1.29.1
pydantic==2.5.2
ansible
ruamel.yaml==0.18.5
ruamel.yaml.clib==0.2.8
graphlib==0.9.5
jsonschema==3.2.0
PyYAML==6.0.1
colorlog==6.8.0
47 changes: 47 additions & 0 deletions deployability/modules/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

# Copyright (C) 2015, Wazuh Inc.
# Created by Wazuh, Inc. <[email protected]>.
# This program is free software; you can redistribute it and/or modify it under the terms of GPLv2
import json
from setuptools import setup, find_packages
import os
from pathlib import Path

def get_files_from_directory(directory):
paths = []
base_path = Path(__file__)
for (path, directories, filenames) in os.walk(directory):
for filename in filenames:
if filename.endswith(('.yaml', '.json', '.md', '.py')):
paths.append(os.path.join(base_path, path, filename))
return paths

def get_version():
abs_path = Path(__file__).parent.parent / "version.json"

if not os.path.exists(abs_path):
raise FileNotFoundError(f'File "{abs_path}" not found.')

with open(abs_path, 'r') as abs_file:
data = json.load(abs_file)
version = data['version']
return version or None

package_data_list = get_files_from_directory("workflow_engine")
scripts_list = ['engine=workflow_engine.__main__:main']

setup(
name='workflow_engine',
version=get_version(),
description='Wazuh testing utilities to help programmers automate deployment tests',
url='https://github.com/wazuh',
author='Wazuh',
author_email='[email protected]',
license='GPLv2',
packages=['workflow_engine'],
package_dir={'workflow_engine': 'workflow_engine'},
package_data={'workflow_engine': package_data_list},
entry_points={'console_scripts': scripts_list},
include_package_data=True,
zip_safe=False
)
Loading

0 comments on commit 5061544

Please sign in to comment.