Skip to content

Commit ed103e3

Browse files
authored
Merge pull request #122 from cisagov/lineage/skeleton
Lineage pull request for: skeleton
2 parents ea4912c + 31fe1f5 commit ed103e3

File tree

4 files changed

+39
-18
lines changed

4 files changed

+39
-18
lines changed

.ansible-lint

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
# See https://ansible-lint.readthedocs.io/en/latest/configuring.html
3-
# for a list of the configuration elements that can exist in this
4-
# file.
2+
# See https://ansible-lint.readthedocs.io/configuring/ for a list of
3+
# the configuration elements that can exist in this file.
54
enable_list:
65
# Useful checks that one must opt-into. See here for more details:
7-
# https://ansible-lint.readthedocs.io/en/latest/rules.html
6+
# https://ansible-lint.readthedocs.io/rules/
87
- fcqn-builtins
98
- no-log-password
109
- no-same-owner

.github/workflows/build.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ jobs:
2929
- id: setup-go
3030
uses: actions/setup-go@v4
3131
with:
32-
go-version: "1.19"
32+
# There is no expectation for actual Go code so we disable caching as
33+
# it relies on the existence of a go.sum file.
34+
cache: false
35+
go-version: "1.20"
3336
- name: Lookup Go cache directory
3437
id: go-cache
3538
run: |

.pre-commit-config.yaml

+30-11
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,54 @@ repos:
3131

3232
# Text file hooks
3333
- repo: https://github.com/igorshubovych/markdownlint-cli
34-
rev: v0.33.0
34+
rev: v0.34.0
3535
hooks:
3636
- id: markdownlint
3737
args:
3838
- --config=.mdl_config.yaml
3939
- repo: https://github.com/pre-commit/mirrors-prettier
40-
rev: v3.0.0-alpha.6
40+
rev: v3.0.0-alpha.9-for-vscode
4141
hooks:
4242
- id: prettier
4343
- repo: https://github.com/adrienverge/yamllint
44-
rev: v1.30.0
44+
rev: v1.32.0
4545
hooks:
4646
- id: yamllint
4747
args:
4848
- --strict
4949

5050
# GitHub Actions hooks
5151
- repo: https://github.com/python-jsonschema/check-jsonschema
52-
rev: 0.22.0
52+
rev: 0.23.1
5353
hooks:
5454
- id: check-github-actions
5555
- id: check-github-workflows
5656

5757
# pre-commit hooks
5858
- repo: https://github.com/pre-commit/pre-commit
59-
rev: v3.2.1
59+
rev: v3.3.2
6060
hooks:
6161
- id: validate_manifest
6262

63+
# Go hooks
64+
- repo: https://github.com/TekWizely/pre-commit-golang
65+
rev: v1.0.0-rc.1
66+
hooks:
67+
# Style Checkers
68+
- id: go-critic
69+
# StaticCheck
70+
- id: go-staticcheck-repo-mod
71+
# Go Build
72+
- id: go-build-repo-mod
73+
# Go Mod Tidy
74+
- id: go-mod-tidy-repo
75+
# Go Test
76+
- id: go-test-repo-mod
77+
# Go Vet
78+
- id: go-vet-repo-mod
79+
# GoSec
80+
- id: go-sec-repo-mod
81+
6382
# Shell script hooks
6483
- repo: https://github.com/cisagov/pre-commit-shfmt
6584
rev: v0.0.2
@@ -98,7 +117,7 @@ repos:
98117
name: bandit (everything else)
99118
exclude: tests
100119
- repo: https://github.com/psf/black
101-
rev: 23.1.0
120+
rev: 23.3.0
102121
hooks:
103122
- id: black
104123
- repo: https://github.com/PyCQA/flake8
@@ -112,33 +131,33 @@ repos:
112131
hooks:
113132
- id: isort
114133
- repo: https://github.com/pre-commit/mirrors-mypy
115-
rev: v1.1.1
134+
rev: v1.3.0
116135
hooks:
117136
- id: mypy
118137
additional_dependencies:
119138
- types-setuptools
120139
- repo: https://github.com/asottile/pyupgrade
121-
rev: v3.3.1
140+
rev: v3.4.0
122141
hooks:
123142
- id: pyupgrade
124143

125144
# Ansible hooks
126145
- repo: https://github.com/ansible-community/ansible-lint
127-
rev: v5.4.0
146+
rev: v6.17.0
128147
hooks:
129148
- id: ansible-lint
130149
# files: molecule/default/playbook.yml
131150

132151
# Terraform hooks
133152
- repo: https://github.com/antonbabenko/pre-commit-terraform
134-
rev: v1.77.1
153+
rev: v1.80.0
135154
hooks:
136155
- id: terraform_fmt
137156
- id: terraform_validate
138157

139158
# Docker hooks
140159
- repo: https://github.com/IamTheFij/docker-pre-commit
141-
rev: v2.1.1
160+
rev: v3.0.1
142161
hooks:
143162
- id: docker-compose-check
144163

setup-env

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ done
6565
eval set -- "$PARAMS"
6666

6767
# Check to see if pyenv is installed
68-
if [ -z "$(command -v pyenv)" ] || [ -z "$(command -v pyenv-virtualenv)" ]; then
68+
if [ -z "$(command -v pyenv)" ] || { [ -z "$(command -v pyenv-virtualenv)" ] && [ ! -f "$(pyenv root)/plugins/pyenv-virtualenv/bin/pyenv-virtualenv" ]; }; then
6969
echo "pyenv and pyenv-virtualenv are required."
7070
if [[ "$OSTYPE" == "darwin"* ]]; then
7171
cat << 'END_OF_LINE'
@@ -189,5 +189,5 @@ else:
189189
END_OF_LINE
190190
)"
191191

192-
# Qapla
192+
# Qapla'
193193
echo "Success!"

0 commit comments

Comments
 (0)