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.

Sign up for GitHub

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

Improve 'Unable to open baseline file' message #91

Merged
merged 2 commits into from
Oct 30, 2018
Merged

Improve 'Unable to open baseline file' message #91

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
797cfe1
Improve 'Unable to open baseline file' message, fix comment, bump to …
KevinHock Oct 26, 2018
88b3fb6
Don't suggest .secrets.baseline for 'please create baseline' msg
KevinHock Oct 30, 2018
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 detect_secrets/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '0.10.4'
VERSION = '0.10.5'
2 changes: 1 addition & 1 deletion detect_secrets/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def _perform_scan(args, plugins):


def _get_existing_baseline(import_filename):
# Favors --import argument over stdin.
# Favors --update argument over stdin.
if import_filename:
return _read_from_file(import_filename[0])
if not sys.stdin.isatty():
Expand Down
6 changes: 4 additions & 2 deletions detect_secrets/pre_commit_hook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,11 @@ def _get_baseline_string_from_file(filename): # pragma: no cover

except IOError:
log.error(
'Unable to open baseline file: %s.', filename,
'Unable to open baseline file: {}\n'
'Please create it via\n'
' `detect-secrets scan > .secrets.baseline`\n'
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
' `detect-secrets scan > .secrets.baseline`\n'
' `detect-secrets scan > {}`\n'

Remember that we never explicitly enforce a certain baseline filename to be used.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

++ I kind of like suggesting it but you're right it's more consistent this way.

.format(filename),
)

raise


Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage
flake8
flake8==3.5.0
mock
pre-commit
pytest
Expand Down