Commit graph

127 commits

Author SHA1 Message Date
Anthony Sottile
aa50988889 Merge pull request #199 from pre-commit/rebase_conflict
Support rebase conflicts in check-merge-conflicts
2017-07-02 19:43:55 -07:00
Daniel Gallagher
7102e0c8a3 file-contents-sorter should add newline at end of files missing newlines
Make an explicit 'else' path for readability
2017-06-26 08:10:32 -07:00
Daniel Gallagher
7cfec24f77 Fix bug with the file-contents-sorter hook when processing file that does not end in a newline 2017-06-25 14:40:03 -07:00
Anthony Sottile
50871f83cc Merge pull request #206 from dlgallagher/requirements_txt_fixer_followup
Some style tweaks (requirements_txt_fixer)
2017-06-25 14:53:25 -04:00
Daniel Gallagher
4c421e2ed1 Put argument parsing back into main() 2017-06-25 10:22:10 -07:00
Daniel Gallagher
844d9830de Some style tweaks 2017-06-25 10:14:58 -07:00
Daniel Gallagher
d188f2ecf8 Merge branch 'master' into file_contents_sorter_hook 2017-06-25 09:39:21 -07:00
Anthony Sottile
d419bef35c Merge pull request #205 from dlgallagher/fix_requirements_txt_fixer_on_empty_requirements_files
Fix NoneTypeError when requirements file is empty
2017-06-24 00:35:39 -04:00
Daniel Gallagher
7ccfa05f2f Fix NoneTypeError when requirements file is empty 2017-06-23 17:19:21 -07:00
Daniel Gallagher
b6eff3d39e Add sort-simple-yaml hook (originally private hook from yelp_pre_commit_hooks) 2017-06-23 16:26:00 -07:00
Daniel Gallagher
b941d0e6df Respond to review feedback 2017-06-23 14:58:24 -07:00
Daniel Gallagher
9425c5d6b5 First commit of file-contents-sorter precommit hook 2017-06-23 00:33:13 -07:00
Anthony Sottile
6076fd1b15 Support rebase conflicts in check-merge-conflicts 2017-06-12 10:39:07 -07:00
Anthony Sottile
dc50b7f09c Attempt to fix the json hook under test 2017-03-20 11:25:45 -07:00
Evan Felix
a8592669d9 Add a no commit to specific branch hook. (#185)
* add no commit code and config

* add the code

* remove version tweak

* fix logic, remove newline

* add Tests and cleanup testing issues

* remove extraneous modules

* cleanup some pep8 and flake issues

* reorder imports

* more fixes for syntax checking

* code cleanup based off asottile comments

* Use Contractions Properly, alphabatize new hook.

* Adding support for branches with a slash in them.
2017-03-20 10:36:51 -07:00
Anthony Sottile
b95dcad616 Fixups 2017-03-20 08:24:58 -07:00
John Hu
543c5c7e1a Add an option to disable ensure_ascii 2017-03-20 20:19:01 +08:00
Oliver Zhou
c380d0b3e3 Handling default django test filename of "tests.py" 2017-03-15 00:40:53 -07:00
Anthony Sottile
9cee71b5df Add pyupgrade 2017-03-12 18:01:29 -07:00
Mike Fiedler
312e721ce9
Add flag to detect-aws-credentials to allow missing keys
In the event that there exists no configuration for AWS credentials and
they are not exported in to the current environment, a flag may be
passed to allow exiting the hook successfully.

Resolves #174

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
2017-02-10 12:54:03 -05:00
Anthony Sottile
81147337c5 Only return nonzero when rewriting whitespace 2017-02-07 09:45:31 -08:00
Anthony Sottile
5da199bb8d Formatting fixups 2017-01-03 13:13:44 -08:00
Anthony Sottile
47996656b4 Merge pull request #162 from Dunedan/improve-aws-credential-searching
Improve searching for configured AWS credentials
2017-01-03 16:11:30 -05:00
Anthony Sottile
a7971b7d26 appveyor installed git-lfs, fix coverage 2017-01-03 12:56:22 -08:00
Daniel Roschka
3939aee4a3 Address issues mentioned in review 2017-01-03 19:05:49 +01:00
Daniel Roschka
0fd09bf67a Add AWS_CONFIG_FILE to the environment variables
Turns out there is an additional environment variable AWS_CONFIG_FILE,
which gets evaluated for finding configuration files as well. This
commit adds support for it.
2016-12-30 10:39:38 +01:00
Daniel Roschka
b0d4cdb1ee Improve searching for configured AWS credentials
The previous approach for finding AWS credentials was pretty naive and
only covered contents of a single file (~/.aws/credentials by
default).

The AWS CLI documentation states various other ways to configure
credentials which weren't covered:
https://docs.aws.amazon.com/cli/latest/topic/config-vars.html#credentials
Even that aren't all ways, a look into the code shows:
https://github.com/boto/botocore/blob/develop/botocore/credentials.py

This commit changes the behavior so the hook will behave in a way
that if the AWS CLI is able to obtain credentials from local files,
the hook will find them as well.

The changes in detail are:
- detect AWS session tokens and handle them like secret keys.
- always search credentials in the default AWS CLI file locations
  ( ~/.aws/config, ~/.aws/credentials, /etc/boto.cfg and ~/.boto)
- detect AWS credentials configured via environment variables in
  AWS_SECRET_ACCESS_KEY, AWS_SECURITY_TOKEN and AWS_SESSION_TOKEN
- check additional configuration files configured via environment
  variables (AWS_CREDENTIAL_FILE, AWS_SHARED_CREDENTIALS_FILE and
  BOTO_CONFIG)
- print out the first four characters of each secret found in files to
  be checked in, to make it easier to figure out, what the secrets
  were, which were going to be checked in
- improve error handling for parsing ini-files
- improve tests

There is a major functional change introduced by this commit:
Locations the AWS CLI gets credentials from are always searched and
there is no way to disable them. --credentials-file is still there to
specify one or more additional files to search credentials in. It's
the purpose of this hook to find and check files for found
credentials, so it should work in any case. As this commit also
improves error handling for not-existing or malformed configuration
files, it should be no big deal.

Receiving credentials via the EC2 and ECS meta data services is not
covered intentionally, to not further increase the amount of changes
in this commit and as it's probably an edge case anyway to have this
hook running in such an environment.
2016-12-30 08:41:24 +01:00
Chris Kuehl
cdb3e2e4bf Add trailing comma 2016-12-26 14:51:26 -08:00
Daniel Roschka
c549cb25a1 Detect Ed25519 keys as well
Ed255519 keys generated by OpenSSH contain "BEGIN OPENSSH PRIVATE KEY"
as identifier. This commit adds coverage for such keys as well.
2016-12-26 19:09:53 +01:00
Chris Kuehl
4b928ab06b Add forbid-new-submodules to hooks.yaml 2016-11-30 10:25:51 -08:00
Anthony Sottile
70e405ede2 Add a new hook to forbid new submodules 2016-11-30 09:56:42 -08:00
Chris Kuehl
6b9265c96a Fix JSON decode error message 2016-11-12 11:54:14 -08:00
Lucas Cimon
54e83f7ceb Displaying the filename when the check-json hook fails with a UnicodeDecodeError - fix #148 2016-11-12 09:15:10 +01:00
dmlb2000
84b1fb6827 let pre-commit fix some stuff 2016-11-03 15:54:48 -07:00
dmlb2000
c7ab197645 don't need to blow away the space here 2016-11-03 15:49:04 -07:00
dmlb2000
d06a515ce1 this is much cleaner and might actually get all the coverage with out a bunch of work 2016-11-03 15:47:21 -07:00
dmlb2000
845a3d5bdf adds top keys list of keys in hashes to put at the top of a hash
This adds custom sorting to preferencially add a list of top keys
at the start of any json hash in the json document
2016-11-03 09:41:23 -07:00
Brett Delle Grazie
a234b23667 Use safe_load as per PyYAML documentation
resolves #104
2016-10-23 17:50:42 +01:00
Anthony Sottile
1858edd9da Merge pull request #135 from Lucas-C/master
trailing-whitespace hook: restoring original file in case of failure - fixes #134
2016-08-31 07:35:34 -07:00
Lucas Cimon
cb23c48b0d Post-review fixes 2016-08-31 11:44:59 +02:00
Lucas Cimon
c3c870c398 trailing-whitespace hook: support for CRLFs 2016-08-30 10:34:06 +01:00
Anthony Sottile
8be6f4c77e Remove pylint 2016-08-22 14:38:49 -07:00
Lucas Cimon
eaad923dd4 trailing-whitespace hook: Switching from using fileinput to a tempfile and whitespace substitution in binary mode 2016-08-20 11:59:10 +01:00
Lucas Cimon
bc5e7f2d72 trailing-whitespace hook: restoring original file in case of failure - fixes #134 2016-08-19 18:26:33 +02:00
Anthony Sottile
a43122c5f4 Merge pull request #133 from pre-commit/customizable_encoding_pragma
Allow encoding pragma to be customizable
2016-08-12 19:19:28 +02:00
Anthony Sottile
693709e761 Allow encoding pragma to be customizable 2016-08-12 10:11:10 -07:00
Vinay Karanam
81bd74d9c3 coverage fix 2016-07-03 04:31:19 +05:30
Vinay Karanam
c58ae08fed requirements fixer output is similar to pip freeze 2016-07-03 04:10:20 +05:30
Oscar-Garcia
ea320d7463 Update debug_statement_hook.py
Adds celery rdb as debugger: http://docs.celeryproject.org/en/latest/tutorials/debugging.html
2016-06-20 09:41:22 +02:00
Anthony Sottile
6dfcb89af3 Merge pull request #122 from sanmai-NL/JSON_arbitrary_indentation_separator
Fix exception raising logic to match validation issues
2016-06-13 08:50:53 -07:00