Skip to content

Commit 1768884

Browse files
mcdonnnjmcdonnnj
authored
Merge pull request #7 from cisagov/lineage/skeleton
Lineage pull request for: skeleton
2 parents 8cf23db + 3b98563 commit 1768884

File tree

6 files changed

+137
-28
lines changed

6 files changed

+137
-28
lines changed

‎.github/dependabot.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ updates:
1111
directory: "/"
1212
schedule:
1313
interval: "weekly"
14-
# ignore:
15-
# - dependency-name: actions/cache
16-
# - dependency-name: actions/checkout
17-
# - dependency-name: actions/setup-python
14+
ignore:
15+
# Managed by cisagov/skeleton-generic
16+
- dependency-name: actions/cache
17+
- dependency-name: actions/checkout
18+
- dependency-name: actions/setup-go
19+
- dependency-name: actions/setup-python
20+
- dependency-name: hashicorp/setup-terraform
21+
- dependency-name: mxschmitt/action-tmate
1822

1923
- package-ecosystem: "pip"
2024
directory: "/"

‎.github/labels.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
---
2+
# Rather than breaking up descriptions into multiline strings we disable that
3+
# specific rule in yamllint for this file.
4+
# yamllint disable rule:line-length
5+
- color: "eb6420"
6+
description: This issue or pull request is awaiting the outcome of another issue or pull request
7+
name: blocked
8+
- color: "000000"
9+
description: This issue or pull request involves changes to existing functionality
10+
name: breaking change
11+
- color: "d73a4a"
12+
description: This issue or pull request addresses broken functionality
13+
name: bug
14+
- color: "07648d"
15+
description: This issue will be advertised on code.gov's Open Tasks page (https://code.gov/open-tasks)
16+
name: code.gov
17+
- color: "0366d6"
18+
description: Pull requests that update a dependency file
19+
name: dependencies
20+
- color: "5319e7"
21+
description: This issue or pull request improves or adds to documentation
22+
name: documentation
23+
- color: "cfd3d7"
24+
description: This issue or pull request already exists or is covered in another issue or pull request
25+
name: duplicate
26+
- color: "b005bc"
27+
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
28+
name: epic
29+
- color: "000000"
30+
description: Pull requests that update GitHub Actions code
31+
name: github-actions
32+
- color: "0e8a16"
33+
description: This issue or pull request is well-defined and good for newcomers
34+
name: good first issue
35+
- color: "ff7518"
36+
description: Pull request that should count toward Hacktoberfest participation
37+
name: hacktoberfest-accepted
38+
- color: "a2eeef"
39+
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
40+
name: improvement
41+
- color: "fef2c0"
42+
description: This issue or pull request is not applicable, incorrect, or obsolete
43+
name: invalid
44+
- color: "ce099a"
45+
description: This pull request is ready to merge during the next Lineage Kraken release
46+
name: kraken 🐙
47+
- color: "a4fc5d"
48+
description: This issue or pull request requires further information
49+
name: need info
50+
- color: "fcdb45"
51+
description: This pull request is awaiting an action or decision to move forward
52+
name: on hold
53+
- color: "3772a4"
54+
description: Pull requests that update Python code
55+
name: python
56+
- color: "ef476c"
57+
description: This issue is a request for information or needs discussion
58+
name: question
59+
- color: "00008b"
60+
description: This issue or pull request adds or otherwise modifies test code
61+
name: test
62+
- color: "1d76db"
63+
description: This issue or pull request pulls in upstream updates
64+
name: upstream update
65+
- color: "d4c5f9"
66+
description: This issue or pull request increments the version number
67+
name: version bump
68+
- color: "ffffff"
69+
description: This issue will not be incorporated
70+
name: wontfix

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,24 @@ jobs:
2121
uses: cisagov/setup-env-github-action@develop
2222
- uses: actions/checkout@v3
2323
- id: setup-python
24-
uses: actions/setup-python@v3
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: "3.10"
2727
# We need the Go version and Go cache location for the actions/cache step,
2828
# so the Go installation must happen before that.
29-
- uses: actions/setup-go@v2
29+
- id: setup-go
30+
uses: actions/setup-go@v3
3031
with:
31-
go-version: "1.16"
32-
- name: Store installed Go version
33-
id: go-version
34-
run: |
35-
echo "::set-output name=version::"\
36-
"$(go version | sed 's/^go version go\([0-9.]\+\) .*/\1/')"
32+
go-version: "1.19"
3733
- name: Lookup Go cache directory
3834
id: go-cache
3935
run: |
40-
echo "::set-output name=dir::$(go env GOCACHE)"
36+
echo "dir=$(go env GOCACHE)" >> $GITHUB_OUTPUT
4137
- uses: actions/cache@v3
4238
env:
4339
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
4440
py${{ steps.setup-python.outputs.python-version }}-\
45-
go${{ steps.go-version.outputs.version }}-\
41+
go${{ steps.setup-go.outputs.go-version }}-\
4642
packer${{ steps.setup-env.outputs.packer-version }}-\
4743
tf${{ steps.setup-env.outputs.terraform-version }}-"
4844
with:
@@ -78,7 +74,7 @@ jobs:
7874
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
7975
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
8076
sudo ln -s /opt/packer/packer /usr/local/bin/packer
81-
- uses: hashicorp/setup-terraform@v1
77+
- uses: hashicorp/setup-terraform@v2
8278
with:
8379
terraform_version: ${{ steps.setup-env.outputs.terraform-version }}
8480
- name: Install shfmt

‎.github/workflows/sync-labels.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: sync-labels
3+
4+
on:
5+
push:
6+
paths:
7+
- '.github/labels.yml'
8+
- '.github/workflows/sync-labels.yml'
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
labeler:
15+
permissions:
16+
# actions/checkout needs this to fetch code
17+
contents: read
18+
# crazy-max/ghaction-github-labeler needs this to manage repository labels
19+
issues: write
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@v3
23+
- name: Sync repository labels
24+
if: success()
25+
uses: crazy-max/ghaction-github-labeler@v4
26+
with:
27+
# This is a hideous ternary equivalent so we only do a dry run unless
28+
# this workflow is triggered by the develop branch.
29+
dry-run: ${{ github.ref_name == 'develop' && 'false' || 'true' }}

‎.pre-commit-config.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ default_language_version:
55

66
repos:
77
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v4.1.0
8+
rev: v4.3.0
99
hooks:
1010
- id: check-case-conflict
1111
- id: check-executables-have-shebangs
@@ -31,32 +31,32 @@ repos:
3131

3232
# Text file hooks
3333
- repo: https://github.com/igorshubovych/markdownlint-cli
34-
rev: v0.31.1
34+
rev: v0.32.2
3535
hooks:
3636
- id: markdownlint
3737
args:
3838
- --config=.mdl_config.yaml
3939
- repo: https://github.com/pre-commit/mirrors-prettier
40-
rev: v2.6.1
40+
rev: v3.0.0-alpha.4
4141
hooks:
4242
- id: prettier
4343
- repo: https://github.com/adrienverge/yamllint
44-
rev: v1.26.3
44+
rev: v1.28.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.14.2
52+
rev: 0.18.4
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: v2.17.0
59+
rev: v2.20.0
6060
hooks:
6161
- id: validate_manifest
6262

@@ -88,11 +88,11 @@ repos:
8888
args:
8989
- --config=.bandit.yml
9090
- repo: https://github.com/psf/black
91-
rev: 22.3.0
91+
rev: 22.10.0
9292
hooks:
9393
- id: black
94-
- repo: https://gitlab.com/pycqa/flake8
95-
rev: 3.9.2
94+
- repo: https://github.com/PyCQA/flake8
95+
rev: 5.0.4
9696
hooks:
9797
- id: flake8
9898
additional_dependencies:
@@ -102,11 +102,11 @@ repos:
102102
hooks:
103103
- id: isort
104104
- repo: https://github.com/pre-commit/mirrors-mypy
105-
rev: v0.942
105+
rev: v0.990
106106
hooks:
107107
- id: mypy
108108
- repo: https://github.com/asottile/pyupgrade
109-
rev: v2.31.1
109+
rev: v3.2.0
110110
hooks:
111111
- id: pyupgrade
112112

@@ -119,14 +119,14 @@ repos:
119119

120120
# Terraform hooks
121121
- repo: https://github.com/antonbabenko/pre-commit-terraform
122-
rev: v1.64.0
122+
rev: v1.76.0
123123
hooks:
124124
- id: terraform_fmt
125125
- id: terraform_validate
126126

127127
# Docker hooks
128128
- repo: https://github.com/IamTheFij/docker-pre-commit
129-
rev: v2.1.0
129+
rev: v2.1.1
130130
hooks:
131131
- id: docker-compose-check
132132

‎.yamllint‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ rules:
88
# this behavior.
99
comments-indentation: disable
1010

11+
# yamllint does not allow inline mappings that exceed the line length by
12+
# default. There are many scenarios where the inline mapping may be a key,
13+
# hash, or other long value that would exceed the line length but cannot
14+
# reasonably be broken across lines.
15+
line-length:
16+
# This rule implies the allow-non-breakable-words rule
17+
allow-non-breakable-inline-mappings: true
18+
# Allows a 10% overage from the default limit of 80
19+
max: 88
20+
1121
# yamllint doesn't like when we use yes and no for true and false,
1222
# but that's pretty standard in Ansible.
1323
truthy: disable

0 commit comments

Comments
 (0)