Skip to content

Commit 807a7fe

Browse files
authored
Merge pull request #89 from cisagov/lineage/skeleton
Lineage pull request for: skeleton
2 parents fb2252b + 7184a70 commit 807a7fe

File tree

6 files changed

+50
-25
lines changed

6 files changed

+50
-25
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
@@ -33,35 +33,54 @@ repos:
3333

3434
# Text file hooks
3535
- repo: https://github.com/igorshubovych/markdownlint-cli
36-
rev: v0.33.0
36+
rev: v0.34.0
3737
hooks:
3838
- id: markdownlint
3939
args:
4040
- --config=.mdl_config.yaml
4141
- repo: https://github.com/pre-commit/mirrors-prettier
42-
rev: v3.0.0-alpha.6
42+
rev: v3.0.0-alpha.9-for-vscode
4343
hooks:
4444
- id: prettier
4545
- repo: https://github.com/adrienverge/yamllint
46-
rev: v1.30.0
46+
rev: v1.32.0
4747
hooks:
4848
- id: yamllint
4949
args:
5050
- --strict
5151

5252
# GitHub Actions hooks
5353
- repo: https://github.com/python-jsonschema/check-jsonschema
54-
rev: 0.22.0
54+
rev: 0.23.1
5555
hooks:
5656
- id: check-github-actions
5757
- id: check-github-workflows
5858

5959
# pre-commit hooks
6060
- repo: https://github.com/pre-commit/pre-commit
61-
rev: v3.2.1
61+
rev: v3.3.2
6262
hooks:
6363
- id: validate_manifest
6464

65+
# Go hooks
66+
- repo: https://github.com/TekWizely/pre-commit-golang
67+
rev: v1.0.0-rc.1
68+
hooks:
69+
# Style Checkers
70+
- id: go-critic
71+
# StaticCheck
72+
- id: go-staticcheck-repo-mod
73+
# Go Build
74+
- id: go-build-repo-mod
75+
# Go Mod Tidy
76+
- id: go-mod-tidy-repo
77+
# Go Test
78+
- id: go-test-repo-mod
79+
# Go Vet
80+
- id: go-vet-repo-mod
81+
# GoSec
82+
- id: go-sec-repo-mod
83+
6584
# Shell script hooks
6685
- repo: https://github.com/cisagov/pre-commit-shfmt
6786
rev: v0.0.2
@@ -90,7 +109,7 @@ repos:
90109
args:
91110
- --config=.bandit.yml
92111
- repo: https://github.com/psf/black
93-
rev: 23.1.0
112+
rev: 23.3.0
94113
hooks:
95114
- id: black
96115
- repo: https://github.com/PyCQA/flake8
@@ -104,34 +123,34 @@ repos:
104123
hooks:
105124
- id: isort
106125
- repo: https://github.com/pre-commit/mirrors-mypy
107-
rev: v1.1.1
126+
rev: v1.3.0
108127
hooks:
109128
- id: mypy
110129
additional_dependencies:
111130
- types-PyYAML
112131
- types-requests
113132
- repo: https://github.com/asottile/pyupgrade
114-
rev: v3.3.1
133+
rev: v3.4.0
115134
hooks:
116135
- id: pyupgrade
117136

118137
# Ansible hooks
119138
- repo: https://github.com/ansible-community/ansible-lint
120-
rev: v5.4.0
139+
rev: v6.17.0
121140
hooks:
122141
- id: ansible-lint
123142
# files: molecule/default/playbook.yml
124143

125144
# Terraform hooks
126145
- repo: https://github.com/antonbabenko/pre-commit-terraform
127-
rev: v1.77.1
146+
rev: v1.80.0
128147
hooks:
129148
- id: terraform_fmt
130149
- id: terraform_validate
131150

132151
# Docker hooks
133152
- repo: https://github.com/IamTheFij/docker-pre-commit
134-
rev: v2.1.1
153+
rev: v3.0.1
135154
hooks:
136155
- id: docker-compose-check
137156

open-source-policy/policy.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,5 @@ This policy is a living document. CISA expects to make changes to this policy in
166166
the future, and we welcome
167167
[issues](https://github.com/cisagov/development-guide/issues) and [pull
168168
requests](https://github.com/cisagov/development-guide/pulls). To contact us
169-
privately, email [email protected] .
169+
privately, email
170+

open-source-policy/practice.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ official capacity.
6767

6868
1. See if there is an organizational CLA available
6969
1. Send the agreement to DHS's Office of General Counsel (OGC) for review
70-
- Email [email protected] to determine the best contact
70+
- Email
71+
72+
to determine the best contact
7173
1. Collect names/emails/GitHub usernames (whatever is needed) for folks you
7274
think will be contributing
7375
- Err on the side of adding too many than too few - this is much easier
@@ -123,11 +125,12 @@ CISA believes in
123125
It creates a healthier working environment, a more collaborative process, and
124126
just better software.
125127

126-
All CISA team members are expected to make new source code repositories public
127-
from the time of creation. This means we often publish drafts in our repos
128-
that may change substantially. If you're interested in learning more about the
129-
contents of a repo, email [email protected] and we'll direct
130-
you to the right person or team.
128+
All CISA team members are expected to make new source code
129+
repositories public from the time of creation. This means we often
130+
publish drafts in our repos that may change substantially. If you're
131+
interested in learning more about the contents of a repo, email
132+
133+
and we'll direct you to the right person or team.
131134

132135
## Protecting sensitive information ##
133136

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'
@@ -186,5 +186,5 @@ else:
186186
END_OF_LINE
187187
)"
188188

189-
# Qapla
189+
# Qapla'
190190
echo "Success!"

0 commit comments

Comments
 (0)