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.

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

Add support to AWS Prowler V3 json format #8028

Merged
merged 16 commits into from
May 21, 2023
Merged

Add support to AWS Prowler V3 json format #8028

merged 16 commits into from
May 21, 2023

Conversation

anderson-slompo
Copy link
Contributor

Description
Add support to import aws prowler v3 json scan file referent to this issue

@anderson-slompo anderson-slompo changed the base branch from master to dev April 28, 2023 21:39
dojo/tools/aws_prowler_v3/__init__.py Outdated Show resolved Hide resolved
dojo/tools/aws_prowler_v3/parser.py Outdated Show resolved Hide resolved
dojo/tools/aws_prowler_v3/parser.py Show resolved Hide resolved
@github-actions github-actions bot added the settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR label May 3, 2023
@anderson-slompo
Copy link
Contributor Author

@Maffooch can you validate deduplication settings ?

Copy link
Contributor

@Maffooch Maffooch left a comment

Choose a reason for hiding this comment

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

Getting very close! These are the last two things I found that need to be updated

dojo/tools/aws_prowler_v3/parser.py Outdated Show resolved Hide resolved
dojo/settings/settings.dist.py Outdated Show resolved Hide resolved
@Maffooch Maffooch requested a review from damiencarol May 5, 2023 21:54
Copy link
Contributor

@mtesauro mtesauro left a comment

Choose a reason for hiding this comment

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

Approved

dojo/settings/settings.dist.py Outdated Show resolved Hide resolved
@Maffooch
Copy link
Contributor

@anderson-slompo are you able to revert commits of merging master into your branch? There is a lot of extra changes in this PR now that should not be there

@github-actions github-actions bot added docker New Migration Adding a new migration file. Take care when merging. conflicts-detected and removed ui labels May 11, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot removed docs helm New Migration Adding a new migration file. Take care when merging. docker labels May 11, 2023
Maffooch
Maffooch previously approved these changes May 11, 2023
@Maffooch Maffooch dismissed their stale review May 11, 2023 19:40

I was a little hasty here.. See the error in the unit tests

@github-actions github-actions bot added the docs label May 12, 2023
@anderson-slompo anderson-slompo requested a review from Maffooch May 12, 2023 11:57
Copy link
Contributor

@Maffooch Maffooch left a comment

Choose a reason for hiding this comment

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

Approved for real this time!

@mtesauro
Copy link
Contributor

@damiencarol Are you good with this?

@mtesauro
Copy link
Contributor

@damiencarol Are you OK with this?

@mtesauro mtesauro dismissed damiencarol’s stale review May 21, 2023 01:39

Looks like the request was handled

@mtesauro mtesauro merged commit 7601777 into DefectDojo:dev May 21, 2023
@security101 security101 mentioned this pull request Jun 5, 2023
@finventario
Copy link

Thanks a lot guys!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs parser settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR unittests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants