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

enhancement: Gitleaks schema improvements #3675

Merged
merged 6 commits into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- [Powershell](https://github.com/PowerShell/PSScriptAnalyzer#readme) Error table truncation improvements
- [yamllint](https://github.com/adrienverge/yamllint) fix error/warning count to work with different log output formats
- Improve support for single argument in `get_list_args` function
- [GitLeaks](https://github.com/gitleaks/gitleaks) add missing schema properties
- [DevSkim](https://github.com/microsoft/DevSkim) fixed fatal errors when scanning and ability to override config path
- [Powershell](https://github.com/PowerShell/PSScriptAnalyzer#readme) added missing schema property `POWERSHELL_POWERSHELL_FORMATTER_OUTPUT_ENCODING`
- [tflint](https://github.com/terraform-linters/tflint) added missing schema property `TERRAFORM_TFLINT_SECURED_ENV`
Expand Down
6 changes: 3 additions & 3 deletions megalinter/descriptors/repository.megalinter-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,13 @@ linters:
- COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
variables:
- name: REPOSITORY_GITLEAKS_PR_COMMITS_SCAN
description: Scan only PR commits on Pull Request
description: Scan only commits in the current Pull Request/Merge Request
default_value: "false"
- name: REPOSITORY_GITLEAKS_PR_SOURCE_SHA
description: Pull Request source commit sha (N/A to supported scenarios)
description: Source commit SHA of the Pull Request/Merge Request
default_value: ""
- name: REPOSITORY_GITLEAKS_PR_TARGET_SHA
description: Pull Request target commit sha (N/A to supported scenarios)
description: Target commit SHA of the Pull Request/Merge Request
default_value: ""

# GRYPE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15736,6 +15736,24 @@
"title": "REPOSITORY_GITLEAKS: Define or override a list of bash commands to run before the linter",
"type": "array"
},
"REPOSITORY_GITLEAKS_PR_COMMITS_SCAN": {
"$id": "#/properties/REPOSITORY_GITLEAKS_PR_COMMITS_SCAN",
"default": false,
"title": "REPOSITORY_GITLEAKS: Scan only commits in the current Pull Request/Merge Request",
"type": "boolean"
},
"REPOSITORY_GITLEAKS_PR_SOURCE_SHA": {
"$id": "#/properties/REPOSITORY_GITLEAKS_PR_SOURCE_SHA",
"default": "",
"title": "REPOSITORY_GITLEAKS: Source commit SHA of the Pull Request/Merge Request",
"type": "string"
},
"REPOSITORY_GITLEAKS_PR_TARGET_SHA": {
"$id": "#/properties/REPOSITORY_GITLEAKS_PR_TARGET_SHA",
"default": "",
"title": "REPOSITORY_GITLEAKS: Target commit SHA of the Pull Request/Merge Request",
"type": "string"
},
"REPOSITORY_GITLEAKS_RULES_PATH": {
"$id": "#/properties/REPOSITORY_GITLEAKS_RULES_PATH",
"description": "REPOSITORY_GITLEAKS: Path where to find linter configuration file",
Expand Down