Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new module to support migration tool. #3837

Merged
merged 18 commits into from
Mar 9, 2023
Merged

Add new module to support migration tool. #3837

merged 18 commits into from
Mar 9, 2023

Conversation

mauromalara
Copy link
Contributor

@mauromalara mauromalara commented Jan 26, 2023 •
edited
Loading

Related issue
#3835

Description

Added

  • migration_tool/__init__.py: Module with useful variables and callback messages.
  • migration_tool/delta_schema.json: JSON Schema to validate files with deltas.
  • migration_tool/utils.py: Utils for the tests to use.
  • migration_tool/CVE_JSON_5.0_bundled.json: CVE5 schema (bundled)

Updated

  • requirements.txt: Added 2 dependencies to give support to the tests (MySQL and Protobuf)

Testing performed

Note: Performed in the tool repository.

Tester Test path Jenkins Local OS Commit Notes
@mauromalara (Developer) - 🟢 🟢 🟢 Nothing to highlight

@mauromalara mauromalara self-assigned this Jan 26, 2023
@mauromalara mauromalara linked an issue Jan 26, 2023 that may be closed by this pull request
Add module for Wazuh Content tests #3835
Closed
2 tasks
@jmv74211 jmv74211 changed the base branch from master to 4.5 February 1, 2023 10:20
damarisg
damarisg requested changes Feb 10, 2023
View reviewed changes
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/__init__.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/__init__.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/__init__.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
jmv74211
jmv74211 suggested changes Feb 24, 2023
View reviewed changes
Copy link
Contributor

@jmv74211 jmv74211 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the migration_tool to tools/migration

deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/tools/file.py Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/migration_tool/utils.py Outdated Show resolved Hide resolved
@mauromalara
refactor(#3845): remove library
b299617 
and remove MySQL credentials
@mauromalara mauromalara mentioned this pull request Mar 3, 2023
Closed
2 tasks
jmv74211
jmv74211 suggested changes Mar 7, 2023
View reviewed changes
Copy link
Contributor

@jmv74211 jmv74211 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't merge this PR until the new dependencies are tested in our Linux testing AMIs

deps/wazuh_testing/wazuh_testing/tools/file.py Outdated Show resolved Hide resolved
deps/wazuh_testing/wazuh_testing/tools/file.py Outdated Show resolved Hide resolved
@mauromalara
Copy link
Contributor Author

mauromalara commented Mar 9, 2023 •
edited
Loading

Here are the results of testing on the affected AMIs:

  • CentOS:
    • ami-085ec932dcfa6a863 ✅
    • ami-0ed833fb214b8dc7d ✅
    • ami-029496e60f56b4b13 ✅ (I had a problem with a previous installed dist-package called pexpect, which I solved by completely removing it from /usr/local/lib/pythonX/)
  • Ubuntu:
    • ami-014cd3d4f7e04afe4 ✅
    • ami-0f7782832745a900b ✅
    • ami-003530de8839921c4 ✅
  • ALAS:
    • ami-06cfe42abdba039eb ✅
  • Debian:
    • ami-0ecc034f025de7e7e ✅ (pip was not installed, so I had to install it by running apt-get install python3-pip

@jmv74211 jmv74211 merged commit 0ec8088 into 4.5 Mar 9, 2023
@jmv74211 jmv74211 deleted the 3835-add-module-for-cmt branch March 9, 2023 16:43
@Rebits Rebits mentioned this pull request Jul 20, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damarisg damarisg damarisg requested changes

@jmv74211 jmv74211 jmv74211 approved these changes

Assignees

@mauromalara mauromalara

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add module for Wazuh Content tests
3 participants
@mauromalara @damarisg @jmv74211