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

Master into dev/2.1.0 2.2.0 dev #4878

Merged
merged 11 commits into from Aug 4, 2021
Merged

Conversation

Maffooch
Copy link
Contributor

No description provided.

@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "2.1.0-dev"
appVersion: "2.2.0-dev"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.10
Copy link
Member

Choose a reason for hiding this comment

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

I think we should merge that PR even though the version of the helm chart needs to be updated. We can create another PR with the updated chart version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fear that would break the unit tests. Could be incorrect though. @valentijnscholten @madchap what are your thoughts?

Copy link
Member

Choose a reason for hiding this comment

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

I usually bump it, so 1.6.11

@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "2.1.0-dev"
appVersion: "2.2.0-dev"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.10
Copy link
Member

Choose a reason for hiding this comment

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

I usually bump it, so 1.6.11

valentijnscholten and others added 11 commits August 4, 2021 11:53
* Add release cadence to README

* Update README.md

* Update README.md

Co-authored-by: Damien Carol <damien.carol@gmail.com>

Co-authored-by: Damien Carol <damien.carol@gmail.com>
* AWS Prowler scanner enhancements

Detected and fixed issues:
- Inside the same scan findings from different regions were being marked as duplicates;
- Missing useful information in finding description and fields;
- dedup_key was not strong;
- Deduplication was not working, so same scan would duplicate the number of findings.

All those have been fixed.

* Final cleanup

* Fixing PEP8

* Noticed the parser was using an older version of Prowler as in the CSV export some fiels were removed and others were added.

Working for PROWLER_VERSION=2.4.0-07042021

Some code cleanup as some unused fiels were there

* Fixed the unit tests. CSV files were missing many fields.

CSV fiels taken from CSV Export of PROWLER_VERSION=2.4.0-07042021
@StefanFl StefanFl force-pushed the master-into-dev/2.1.0-2.2.0-dev branch from 222e047 to 68aff8d Compare August 4, 2021 09:53
@Maffooch Maffooch merged commit 8e83072 into dev Aug 4, 2021
@Maffooch Maffooch deleted the master-into-dev/2.1.0-2.2.0-dev branch October 5, 2021 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants