-
Notifications
You must be signed in to change notification settings - Fork 23
feat: add pre-commit hooks #798
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
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
4cada66
feat: add initial `install-pre-commit-hooks` playbook
jackhodgkiss 39405c0
feat: register `pre-commit` with `git`
jackhodgkiss 036b5f0
feat: make `install-pre-commit-hooks` opt-in
jackhodgkiss 9e309d2
feat: add release note
jackhodgkiss ef2a2b3
feat!: change when `pre-commit` hooks are installed
jackhodgkiss 05ccc8e
fix: update release note for `pre-commit hooks`
jackhodgkiss ac3abce
feat: add `pre-commit` to contributor docs
jackhodgkiss 94e52f4
fix: remove unused variable
jackhodgkiss 7c4da9a
feat: run `pre-commit install` if package is installed or updated
jackhodgkiss cf4aaa0
feat: use variable to control `pre_commit` version
jackhodgkiss 54766db
feat: provide commands within docs for pre-commit hooks setup
jackhodgkiss d277afb
feat: support install `pre-commit` without `kayobe-venv`
jackhodgkiss File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
repos: | ||
- repo: https://github.com/pre-commit/pre-commit-hooks | ||
rev: v4.4.0 | ||
hooks: | ||
- id: check-yaml | ||
- id: end-of-file-fixer | ||
- id: trailing-whitespace | ||
- repo: https://github.com/sirwart/ripsecrets | ||
rev: v0.1.7 | ||
hooks: | ||
- id: ripsecrets | ||
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
================ | ||
Pre-commit Hooks | ||
================ | ||
|
||
StackHPC Kayobe configuration carries support for | ||
`pre-commit hooks <https://pre-commit.com/>`_ which simplify the use of git | ||
hooks enabling the identification and repairing of broken or poor code | ||
before committing. | ||
These hooks are designed to make working within SKC easier and less error prone. | ||
|
||
Currently the following hooks are provided: | ||
|
||
- ``check-yaml``: perform basic yaml syntax linting | ||
- ``end-of-file-fixer``: identify and automatically fix missing newline | ||
- ``trailing-whitespace``: identify and automatically fix excessive white space | ||
- ``ripsecrets``: identify and prevent secrets from being committed to the branch | ||
|
||
.. warning:: | ||
The hook ``ripsecrets`` is capable of preventing the accidental leaking of secrets | ||
such as those found within `secrets.yml` or `passwords.yml`. | ||
However if the secret is contained within a file on it's own and lacks a certain level | ||
of entropy then the secret will not be identified as such as and maybe leaked as a result. | ||
|
||
Installation of `pre-commit` hooks is handled via the `install-pre-commit-hooks` playbook | ||
found within the Ansible directory. | ||
Either run the playbook manually or add the playbook as a hook within Kayobe config such as | ||
within `control-host-bootstrap/post.d`. | ||
Once done you should find `pre-commit` is available within the `kayobe` virtualenv. | ||
|
||
markgoddard marked this conversation as resolved.
Show resolved
Hide resolved
|
||
To run the playbook using the following command | ||
|
||
- ``kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/install-pre-commit-hooks.yml`` | ||
|
||
Whereas to run the playbook when control host bootstrap runs ensure it registered as symlink using the following command | ||
|
||
- ``mkdir -p ${KAYOBE_CONFIG_PATH}/hooks/control-host-bootstrap/post.d`` | ||
- ``ln -s ${KAYOBE_CONFIG_PATH}/ansible/install-pre-commit-hooks.yml ${KAYOBE_CONFIG_PATH}/hooks/control-host-bootstrap/post.d/install-pre-commit-hooks.yml`` | ||
|
||
All that remains is the installation of the hooks themselves which can be accomplished either by | ||
running `pre-commit run` or using `git commit` when you have changes that need to be committed. | ||
This will trigger a brief installation process of the hooks which may take a few minutes. | ||
This a one time process and will not be required again unless new hooks are added or existing ones are updated. | ||
|
||
.. note:: | ||
Currently if you run ``pre-commit run --all-files`` it will make a series of changes to | ||
release notes that lack new lines as well configuration files that ``check-yaml`` does not | ||
approve of. |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- | ||
- name: Install pre-commit hooks | ||
hosts: localhost | ||
gather_facts: false | ||
vars: | ||
pre_commit_version: 3.5.0 | ||
tasks: | ||
- name: Install pre-commit hooks | ||
block: | ||
- name: Install pre-commit hooks into kayobe virtual env | ||
ansible.builtin.pip: | ||
name: pre-commit | ||
version: "{{ pre_commit_version }}" | ||
virtualenv: "{{ lookup('ansible.builtin.env', 'VIRTUAL_ENV') | default(omit, true) }}" | ||
register: pip_install | ||
|
||
- name: Register pre-commit hooks with git | ||
ansible.builtin.command: | ||
cmd: "{{ lookup('ansible.builtin.env', 'VIRTUAL_ENV') | default(lookup('ansible.builtin.env', 'HOME') ~ '/.local', true) }}/bin/pre-commit install" | ||
args: | ||
chdir: "{{ playbook_dir | dirname | dirname | dirname }}" |
8 changes: 8 additions & 0 deletions
8
releasenotes/notes/add-pre-commit-hooks-07ce3b82bbe1d7a3.yaml
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- | ||
features: | ||
- | | ||
Add playbook to install pre-commit hooks and register them with git. | ||
The hooks currently configured to be installed will check yaml syntax, | ||
fix new line at end of file and remove excess whitespace. This is | ||
currently opt-in which can be achieved by running `install-pre-commit-hooks` | ||
playbook. |
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.
Uh oh!
There was an error while loading. Please reload this page.