Skip to content

Commit

Permalink
Merge branch 'master' into PRWLR-4064-generate-the-aws-well-architect…
Browse files Browse the repository at this point in the history
…ed-framework-compliance-output-object-from-a-list-of-findings
  • Loading branch information
sergargar authored Jul 12, 2024
2 parents eea71c6 + a505776 commit ec8652a
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 60 deletions.
116 changes: 58 additions & 58 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions prowler/lib/outputs/compliance/compliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ def fill_compliance(
continue
elif "AWS-Well-Architected-Framework" in compliance.Framework:
continue
elif compliance.Framework == "MITRE-ATTACK" and compliance.Version == "":
continue
elif (
compliance.Framework == "ISO27001"
and compliance.Version == "2013"
Expand Down
1 change: 1 addition & 0 deletions prowler/lib/outputs/file_descriptors.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from prowler.lib.logger import logger
from prowler.lib.outputs.compliance.models import (
Check_Output_CSV_AWS_ISO27001_2013,
Check_Output_CSV_AWS_Well_Architected,
Check_Output_CSV_Generic_Compliance,
)
from prowler.lib.outputs.csv.csv import generate_csv_fields
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ azure-mgmt-storage = "21.2.1"
azure-mgmt-subscription = "3.1.1"
azure-mgmt-web = "7.3.0"
azure-storage-blob = "12.20.0"
boto3 = "1.34.142"
boto3 = "1.34.143"
botocore = "1.34.143"
colorama = "0.4.6"
dash = "2.17.1"
Expand Down Expand Up @@ -79,7 +79,7 @@ typer = "0.12.3"
[tool.poetry.group.dev.dependencies]
bandit = "1.7.9"
black = "24.4.2"
coverage = "7.5.4"
coverage = "7.6.0"
docker = "7.1.0"
flake8 = "7.1.0"
freezegun = "1.5.1"
Expand Down

0 comments on commit ec8652a

Please sign in to comment.