Compare commits

...

1 Commits

Author SHA1 Message Date
Pepe Fagoaga
4d337c462b Revert "fix(custom): execute custom checks (#4202)"
This reverts commit 2a139e3dc7.
2024-06-17 13:17:38 +02:00
3 changed files with 7 additions and 8 deletions

View File

@@ -180,8 +180,7 @@ def prowler():
# Import custom checks from folder
if checks_folder:
custom_checks = parse_checks_from_folder(global_provider, checks_folder)
checks_to_execute.update(custom_checks)
parse_checks_from_folder(global_provider, checks_folder)
# Exclude checks if -e/--excluded-checks
if excluded_checks:

View File

@@ -126,9 +126,9 @@ def parse_checks_from_file(input_file: str, provider: str) -> set:
# Load checks from custom folder
def parse_checks_from_folder(provider, input_folder: str) -> set:
def parse_checks_from_folder(provider, input_folder: str) -> int:
try:
custom_checks = set()
imported_checks = 0
# Check if input folder is a S3 URI
if provider.type == "aws" and re.search(
"^s3://([^/]+)/(.*?([^/]+))/$", input_folder
@@ -156,8 +156,8 @@ def parse_checks_from_folder(provider, input_folder: str) -> set:
if os.path.exists(prowler_module):
shutil.rmtree(prowler_module)
shutil.copytree(check_module, prowler_module)
custom_checks.add(check.name)
return custom_checks
imported_checks += 1
return imported_checks
except Exception as error:
logger.critical(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}"

View File

@@ -453,14 +453,14 @@ class TestCheck:
"path": test_checks_folder,
"provider": "aws",
},
"expected": {"check11", "check12", "check7777"},
"expected": 3,
},
{
"input": {
"path": "s3://test/checks_folder/",
"provider": "aws",
},
"expected": {"check11", "check12", "check7777"},
"expected": 3,
},
]