fix: Refactor Outputs (#1548)

This commit is contained in:
Sergio Garcia
2022-12-20 18:23:30 +01:00
committed by GitHub
parent 9502355d22
commit bab6380d68
44 changed files with 1153 additions and 1106 deletions

View File

@@ -16,7 +16,10 @@ from prowler.config.config import (
timestamp_utc,
)
from prowler.lib.check.models import Check_Report, load_check_metadata
from prowler.lib.outputs.file_descriptors import fill_file_descriptors
from prowler.lib.outputs.json import fill_json_asff
from prowler.lib.outputs.models import (
generate_csv_fields,
Check_Output_CSV,
Check_Output_JSON_ASFF,
Compliance,
@@ -25,9 +28,6 @@ from prowler.lib.outputs.models import (
Severity,
)
from prowler.lib.outputs.outputs import (
fill_file_descriptors,
fill_json_asff,
generate_csv_fields,
send_to_s3_bucket,
set_report_color,
)

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -49,7 +49,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -98,7 +98,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -153,7 +153,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -49,7 +49,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -98,7 +98,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -153,7 +153,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -49,7 +49,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -98,7 +98,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -153,7 +153,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail

View File

@@ -47,7 +47,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -94,7 +94,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail
@@ -147,7 +147,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
result[0].status_extended
== "No CloudWatch log groups found with metric filters or alarms associated."
)
assert result[0].resource_id == ""
assert result[0].resource_id == current_audit_info.audited_account
@mock_logs
@mock_cloudtrail