solve conflicts #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Use environ.FileAwareEnv * Load _FILE in shell * Change error to warning
….json) (DefectDojo#9353) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
….33.16 (helm/defectdojo/values.yaml) (DefectDojo#9354) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.20 to 1.34.21. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](boto/boto3@1.34.20...1.34.21) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Basic tests for REMOTE_USER * Rewrite settings * Rename vars in test * Final fixes * Add multiple groups test
* 🎉 merge OpenVAS XML and CSV formats to have only one parser for OpenVAS * Update docs/content/en/integrations/parsers/file/openvas.md Co-authored-by: Charles Neill <[email protected]> --------- Co-authored-by: Charles Neill <[email protected]>
* Update parser.py Fix missing findings in kiuwan import. Added the file to the description to have a unique hash for findings that are the same except the file name. * Updated unit test * Fix defects import --------- Co-authored-by: Florian Markus <[email protected]>
* ✨ implement chefinspect, DefectDojo#6990 * force add unittestfiles against gitignore * 🐛 fix according to comment * 🐛 fix
* raise testcoverage to proof issue DefectDojo#9333 is working * add unittestfile
* ✨ implement google cloud artifact scan, DefectDojo#8552 * fix unittest * docs update
* Adds ruff linter, fixes unused variables errors * Correct Flake8 * Correct some unit tests * Attempt to correct unit tests * Pull out dependencies
* 🚧 asff * 🐛 fix
* enhance govulncheck parser * Reverting changes in many_vulns_new_version.json
* ✨ advance parser docs to provide sample scan data * update according to review comment * remove openvas-md from commit
Bumps [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.27.0 to 0.27.1. - [Release notes](https://github.com/tfranzel/drf-spectacular/releases) - [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst) - [Commits](tfranzel/drf-spectacular@0.27.0...0.27.1) --- updated-dependencies: - dependency-name: drf-spectacular dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.34.21 to 1.34.22. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](boto/boto3@1.34.21...1.34.22) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.1.7 to 0.1.13. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@v0.1.7...v0.1.13) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Resolve new Ruff issues * Another one
github-actions
bot
added
docs
docker
helm
unittests
settings_changes
apiv2
ui
parser
labels
quirinziessler
merged commit 0fa364d
into
wazuh-importer-improvements
7 of 10 checks passed
quirinziessler
pushed a commit
that referenced
this pull request
Feb 4, 2024
* Add "First Seen" Parser Flag * Fix Flake8 * Add USE_FIRST_SEEN to Nexpose (#2) --------- Co-authored-by: kiblik <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
solve conflicts