Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
config-path: .gitleaks.toml
- name: Check for secrets using detect-secrets
run: |
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git'
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git' --exclude-files '.*_version.py'
working-directory: .

build-and-test:
Expand Down
14 changes: 3 additions & 11 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,12 @@
".*\\.html$",
".*\\.properties$",
"ci.yml",
"\\.git"
"\\.git",
".*_version.py"
]
}
],
"results": {
"continuous_delivery_scripts/_version.py": [
{
"type": "Hex High Entropy String",
"filename": "continuous_delivery_scripts/_version.py",
"hashed_secret": "f3d16e7d1a0b93bedefb9247f07cb355f6be3e03",
"is_verified": false,
"line_number": 14
}
],
"continuous_delivery_scripts/plugins/python.py": [
{
"type": "Secret Keyword",
Expand Down Expand Up @@ -433,5 +425,5 @@
}
]
},
"generated_at": "2022-02-17T16:37:22Z"
"generated_at": "2022-02-21T18:17:19Z"
}
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,6 @@ For the latter, False positive keys are stored in the [baseline](./.secrets.base

To flag individual false positives add comment `# pragma: allowlist secret` to line with secret

To add all suspected secrets in the repository (excluding ones with an allow secret comment), run `detect-secrets scan --all-files --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git' > .secrets.baseline`
To add all suspected secrets in the repository (excluding ones with an allow secret comment), run `detect-secrets scan --all-files --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git' --exclude-files '.*_version.py' > .secrets.baseline`

If on Windows: then change the encoding of the .secrets.baseline file to UTF-8 then convert all `\` to `/` in the .secrets.baseline file
1 change: 1 addition & 0 deletions news/202202211807.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixing markupsafe version to solve Jinja's(dependency issue)[https://github.com/pallets/markupsafe/issues/284]
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
"jellyfish",
"jinja2==2.11.3",
"dataclasses; python_version<'3.7'",
# FIXME fixing markupsafe to solve https://github.com/pallets/markupsafe/issues/284 until jinja is upgraded
"markupsafe==2.0.1",
],
license="Apache 2.0",
long_description_content_type="text/markdown",
Expand Down