Server Access integration tests #3771

nico-stefani · 2023-01-17T19:33:38Z

Related issue
#3344

Description

This PR adds tests for AWS Server Access integration

Added

Tier 0

Default configuration tests
remove_from_bucket parameter tests
only_logs_after parameter tests
path parameter tests
discard_regex parameter tests

Tier 1

only_logs_after parameter tests

Testing performed

Tester	Test path	Jenkins	Local	OS	Commit	Notes
@nico-stefani (Developer)	`tests/integration/test_aws`	⚫⚫⚫	🔴 🔴	Ubuntu 22.04		¹
@Reviewer (Reviewer)		⚫⚫⚫				Nothing to highlight

Tier 0 results

============================= test session starts ==============================
platform linux -- Python 3.10.6, pytest-7.1.2, pluggy-1.0.0
rootdir: /home/vagrant/qa/tests/integration, configfile: pytest.ini
plugins: metadata-2.0.2, html-3.1.1, testinfra-5.0.0
collected 24 items / 16 deselected / 8 selected

test_basic.py .                                                          [ 12%]
test_discard_regex.py .                                                  [ 25%]
test_only_logs_after.py ..                                               [ 50%]
test_path.py .FF                                                         [ 87%]
test_remove_from_bucket.py .                                             [100%]

=================================== FAILURES ===================================
__________________ test_path[server_access_path_without_data] __________________
------------------------------ Captured log call -------------------------------
ERROR    wazuh_testing:monitoring.py:465 The AWS module did not show correct message about empty path
ERROR    wazuh_testing:monitoring.py:466 Results accumulated: 0
ERROR    wazuh_testing:monitoring.py:468 Results expected: 1
___________________ test_path[server_access_inexistent_path] ___________________
------------------------------ Captured log call -------------------------------
ERROR    wazuh_testing:monitoring.py:465 The AWS module did not show correct message about empty path
ERROR    wazuh_testing:monitoring.py:466 Results accumulated: 0
ERROR    wazuh_testing:monitoring.py:468 Results expected: 1
=========================== short test summary info ============================
FAILED test_path.py::test_path[server_access_path_without_data] - TimeoutErro...
FAILED test_path.py::test_path[server_access_inexistent_path] - TimeoutError:...
====== 2 failed, 6 passed, 16 deselected, 3 warnings in 185.45s (0:03:05) ======

Tier 1 results

============================= test session starts ==============================
platform linux -- Python 3.10.6, pytest-7.1.2, pluggy-1.0.0
rootdir: /home/vagrant/qa/tests/integration, configfile: pytest.ini
plugins: metadata-2.0.2, html-3.1.1, testinfra-5.0.0
collected 24 items / 23 deselected / 1 selected

test_only_logs_after.py F                                                [100%]

=================================== FAILURES ===================================
------------------------------ Captured log call -------------------------------
DEBUG    wazuh_testing:cli_utils.py:23 Calling AWS module with: '[PosixPath('/var/ossec/wodles/aws/aws-s3'), '--bucket', 'wazuh-server-access-integration-tests', '--type', 'server_access', '--regions', 'us-east-1', '--aws_profile', 'qa', '--debug', '2']'
DEBUG    wazuh_testing:cli_utils.py:52 DEBUG: +++ Debug mode on - Level: 2
DEBUG    wazuh_testing:cli_utils.py:52 DEBUG: Generating default configuration for retries: mode standard - max_attempts 10
DEBUG    wazuh_testing:cli_utils.py:52 DEBUG: +++ Table does not exist; create
DEBUG    wazuh_testing:cli_utils.py:52 DEBUG: +++ Marker: 2023-01-17
DEBUG    wazuh_testing:cli_utils.py:52 DEBUG: ++ Skipping file with another prefix: test_prefix/2022-11-21-16-10-29-FC57K8FSQEKP39RM
DEBUG    wazuh_testing:cli_utils.py:52 DEBUG: +++ DB Maintenance
ERROR    wazuh_testing:cli_utils.py:62 Some logs may were processed
ERROR    wazuh_testing:cli_utils.py:63 Results found: 0
ERROR    wazuh_testing:cli_utils.py:64 Results expected: 1
=========================== short test summary info ============================
FAILED test_only_logs_after.py::test_multiple_calls[server_access_only_logs_after_multiple_calls]
================ 1 failed, 23 deselected, 3 warnings in 18.64s =================

Because the module is not showing the message about no logs to process, the server_access_only_logs_after_multiple_calls, server_access_path_without_data, and server_access_inexistent_path tests are failing. This should be fixed in his respective issue. ↩

deps/wazuh_testing/wazuh_testing/modules/aws/data_generator.py

tests/integration/test_aws/test_discard_regex.py

deps/wazuh_testing/wazuh_testing/tools/utils.py

fdalmaup

LGTM!

Co-authored-by: Facundo Dalmau <[email protected]>

* feat(#3344): Add basic test for aws server access integration * feat(#3344): Add data generator for Server Access type * feat(#3344): Add remove_from_bucket test for aws SA integration * feat(#3344): Add schema for ServerAccess table * feat(#3344): Add only_logs_after tests for aws SA integration * feat(#3344): Add path tests for aws SA integration * feat(#3344): Add discard_regex tests for aws FA integration * feat(#3344): Add only_logs_after tier 1 for aws SA integration * feat(#3344): Use table_name instead of bucket_type * style(#3344): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]>

* feat(#3333): Add basic structure for AWS tests * feat(#3335): Cloudtrail integration tests (#3624) * feat(#3335): add basic test for aws cloudtrail module * feat(#3335): add utils for handle files in S3 buckets * feat(#3335): add remove_from_bucket test for aws cloudtrail module * feat(#3335): add fixture for delete s3_cloudtrail.db * refactor(#3335): rename modules * refactor(#3335): change the return of upload_file function * refactor(#3335): Fix docstring and rename constant * refactor(#3335): improve default test catching parser and module errors * feat(#3335): add only_logs_from test for aws cloudtrail module * feat(#3335): add path tests for aws cloudtrail module * feat(#3335): add path_suffix tests for aws cloudtrail module * feat(#3335): add regions tests for aws cloudtrail module * refactor(#3335): Move wazuh_log_monitor to a fixture * feat(#3335): add discard_regex tests for aws cloudtrail module * feat(#3335): add only_logs_after tier_1 test for aws cloudtrail module * refactor(#3335): Improve name of test cases * refactor(#3335): Improve tests assertions * refactor(#3335): Improve tier 1 test * refactor(#3335): Implement new design for Tier 1 test * style(#3335): Changed the extension from .yml to .yaml * style(#3335): Fixed linter issues * style(#3335): Apply suggestions from code review Co-authored-by: José Luis López Sánchez <[email protected]> * refactor(#3335): Add path parameter to get_db_connection * style(#3335): Fix quotes use according to QA style * style(#3335): Use google docstring style * refactor(#3335): Add missing information about fixtures * refactor(#3335): Change sqlite table name for backward compatibility * style(#3335): Fix docstrings punctuation and capitalization * refactor(#3335): Apply suggestions from code review * style(#3335): Apply suggestions from code review Fix punctuation in docstrings. Co-authored-by: David Jose Iglesias Lopez <[email protected]> * style(#3335): Apply suggestions from code review Co-authored-by: David Jose Iglesias Lopez <[email protected]> Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> * feat(#3336): VPC integration tests (#3699) * feat(#3336): Add basic test for aws vpc integration * feat(#3336): Add data generator for vpcflow type * feat(#3336): Add remove_from_bucket test for aws vpc integration * feat(#3336): Add only_logs_after tests for aws vpc integration * feat(#3336): Add path tests for aws vpc integration * feat(#3336): Add path_suffix tests for aws vpc integration * feat(#3336): Add regions tests for aws vpc integration * feat(#3336): Add discard_regex tests for aws vpc integration * feat(#3336): Add only_logs_after tier_1 tests for aws vpc integration * style(#3336): Fix linter issues * feat(#3336): Use join in path builds * feat(#3336): Fix cloudtrail cases * feat(#3336): Detect found and skipped logs * feat(#3336): Improve delete_file_from_s3 fixture * fix(#3336): Add minor fixes --------- Co-authored-by: David Jose Iglesias Lopez <[email protected]> * refactor(#3333): Use utcnow() instead of now() * feat(#3337): AWS Config integration tests (#3705) * feat(#3337): Add basic test for aws config integration * feat(#3337): Add remove_from_bucket test for aws config integration * feat(#3337): Add only_logs_after tests for aws config integration * feat(#3337): Add path tests for aws config integration * feat(#3337): Add path_suffix tests for aws config integration * feat(#3337): Add regions tests for aws config integration * feat(#3337): Add discard_regex tests for aws config integration * feat(#3337): Add only_logs_after tier_1 tests for aws config integration * feat(#3337): Use non padaded month format * feat(#3337): Use join in path builds * feat(#3337): Improve message for check_non_processed_logs_from_output * fix(#3337): Add minor fixes * feat(#3338): ALB, CLB and NLB integration tests (#3711) * feat(#3338): Add basic test for aws ALB integration * feat(#3338): Add remove_from_bucket test for aws ALB integration * feat(#3338): Add schema for ALB table * feat(#3338): Add only_logs_after tests for aws ALB integration * feat(#3338): Add path tests for aws ALB integration * feat(#3338): Add regions tests for aws ALB integration * feat(#3338): Add regions discard_regex for aws ALB integration * feat(#3338): Add regions only_logs_after tier 1 for aws ALB integration * feat(#3338): Improve upload_and_delete_file_to_s3 fixture * feat(#3338): Skip remove_from_bucket test case for ALB * feat(#3338): Add basic test for aws CLB integration * feat(#3338): Add remove_from_bucket test for aws CLB integration * feat(#3338): Add only_logs_after tests for aws CLB integration * feat(#3338): Add path tests for aws CLB integration * feat(#3338): Add regions only_logs_after tier 1 for aws CLB integration * feat(#3338): Add regions discard_regex for aws CLB integration * feat(#3338): Add only_logs_after tier 1 for aws CLB integration * feat(#3338): Skip remove_from_bucket test case for CLB * feat(#3338): Add basic test for aws NLB integration * feat(#3338): Add remove_from_bucket test for aws NLB integration * feat(#3338): Add only_logs_after tests for aws NLB integration * feat(#3338): Add path tests for aws NLB integration * feat(#3338): Add regions tests for aws NLB integration * feat(#3338): Add only_logs_after tier 1 for aws NLB integration * style(#3335): Fix linter issues * feat(#3338): Move skip function to a fixture * feat(#3338): Use join in path builds * feat(#3338): Improve docstrings * feat(#3338): Increase timeout to avoid random failures * refactor(#3338): Use utcnow() instead of now() and typos * refactor(#3338): Apply changes from CR * feat(#3339): KMS integration tests (#3715) * feat(#3339): Add basic test for aws KMS integration * feat(#3339): Add data generator for KMS type * feat(#3339): Add remove_from_bucket test for aws KMS integration * feat(#3339): Add schema for custom table * feat(#3339): Add only_logs_after tests for aws KMS integration * feat(#3339): Add path tests for aws KMS integration * feat(#3339): Add discard_regex tests for aws KMS integration * feat(#3339): Adapt only_logs_after tier 1 test to custom types * feat(#3339): Add only_logs_after tier 1 for aws KMS integration * feat(#3339): Use join in path builds * feat(#3339): Improve skipped logs count in tier 1 test * feat(#3339): Add missing docstring * style(#3339): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * refactor(#3339): Use utcnow() instead of now() and typos * fix(#3339): Apply suggestions from code review Co-authored-by: David Jose Iglesias Lopez <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> * feat(#3340): Macie integration tests (#3734) * feat(#3340): Add basic test for aws Macie integration * feat(#3336): Add data generator for vpcflow type * feat(#3340): Add remove_from_bucket test for aws Macie integration * feat(#3340): Add only_logs_after tests for aws Macie integration * feat(#3340): Add path tests for aws Macie integration * feat(#3340): Add discard_regex tests for aws Macie integration * feat(#3340): Add only_logs_after tier 1 for aws Macie integration * feat(#3340): Use join in path builds * fix(#3340): Fix typo * fix(#3340): Remove unused arguments * style(#3340): Apply suggestions from code review Co-authored-by: David Jose Iglesias Lopez <[email protected]> --------- Co-authored-by: David Jose Iglesias Lopez <[email protected]> * fix(#3333): Improve test condition * feat(#3341): Trusted Advisor integration tests (#3736) * feat(#3341): Add basic test for aws Trusted Advisor integration * feat(#3339): Add data generator for KMS type * feat(#3341): Add remove_from_bucket test * feat(#3341): Add only_logs_after tests for aws Trusted Advisor integration * feat(#3341): Add path tests for aws Trusted Advisor integration * feat(#3341): Add discard_regex tests for aws Trusted Advisor integration * feat(#3341): Add only_logs_after tier 1 for aws Trusted Advisor integration * feat(#3342): GuardDuty integration tests (#3762) * feat(#3342): Add basic test for aws GuardDuty integration * feat(#3342): Add remove_from_bucket test for aws Guard Duty integration * feat(#3342): Add schema for GuardDuty table * feat(#3342): Add only_logs_after tests for aws GuardDuty integration * feat(#3342): Add path tests for aws GuardDuty integration * feat(#3342): Add discard_regex tests for aws GuardDuty integration * feat(#3342): Add only_logs_after tier 1 for aws GuarDuty integration * fix(#3342): Adjust the number of found logs * feat(#3342): Add missing docstring * feat(#3342): Add data generator for Native GD * feat(#3342): Add test cases for Native GuardDuty * refactor(#3342): Improve tier 1 test findings * fix(#3333): Improve some test findings * feat(#3343): WAF integration tests (#3763) * feat(#3343): Add basic test for aws WAF integration * feat(#3343): Add data generator for WAF type * feat(#3343): Add remove_from_bucket test for aws WAF integration * feat(#3343): Add schema for WAF table * feat(#3343): Add only_logs_after tests for aws WAF integration * feat(#3343): Add path tests for aws WAF integration * feat(#3343): Add discard_regex tests for aws WAF integration * feat(#3343): Add only_logs_after tier 1 for aws WAF integration * style(#3343): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * refactor(#3343): Improve discard_regex test findings --------- Co-authored-by: Facundo Dalmau <[email protected]> * feat(#3344): Server Access integration tests (#3771) * feat(#3344): Add basic test for aws server access integration * feat(#3344): Add data generator for Server Access type * feat(#3344): Add remove_from_bucket test for aws SA integration * feat(#3344): Add schema for ServerAccess table * feat(#3344): Add only_logs_after tests for aws SA integration * feat(#3344): Add path tests for aws SA integration * feat(#3344): Add discard_regex tests for aws FA integration * feat(#3344): Add only_logs_after tier 1 for aws SA integration * feat(#3344): Use table_name instead of bucket_type * style(#3344): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * feat(#3345): Add basic test for aws inspector integration * feat(#3345): Add only_logs_after tests for aws Inspector integration * feat(#3345): Add only_logs_after tier 1 for Inspector integration * refactor(#3345): Minor fixes * style(#3345): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * style(#3345): Apply suggestions from code review Co-authored-by: José Luis López Sánchez <[email protected]> * feat(#3346): CloudWatch integration tests (#3857) * feat(#3346): Add basic test for aws cloudwatch integration * feat(#3346): Rename basic test for buckets integration * feat(#3346): Add tools for cloudwatch integration * feat(#3346): Add remove_log_streams test for aws cloudwatch integration * feat(#3346): Add utils for cloudwatch tests * feat(#3346): Add fixtures for cloudwatch tests * feat(#3346): Add only_logs_after tests for aws CloudWatch integration * feat(#3346): Rename only_logs_after tests for buckets integration * feat(#3346): Add regions tests for aws CloudWatch integration * feat(#3346): Rename regions tests for buckets integration * feat(#3346): Add log_groups tests for aws CloudWatch integration * feat(#3346): Add only_logs_after tier 1 for aws CloudWatch integration * feat(#3346): Rename tier 1 tests for buckets integration * refactor(#3346): Minor fixes * style(#3346): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * style(#3346): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * feat(#3347): Umbrella integration tests (#3796) * feat(#3347): Add basic test for aws umbrella integration * feat(#3347): Add data generator for Umbrella type * feat(#3347): Add remove_from_bucket test for aws Umbrella integration * feat(#3347): Add schema for Umbrella table * feat(#3347): Add only_logs_after tests for aws Umbrella integration * feat(#3347): Add path tests for aws Umbrella integration * feat(#3347): Add discard_regex tests for aws Umbrella integration * feat(#3347): Add only_logs_after tier 1 for aws Umbrella integration * style(#3347): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3347): Fix discard_regex test findings --------- Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3333): Add missing PATH with empty value * feat(#3581): Parser integration tests (#3882) * feat(#3581): Add tests for mandatory missing params * feat(#3581): Add tests for empty values * feat(#3581): Add tests for invalid values * feat(#3581): Add tests for multiple bucket and service tags * style(#3581): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * style(#3581): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3333): Adjust some tests values * fix(#3333): Fix cloudwatchlogs_log_groups_with_data test * fix(#3333): Adjust cisco_umbrella_only_logs_after_multiple_calls values * fix(#3333): Normalize tier1 tests for all bucket integrations * feat(#3348): AWS integration tests readme (#3892) * docs(#3348): Add AWS integration tests README * docs(#3348): Add referece to AWS tests * refactor(#3348): Improve explanation about credentials Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3333): Adjust inexistent_region test for services * fix(#3333): Adjust parser tests * fix(#3333): Change message to search for services region tests * fix(#3333): Marked inspector tier 1 test as xfail * fix(#3333): Splitted inspector and cloudwatch logs * fix(#3333): Timeouts adjustments * fix(#3333): Fixed tests cases for cloudwatch tier 1 tests * fix(#3333): Fixed linter issues * docs(#3333): Added changelog * fix(#3333): Fixed order and format * fix(#3333): Moved constants to __init__.py * fix(#3333): Replaced wazuh_log_monitor with file_monitoring * fix(#3333): Moved constants to wazuh_testing/__init__.py * fix(#3333): Moved constants to test_aws/__init__.py * fix(#3333): Improved docstring * fix(#3333): Moved exception to new file * fix(#3333): Improved fixtures and removed unused ones * fix(#3333): Fixed quotation marks * fix(#3333): Removed type hints * fix(#3339): Apply suggestions from code review Co-authored-by: Julia Magán <[email protected]> * fix(#3333): Install boto3 only in linux * fix(#3339): Apply suggestions from code review Co-authored-by: Julia Magán <[email protected]> * fix(#3333): Moved constants --------- Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> Co-authored-by: Facundo Dalmau <[email protected]> Co-authored-by: Julia Magán <[email protected]>

* fix(#3328): update auth messages to new payload * fix(#4022): replace Popen() with call() ensuring process killing * feat(#4022): adapt enrollment tests to new payload * fix(#4022): fix wazuh_db global messages yaml * style(#4022): fix some linting issues from global_messages.yaml * fix(#4022): add status_code to queries * docs(#4022): update CHANGELOG * fix(#4026): solve a bug of migration tool framework * fix(#4020): fixed migration tool * feat(#4026): add new changes in the changelog * feat(#4062): adapt integration tests for Office365 GCC support * feat(#4062): adapt integration tests for Office365 GCC support * docs(#4062): update changelog * style(#4062): fix yaml linting errors * fix(#4062): correct the config yaml indents * fix(#4062): add missing api_type value in case 8 --------- Co-authored-by: Bryce Shurts <[email protected]> * merge(#4089)!: merge 4.4 into 4.5 * fix(3862): fix test_assign_agent_group_with_enrollment * fix(#3862): delete default group check * feat(#3862): update changelog * refactor(#3862): add expected logs * fix(#4047): fix duplicated slash in API endpoint (#4048) * refactor: update changelog * refactor: bump version to 4.3.10 * refactor: update changelog --------- Co-authored-by: jmv74211 <[email protected]> * feat: update changelog for 4.4.1 tag (#4084) * fix(#4079): fix unstable system tests * fix(#4079): test active response log format * fix(#4079): remove log monitor to avoid race condition * fix(#4079): internal option fixture call * fix(#4079): enrollment cluster log path typo * docs(#4070): include missing tests in README * feat(#4079): include marks to system tests * docs(#4070): update changelog * docs(#4079): restore deleted commentary * docs(#4079): move pr changes to fixed category * fix(#3942): fix agentd IT for python310 * fix(#3942): include simulator teardown * style(#3943): pep8 * docs(#3942): include 3973 changelog * docs(#3942): move pr changes to fixed category * refactor(#3942): remove unnecessary scopes * docs(#3942): change changelog pr entry * docs(#3942): move change to 4.4.2 * docs(#3942): include teardown documentation * feat(#3912): add tests for groups deletion * feat(#3912): add function to get group id * feat(#3912): add test for group deletion * feat(#3912): add test cases * fix(#3912): fix linter errors * feat(#3912): update changelog * fix(#3912): fix typo * docs(#3912): improve description * fix(#3912): change import * docs(#3912): improve documentation * fix(#3912): delete created group during tear down * docs(#3912): add documentation * refactor(#3912)!: change delete function and test cases * refactor(#3912): change affected tests * feat(#3912): store binary path * docs(#3912): add function documentation * fix(#3912): update changelog * feat(#4089): bump version to 4.4.2 * feat(#4089): bump version to 4.4.2 * refactor(#4089): change revision --------- Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: jmv74211 <[email protected]> Co-authored-by: Víctor Rebollo Pérez <[email protected]> * fix(#4105): fix a bug when running tests for the first time * fix(#4082): updated log severity * fix(#4082): updated log severity * docs(#4082): update CHANGELOG * feat(#3361): add MSU Catalog Patches IT * feat(#3361): add database query function * feat(#3361): add new test module and cases * style(#3361): fix yaml styling * style(#3361): fix spacing and whitespaces * docs(#3361): update changelog * docs(#3361): add clarifying comment * style(#3361): remove whitespace * style(#3361): fix style and docu * feat(#3333): add AWS integration tests * feat(#3333): Add basic structure for AWS tests * feat(#3335): Cloudtrail integration tests (#3624) * feat(#3335): add basic test for aws cloudtrail module * feat(#3335): add utils for handle files in S3 buckets * feat(#3335): add remove_from_bucket test for aws cloudtrail module * feat(#3335): add fixture for delete s3_cloudtrail.db * refactor(#3335): rename modules * refactor(#3335): change the return of upload_file function * refactor(#3335): Fix docstring and rename constant * refactor(#3335): improve default test catching parser and module errors * feat(#3335): add only_logs_from test for aws cloudtrail module * feat(#3335): add path tests for aws cloudtrail module * feat(#3335): add path_suffix tests for aws cloudtrail module * feat(#3335): add regions tests for aws cloudtrail module * refactor(#3335): Move wazuh_log_monitor to a fixture * feat(#3335): add discard_regex tests for aws cloudtrail module * feat(#3335): add only_logs_after tier_1 test for aws cloudtrail module * refactor(#3335): Improve name of test cases * refactor(#3335): Improve tests assertions * refactor(#3335): Improve tier 1 test * refactor(#3335): Implement new design for Tier 1 test * style(#3335): Changed the extension from .yml to .yaml * style(#3335): Fixed linter issues * style(#3335): Apply suggestions from code review Co-authored-by: José Luis López Sánchez <[email protected]> * refactor(#3335): Add path parameter to get_db_connection * style(#3335): Fix quotes use according to QA style * style(#3335): Use google docstring style * refactor(#3335): Add missing information about fixtures * refactor(#3335): Change sqlite table name for backward compatibility * style(#3335): Fix docstrings punctuation and capitalization * refactor(#3335): Apply suggestions from code review * style(#3335): Apply suggestions from code review Fix punctuation in docstrings. Co-authored-by: David Jose Iglesias Lopez <[email protected]> * style(#3335): Apply suggestions from code review Co-authored-by: David Jose Iglesias Lopez <[email protected]> Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> * feat(#3336): VPC integration tests (#3699) * feat(#3336): Add basic test for aws vpc integration * feat(#3336): Add data generator for vpcflow type * feat(#3336): Add remove_from_bucket test for aws vpc integration * feat(#3336): Add only_logs_after tests for aws vpc integration * feat(#3336): Add path tests for aws vpc integration * feat(#3336): Add path_suffix tests for aws vpc integration * feat(#3336): Add regions tests for aws vpc integration * feat(#3336): Add discard_regex tests for aws vpc integration * feat(#3336): Add only_logs_after tier_1 tests for aws vpc integration * style(#3336): Fix linter issues * feat(#3336): Use join in path builds * feat(#3336): Fix cloudtrail cases * feat(#3336): Detect found and skipped logs * feat(#3336): Improve delete_file_from_s3 fixture * fix(#3336): Add minor fixes --------- Co-authored-by: David Jose Iglesias Lopez <[email protected]> * refactor(#3333): Use utcnow() instead of now() * feat(#3337): AWS Config integration tests (#3705) * feat(#3337): Add basic test for aws config integration * feat(#3337): Add remove_from_bucket test for aws config integration * feat(#3337): Add only_logs_after tests for aws config integration * feat(#3337): Add path tests for aws config integration * feat(#3337): Add path_suffix tests for aws config integration * feat(#3337): Add regions tests for aws config integration * feat(#3337): Add discard_regex tests for aws config integration * feat(#3337): Add only_logs_after tier_1 tests for aws config integration * feat(#3337): Use non padaded month format * feat(#3337): Use join in path builds * feat(#3337): Improve message for check_non_processed_logs_from_output * fix(#3337): Add minor fixes * feat(#3338): ALB, CLB and NLB integration tests (#3711) * feat(#3338): Add basic test for aws ALB integration * feat(#3338): Add remove_from_bucket test for aws ALB integration * feat(#3338): Add schema for ALB table * feat(#3338): Add only_logs_after tests for aws ALB integration * feat(#3338): Add path tests for aws ALB integration * feat(#3338): Add regions tests for aws ALB integration * feat(#3338): Add regions discard_regex for aws ALB integration * feat(#3338): Add regions only_logs_after tier 1 for aws ALB integration * feat(#3338): Improve upload_and_delete_file_to_s3 fixture * feat(#3338): Skip remove_from_bucket test case for ALB * feat(#3338): Add basic test for aws CLB integration * feat(#3338): Add remove_from_bucket test for aws CLB integration * feat(#3338): Add only_logs_after tests for aws CLB integration * feat(#3338): Add path tests for aws CLB integration * feat(#3338): Add regions only_logs_after tier 1 for aws CLB integration * feat(#3338): Add regions discard_regex for aws CLB integration * feat(#3338): Add only_logs_after tier 1 for aws CLB integration * feat(#3338): Skip remove_from_bucket test case for CLB * feat(#3338): Add basic test for aws NLB integration * feat(#3338): Add remove_from_bucket test for aws NLB integration * feat(#3338): Add only_logs_after tests for aws NLB integration * feat(#3338): Add path tests for aws NLB integration * feat(#3338): Add regions tests for aws NLB integration * feat(#3338): Add only_logs_after tier 1 for aws NLB integration * style(#3335): Fix linter issues * feat(#3338): Move skip function to a fixture * feat(#3338): Use join in path builds * feat(#3338): Improve docstrings * feat(#3338): Increase timeout to avoid random failures * refactor(#3338): Use utcnow() instead of now() and typos * refactor(#3338): Apply changes from CR * feat(#3339): KMS integration tests (#3715) * feat(#3339): Add basic test for aws KMS integration * feat(#3339): Add data generator for KMS type * feat(#3339): Add remove_from_bucket test for aws KMS integration * feat(#3339): Add schema for custom table * feat(#3339): Add only_logs_after tests for aws KMS integration * feat(#3339): Add path tests for aws KMS integration * feat(#3339): Add discard_regex tests for aws KMS integration * feat(#3339): Adapt only_logs_after tier 1 test to custom types * feat(#3339): Add only_logs_after tier 1 for aws KMS integration * feat(#3339): Use join in path builds * feat(#3339): Improve skipped logs count in tier 1 test * feat(#3339): Add missing docstring * style(#3339): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * refactor(#3339): Use utcnow() instead of now() and typos * fix(#3339): Apply suggestions from code review Co-authored-by: David Jose Iglesias Lopez <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> * feat(#3340): Macie integration tests (#3734) * feat(#3340): Add basic test for aws Macie integration * feat(#3336): Add data generator for vpcflow type * feat(#3340): Add remove_from_bucket test for aws Macie integration * feat(#3340): Add only_logs_after tests for aws Macie integration * feat(#3340): Add path tests for aws Macie integration * feat(#3340): Add discard_regex tests for aws Macie integration * feat(#3340): Add only_logs_after tier 1 for aws Macie integration * feat(#3340): Use join in path builds * fix(#3340): Fix typo * fix(#3340): Remove unused arguments * style(#3340): Apply suggestions from code review Co-authored-by: David Jose Iglesias Lopez <[email protected]> --------- Co-authored-by: David Jose Iglesias Lopez <[email protected]> * fix(#3333): Improve test condition * feat(#3341): Trusted Advisor integration tests (#3736) * feat(#3341): Add basic test for aws Trusted Advisor integration * feat(#3339): Add data generator for KMS type * feat(#3341): Add remove_from_bucket test * feat(#3341): Add only_logs_after tests for aws Trusted Advisor integration * feat(#3341): Add path tests for aws Trusted Advisor integration * feat(#3341): Add discard_regex tests for aws Trusted Advisor integration * feat(#3341): Add only_logs_after tier 1 for aws Trusted Advisor integration * feat(#3342): GuardDuty integration tests (#3762) * feat(#3342): Add basic test for aws GuardDuty integration * feat(#3342): Add remove_from_bucket test for aws Guard Duty integration * feat(#3342): Add schema for GuardDuty table * feat(#3342): Add only_logs_after tests for aws GuardDuty integration * feat(#3342): Add path tests for aws GuardDuty integration * feat(#3342): Add discard_regex tests for aws GuardDuty integration * feat(#3342): Add only_logs_after tier 1 for aws GuarDuty integration * fix(#3342): Adjust the number of found logs * feat(#3342): Add missing docstring * feat(#3342): Add data generator for Native GD * feat(#3342): Add test cases for Native GuardDuty * refactor(#3342): Improve tier 1 test findings * fix(#3333): Improve some test findings * feat(#3343): WAF integration tests (#3763) * feat(#3343): Add basic test for aws WAF integration * feat(#3343): Add data generator for WAF type * feat(#3343): Add remove_from_bucket test for aws WAF integration * feat(#3343): Add schema for WAF table * feat(#3343): Add only_logs_after tests for aws WAF integration * feat(#3343): Add path tests for aws WAF integration * feat(#3343): Add discard_regex tests for aws WAF integration * feat(#3343): Add only_logs_after tier 1 for aws WAF integration * style(#3343): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * refactor(#3343): Improve discard_regex test findings --------- Co-authored-by: Facundo Dalmau <[email protected]> * feat(#3344): Server Access integration tests (#3771) * feat(#3344): Add basic test for aws server access integration * feat(#3344): Add data generator for Server Access type * feat(#3344): Add remove_from_bucket test for aws SA integration * feat(#3344): Add schema for ServerAccess table * feat(#3344): Add only_logs_after tests for aws SA integration * feat(#3344): Add path tests for aws SA integration * feat(#3344): Add discard_regex tests for aws FA integration * feat(#3344): Add only_logs_after tier 1 for aws SA integration * feat(#3344): Use table_name instead of bucket_type * style(#3344): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * feat(#3345): Add basic test for aws inspector integration * feat(#3345): Add only_logs_after tests for aws Inspector integration * feat(#3345): Add only_logs_after tier 1 for Inspector integration * refactor(#3345): Minor fixes * style(#3345): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * style(#3345): Apply suggestions from code review Co-authored-by: José Luis López Sánchez <[email protected]> * feat(#3346): CloudWatch integration tests (#3857) * feat(#3346): Add basic test for aws cloudwatch integration * feat(#3346): Rename basic test for buckets integration * feat(#3346): Add tools for cloudwatch integration * feat(#3346): Add remove_log_streams test for aws cloudwatch integration * feat(#3346): Add utils for cloudwatch tests * feat(#3346): Add fixtures for cloudwatch tests * feat(#3346): Add only_logs_after tests for aws CloudWatch integration * feat(#3346): Rename only_logs_after tests for buckets integration * feat(#3346): Add regions tests for aws CloudWatch integration * feat(#3346): Rename regions tests for buckets integration * feat(#3346): Add log_groups tests for aws CloudWatch integration * feat(#3346): Add only_logs_after tier 1 for aws CloudWatch integration * feat(#3346): Rename tier 1 tests for buckets integration * refactor(#3346): Minor fixes * style(#3346): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * style(#3346): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * feat(#3347): Umbrella integration tests (#3796) * feat(#3347): Add basic test for aws umbrella integration * feat(#3347): Add data generator for Umbrella type * feat(#3347): Add remove_from_bucket test for aws Umbrella integration * feat(#3347): Add schema for Umbrella table * feat(#3347): Add only_logs_after tests for aws Umbrella integration * feat(#3347): Add path tests for aws Umbrella integration * feat(#3347): Add discard_regex tests for aws Umbrella integration * feat(#3347): Add only_logs_after tier 1 for aws Umbrella integration * style(#3347): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3347): Fix discard_regex test findings --------- Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3333): Add missing PATH with empty value * feat(#3581): Parser integration tests (#3882) * feat(#3581): Add tests for mandatory missing params * feat(#3581): Add tests for empty values * feat(#3581): Add tests for invalid values * feat(#3581): Add tests for multiple bucket and service tags * style(#3581): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> * style(#3581): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3333): Adjust some tests values * fix(#3333): Fix cloudwatchlogs_log_groups_with_data test * fix(#3333): Adjust cisco_umbrella_only_logs_after_multiple_calls values * fix(#3333): Normalize tier1 tests for all bucket integrations * feat(#3348): AWS integration tests readme (#3892) * docs(#3348): Add AWS integration tests README * docs(#3348): Add referece to AWS tests * refactor(#3348): Improve explanation about credentials Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]> * fix(#3333): Adjust inexistent_region test for services * fix(#3333): Adjust parser tests * fix(#3333): Change message to search for services region tests * fix(#3333): Marked inspector tier 1 test as xfail * fix(#3333): Splitted inspector and cloudwatch logs * fix(#3333): Timeouts adjustments * fix(#3333): Fixed tests cases for cloudwatch tier 1 tests * fix(#3333): Fixed linter issues * docs(#3333): Added changelog * fix(#3333): Fixed order and format * fix(#3333): Moved constants to __init__.py * fix(#3333): Replaced wazuh_log_monitor with file_monitoring * fix(#3333): Moved constants to wazuh_testing/__init__.py * fix(#3333): Moved constants to test_aws/__init__.py * fix(#3333): Improved docstring * fix(#3333): Moved exception to new file * fix(#3333): Improved fixtures and removed unused ones * fix(#3333): Fixed quotation marks * fix(#3333): Removed type hints * fix(#3339): Apply suggestions from code review Co-authored-by: Julia Magán <[email protected]> * fix(#3333): Install boto3 only in linux * fix(#3339): Apply suggestions from code review Co-authored-by: Julia Magán <[email protected]> * fix(#3333): Moved constants --------- Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> Co-authored-by: Facundo Dalmau <[email protected]> Co-authored-by: Julia Magán <[email protected]> * merge(#4135)!: merge 4.4 into 4.5 * fix(3862): fix test_assign_agent_group_with_enrollment * fix(#3862): delete default group check * feat(#3862): update changelog * refactor(#3862): add expected logs * fix(#4047): fix duplicated slash in API endpoint (#4048) * refactor: update changelog * refactor: bump version to 4.3.10 * refactor: update changelog --------- Co-authored-by: jmv74211 <[email protected]> * feat: update changelog for 4.4.1 tag (#4084) * fix(#4079): fix unstable system tests * fix(#4079): test active response log format * fix(#4079): remove log monitor to avoid race condition * fix(#4079): internal option fixture call * fix(#4079): enrollment cluster log path typo * docs(#4070): include missing tests in README * feat(#4079): include marks to system tests * docs(#4070): update changelog * docs(#4079): restore deleted commentary * docs(#4079): move pr changes to fixed category * fix(#3942): fix agentd IT for python310 * fix(#3942): include simulator teardown * style(#3943): pep8 * docs(#3942): include 3973 changelog * docs(#3942): move pr changes to fixed category * refactor(#3942): remove unnecessary scopes * docs(#3942): change changelog pr entry * docs(#3942): move change to 4.4.2 * docs(#3942): include teardown documentation * feat(#3912): add tests for groups deletion * feat(#3912): add function to get group id * feat(#3912): add test for group deletion * feat(#3912): add test cases * fix(#3912): fix linter errors * feat(#3912): update changelog * fix(#3912): fix typo * docs(#3912): improve description * fix(#3912): change import * docs(#3912): improve documentation * fix(#3912): delete created group during tear down * docs(#3912): add documentation * refactor(#3912)!: change delete function and test cases * refactor(#3912): change affected tests * feat(#3912): store binary path * docs(#3912): add function documentation * fix(#3912): update changelog * feat(#4089): bump version to 4.4.2 * feat(#4089): bump version to 4.4.2 * refactor(#4089): change revision * feat(#3545): add test to check the syscollector configuration * feat(#3545): add test to check the syscollector configuration. * fix(#3545): fix errors when running tests in agents. * fix(#3545): modify the way the test restarts deamons. * fix(#3545): fix syscollector DB path in Windows. * fix(#3545): fix syscollector db path variable name. * fix(#3545): fix globalDB error due to execution in agent. * style(#3545): fix linter errors. * docs(#3545): add PR to changelog. * fix(#3545): fix some errors present in Windows tests. * fix(#3545): fix file monitor declaration. * fix(#3545): fix all_scans_disabled test. * refactor(#3545): change the timeout of filemonitor. * fix(#3545): fix macOS tests. * refactor(#3545): add mark to run the test on unix only. * fix(#3545): fix Windows tests. * docs(#3545): mark test as xfail because of an existing bug. * fix(#3545): remove the mark from unix tests. * fix(#3545): reuse an existing function and remove the utilized. * style(#3545): apply identation. * fix(#3545): fix naming and used functions. * fix(#3545): move fixture to integration conftest. * fix(#3545): improve a function name. * refactor(#3545): add new case, disable unused modules and minor changes. * fix(#3545): fix prefix. * fix(#3545): fix metadata because NoneType error. * fix(#3545): fix event monitor and truncate function. * refactor(#3545): remove the max_eps empty test case. It is not a critical field, so it will not thrown an error when empty. * fix(#3545): solve the log position problem when searching a message. * fix(#3545): apply linter corrections. * fix(#3545): fix the test configuration data. * fix(#3545): remove unused import and docs changed. * fix(#3545): change way of importing and minor changes. * fix(#3545): use param depending on the platform. * refactor(#3545): remove unused fixture and change callback. * fix(#3545): change the default argument for prefix. * style(#3545): add spaces for better visualization. * refactor(#3545): improve docs and change some logic. * docs(#3545): add comments and new documentation. * fix(#3545): fix NoneType error. * docs(#3545): fix changelog. * docs(#3545): add docs for file_to_monitor param. Improve existing docs. * refactor(#3545): remove duplicated function and improve documentation * fix(#3545): remove unused imports and sort the remaining ones. * docs(#3545): add docs to wrapped fixture. * fix(#3545): remove xfail mark and add note to mark. * docs(#3545): remove duplicated line. * style(#3545): sort imports according the guidelines. * docs(#3545): move change to 4.4.2 section in CHANGELOG. * fix(#4111): fix WazuhDB IT * fix(#4111): make_callback function * fix(#4111): typo in set agent groups tcases * fix(#4111): stop agent simulator after test end * docs(#4111): update changelog * fix(#4123): fix gcloud tests * fix(#4123): fix daemons_handler fixture. * fix(#4123): remove some analysisd on test_gcloud * fix(#4123): change test_logging fixtures to module * fix(#4123): start analysisd in test max messages * docs(#4123): add fix to CHANGELOG. --------- Co-authored-by: jnasselle <[email protected]> Co-authored-by: Víctor Rebollo Pérez <[email protected]> * feat(#4135): update changelog * refactor(#4137): change when the check is executed * refactor(#4137): change when the check is executed * fix(#4137): revert draft condition --------- Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: jmv74211 <[email protected]> Co-authored-by: Víctor Rebollo Pérez <[email protected]> Co-authored-by: Mauro Agustín Malara Zapata <[email protected]> Co-authored-by: jnasselle <[email protected]> --------- Co-authored-by: Kevin Ledesma <[email protected]> Co-authored-by: Belén Valdivia <[email protected]> Co-authored-by: Tomás Turina <[email protected]> Co-authored-by: Kevin Ledesma <[email protected]> Co-authored-by: Bryce Shurts <[email protected]> Co-authored-by: José Luis López Sánchez <[email protected]> Co-authored-by: jmv74211 <[email protected]> Co-authored-by: Víctor Rebollo Pérez <[email protected]> Co-authored-by: Mauro Agustín Malara Zapata <[email protected]> Co-authored-by: Andrés Carmelo Micalizzi Casali <[email protected]> Co-authored-by: Nico Stefani <[email protected]> Co-authored-by: David Jose Iglesias Lopez <[email protected]> Co-authored-by: Facundo Dalmau <[email protected]> Co-authored-by: jnasselle <[email protected]>

* feat(#3344): Add basic test for aws server access integration * feat(#3344): Add data generator for Server Access type * feat(#3344): Add remove_from_bucket test for aws SA integration * feat(#3344): Add schema for ServerAccess table * feat(#3344): Add only_logs_after tests for aws SA integration * feat(#3344): Add path tests for aws SA integration * feat(#3344): Add discard_regex tests for aws FA integration * feat(#3344): Add only_logs_after tier 1 for aws SA integration * feat(#3344): Use table_name instead of bucket_type * style(#3344): Apply suggestions from code review Co-authored-by: Facundo Dalmau <[email protected]> --------- Co-authored-by: Facundo Dalmau <[email protected]>

nico-stefani self-assigned this Jan 17, 2023

nico-stefani added team/framework feature/aws labels Jan 17, 2023

nico-stefani linked an issue Jan 17, 2023 that may be closed by this pull request

Add AWS Server Access integration tests #3344

Closed

nico-stefani commented Jan 26, 2023

View reviewed changes

deps/wazuh_testing/wazuh_testing/modules/aws/data_generator.py Outdated Show resolved Hide resolved

fdalmaup self-requested a review February 3, 2023 14:48

fdalmaup requested changes Feb 3, 2023

View reviewed changes

deps/wazuh_testing/wazuh_testing/modules/aws/data_generator.py Outdated Show resolved Hide resolved

tests/integration/test_aws/test_discard_regex.py Outdated Show resolved Hide resolved

deps/wazuh_testing/wazuh_testing/tools/utils.py Outdated Show resolved Hide resolved

nico-stefani requested a review from fdalmaup February 4, 2023 12:30

fdalmaup approved these changes Feb 6, 2023

View reviewed changes

nico-stefani force-pushed the 3344-sa-integration-tests branch from fc21ff7 to 2b50454 Compare February 7, 2023 21:30

nico-stefani force-pushed the 3333-aws-integration-tests branch from 0ca8cda to 4560775 Compare February 23, 2023 18:32

nico-stefani and others added 10 commits February 24, 2023 11:45

feat(#3344): Add basic test for aws server access integration

339ba6a

feat(#3344): Add data generator for Server Access type

b230983

feat(#3344): Add remove_from_bucket test for aws SA integration

a87de4e

feat(#3344): Add schema for ServerAccess table

8968676

feat(#3344): Add only_logs_after tests for aws SA integration

d3b634d

feat(#3344): Add path tests for aws SA integration

babc69a

feat(#3344): Add discard_regex tests for aws FA integration

600484b

feat(#3344): Add only_logs_after tier 1 for aws SA integration

bc303c2

feat(#3344): Use table_name instead of bucket_type

ebaa57c

style(#3344): Apply suggestions from code review

3e3a5ae

Co-authored-by: Facundo Dalmau <[email protected]>

nico-stefani force-pushed the 3344-sa-integration-tests branch from 2b50454 to 3e3a5ae Compare February 24, 2023 14:59

davidjiglesias approved these changes Feb 24, 2023

View reviewed changes

davidjiglesias merged commit 9dcbc07 into 3333-aws-integration-tests Feb 24, 2023

davidjiglesias deleted the 3344-sa-integration-tests branch February 24, 2023 15:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Server Access integration tests #3771

Server Access integration tests #3771

nico-stefani commented Jan 17, 2023 •

edited

Loading

fdalmaup left a comment

Server Access integration tests #3771

Server Access integration tests #3771

Conversation

nico-stefani commented Jan 17, 2023 • edited Loading

Description

Added

Tier 0

Tier 1

Testing performed

Tier 0 results

Tier 1 results

Footnotes

fdalmaup left a comment

Choose a reason for hiding this comment

nico-stefani commented Jan 17, 2023 •

edited

Loading