Skip to content

Commit e4e111e

Browse files
committed
Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton
2 parents 00c4efe + d289ef3 commit e4e111e

13 files changed

+580
-106
lines changed

.github/dependabot.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ updates:
1111
# Managed by cisagov/skeleton-generic
1212
- dependency-name: actions/cache
1313
- dependency-name: actions/checkout
14+
- dependency-name: actions/dependency-review-action
1415
- dependency-name: actions/setup-go
1516
- dependency-name: actions/setup-python
17+
- dependency-name: cisagov/action-job-preamble
1618
- dependency-name: cisagov/setup-env-github-action
17-
- dependency-name: crazy-max/ghaction-dump-context
1819
- dependency-name: crazy-max/ghaction-github-labeler
19-
- dependency-name: crazy-max/ghaction-github-status
20-
- dependency-name: GitHubSecurityLab/actions-permissions
20+
- dependency-name: github/codeql-action
2121
- dependency-name: hashicorp/setup-packer
2222
- dependency-name: hashicorp/setup-terraform
2323
- dependency-name: mxschmitt/action-tmate
24-
- dependency-name: step-security/harden-runner
2524
package-ecosystem: github-actions
2625
schedule:
2726
interval: weekly

.github/labels.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,72 @@
22
# Rather than breaking up descriptions into multiline strings we disable that
33
# specific rule in yamllint for this file.
44
# yamllint disable rule:line-length
5-
- color: "eb6420"
5+
- color: eb6420
66
description: This issue or pull request is awaiting the outcome of another issue or pull request
77
name: blocked
88
- color: "000000"
99
description: This issue or pull request involves changes to existing functionality
1010
name: breaking change
11-
- color: "d73a4a"
11+
- color: d73a4a
1212
description: This issue or pull request addresses broken functionality
1313
name: bug
14-
- color: "07648d"
14+
- color: 07648d
1515
description: This issue will be advertised on code.gov's Open Tasks page (https://code.gov/open-tasks)
1616
name: code.gov
17-
- color: "0366d6"
17+
- color: 0366d6
1818
description: Pull requests that update a dependency file
1919
name: dependencies
20-
- color: "5319e7"
20+
- color: 5319e7
2121
description: This issue or pull request improves or adds to documentation
2222
name: documentation
23-
- color: "cfd3d7"
23+
- color: cfd3d7
2424
description: This issue or pull request already exists or is covered in another issue or pull request
2525
name: duplicate
26-
- color: "b005bc"
26+
- color: b005bc
2727
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
2828
name: epic
2929
- color: "000000"
3030
description: Pull requests that update GitHub Actions code
3131
name: github-actions
32-
- color: "0e8a16"
32+
- color: 0e8a16
3333
description: This issue or pull request is well-defined and good for newcomers
3434
name: good first issue
35-
- color: "ff7518"
35+
- color: ff7518
3636
description: Pull request that should count toward Hacktoberfest participation
3737
name: hacktoberfest-accepted
38-
- color: "a2eeef"
38+
- color: a2eeef
3939
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
4040
name: improvement
41-
- color: "fef2c0"
41+
- color: fef2c0
4242
description: This issue or pull request is not applicable, incorrect, or obsolete
4343
name: invalid
44-
- color: "ce099a"
44+
- color: ce099a
4545
description: This pull request is ready to merge during the next Lineage Kraken release
4646
name: kraken 🐙
47-
- color: "a4fc5d"
47+
- color: a4fc5d
4848
description: This issue or pull request requires further information
4949
name: need info
50-
- color: "fcdb45"
50+
- color: fcdb45
5151
description: This pull request is awaiting an action or decision to move forward
5252
name: on hold
53-
- color: "3772a4"
53+
- color: 3772a4
5454
description: Pull requests that update Python code
5555
name: python
56-
- color: "ef476c"
56+
- color: ef476c
5757
description: This issue is a request for information or needs discussion
5858
name: question
59-
- color: "d73a4a"
59+
- color: d73a4a
6060
description: This issue or pull request addresses a security issue
6161
name: security
62-
- color: "00008b"
62+
- color: 00008b
6363
description: This issue or pull request adds or otherwise modifies test code
6464
name: test
65-
- color: "1d76db"
65+
- color: 1d76db
6666
description: This issue or pull request pulls in upstream updates
6767
name: upstream update
68-
- color: "d4c5f9"
68+
- color: d4c5f9
6969
description: This issue or pull request increments the version number
7070
name: version bump
71-
- color: "ffffff"
71+
- color: ffffff
7272
description: This issue will not be incorporated
7373
name: wontfix

.github/workflows/build.yml

+49-29
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: build
33

4-
on:
4+
on: # yamllint disable-line rule:truthy
55
merge_group:
66
types:
77
- checks_requested
@@ -36,23 +36,30 @@ jobs:
3636
steps:
3737
# Note that a duplicate of this step must be added at the top of
3838
# each job.
39-
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
39+
- name: Apply standard cisagov job preamble
40+
uses: cisagov/action-job-preamble@v1
4041
with:
41-
# Uses the organization variable unless overridden
42-
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
43-
# Note that a duplicate of this step must be added at the top of
44-
# each job.
45-
- id: harden-runner
46-
name: Harden the runner
47-
uses: step-security/harden-runner@v2
48-
with:
49-
egress-policy: audit
50-
- id: github-status
51-
name: Check GitHub status
52-
uses: crazy-max/ghaction-github-status@v4
53-
- id: dump-context
54-
name: Dump context
55-
uses: crazy-max/ghaction-dump-context@v2
42+
check_github_status: "true"
43+
# This functionality is poorly implemented and has been
44+
# causing problems due to the MITM implementation hogging or
45+
# leaking memory. If this happens to you just uncomment
46+
# this line.
47+
# monitor_permissions: "false"
48+
output_workflow_context: "true"
49+
# Use a variable to specify the permissions monitoring
50+
# configuration. By default this will yield the
51+
# configuration stored in the cisagov organization-level
52+
# variable, but if you want to use a different configuration
53+
# then simply:
54+
# 1. Create a repository-level variable with the name
55+
# ACTIONS_PERMISSIONS_CONFIG.
56+
# 2. Set this new variable's value to the configuration you
57+
# want to use for this repository.
58+
#
59+
# Note in particular that changing the permissions
60+
# monitoring configuration *does not* require you to modify
61+
# this workflow.
62+
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
5663
lint:
5764
needs:
5865
- diagnostics
@@ -61,15 +68,28 @@ jobs:
6168
contents: read
6269
runs-on: ubuntu-latest
6370
steps:
64-
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
65-
with:
66-
# Uses the organization variable unless overridden
67-
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
68-
- id: harden-runner
69-
name: Harden the runner
70-
uses: step-security/harden-runner@v2
71+
- name: Apply standard cisagov job preamble
72+
uses: cisagov/action-job-preamble@v1
7173
with:
72-
egress-policy: audit
74+
# This functionality is poorly implemented and has been
75+
# causing problems due to the MITM implementation hogging or
76+
# leaking memory. If this happens to you just uncomment
77+
# this line.
78+
# monitor_permissions: "false"
79+
# Use a variable to specify the permissions monitoring
80+
# configuration. By default this will yield the
81+
# configuration stored in the cisagov organization-level
82+
# variable, but if you want to use a different configuration
83+
# then simply:
84+
# 1. Create a repository-level variable with the name
85+
# ACTIONS_PERMISSIONS_CONFIG.
86+
# 2. Set this new variable's value to the configuration you
87+
# want to use for this repository.
88+
#
89+
# Note in particular that changing the permissions
90+
# monitoring configuration *does not* require you to modify
91+
# this workflow.
92+
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
7393
- id: setup-env
7494
uses: cisagov/setup-env-github-action@develop
7595
- uses: actions/checkout@v4
@@ -92,16 +112,16 @@ jobs:
92112
echo "dir=$(go env GOCACHE)" >> $GITHUB_OUTPUT
93113
- uses: actions/cache@v4
94114
env:
95-
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
115+
BASE_CACHE_KEY: ${{ github.job }}-${{ runner.os }}-\
96116
py${{ steps.setup-python.outputs.python-version }}-\
97117
go${{ steps.setup-go.outputs.go-version }}-\
98118
packer${{ steps.setup-env.outputs.packer-version }}-\
99-
tf${{ steps.setup-env.outputs.terraform-version }}-"
119+
tf${{ steps.setup-env.outputs.terraform-version }}-
100120
with:
101-
key: "${{ env.BASE_CACHE_KEY }}\
121+
key: ${{ env.BASE_CACHE_KEY }}\
102122
${{ hashFiles('**/requirements-test.txt') }}-\
103123
${{ hashFiles('**/requirements.txt') }}-\
104-
${{ hashFiles('**/.pre-commit-config.yaml') }}"
124+
${{ hashFiles('**/.pre-commit-config.yaml') }}
105125
# Note that the .terraform directory IS NOT included in the
106126
# cache because if we were caching, then we would need to use
107127
# the `-upgrade=true` option. This option blindly pulls down the

.github/workflows/codeql-analysis.yml

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
---
2+
# For most projects, this workflow file will not need changing; you simply need
3+
# to commit it to your repository.
4+
#
5+
# You may wish to alter this file to override the set of languages analyzed,
6+
# or to provide custom queries or build logic.
7+
name: CodeQL
8+
9+
# The use of on here as a key is part of the GitHub actions syntax.
10+
# yamllint disable-line rule:truthy
11+
on:
12+
merge_group:
13+
types:
14+
- checks_requested
15+
pull_request:
16+
# The branches here must be a subset of the ones in the push key
17+
branches:
18+
- develop
19+
push:
20+
# Dependabot-triggered push events have read-only access, but uploading code
21+
# scanning requires write access.
22+
branches-ignore:
23+
- dependabot/**
24+
schedule:
25+
- cron: 0 2 * * 6
26+
27+
jobs:
28+
diagnostics:
29+
name: Run diagnostics
30+
# This job does not need any permissions
31+
permissions: {}
32+
runs-on: ubuntu-latest
33+
steps:
34+
# Note that a duplicate of this step must be added at the top of
35+
# each job.
36+
- name: Apply standard cisagov job preamble
37+
uses: cisagov/action-job-preamble@v1
38+
with:
39+
check_github_status: "true"
40+
# This functionality is poorly implemented and has been
41+
# causing problems due to the MITM implementation hogging or
42+
# leaking memory. If this happens to you just uncomment
43+
# this line.
44+
# monitor_permissions: "false"
45+
output_workflow_context: "true"
46+
# Use a variable to specify the permissions monitoring
47+
# configuration. By default this will yield the
48+
# configuration stored in the cisagov organization-level
49+
# variable, but if you want to use a different configuration
50+
# then simply:
51+
# 1. Create a repository-level variable with the name
52+
# ACTIONS_PERMISSIONS_CONFIG.
53+
# 2. Set this new variable's value to the configuration you
54+
# want to use for this repository.
55+
#
56+
# Note in particular that changing the permissions
57+
# monitoring configuration *does not* require you to modify
58+
# this workflow.
59+
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
60+
analyze:
61+
name: Analyze
62+
needs:
63+
- diagnostics
64+
runs-on: ubuntu-latest
65+
permissions:
66+
# actions/checkout needs this to fetch code
67+
contents: read
68+
# required for all workflows
69+
security-events: write
70+
strategy:
71+
fail-fast: false
72+
matrix:
73+
# Override automatic language detection by changing the below
74+
# list
75+
#
76+
# Supported options are actions, c-cpp, csharp, go,
77+
# java-kotlin, javascript-typescript, python, ruby, and swift.
78+
language:
79+
- actions
80+
# Learn more...
81+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
82+
83+
steps:
84+
- name: Apply standard cisagov job preamble
85+
uses: cisagov/action-job-preamble@v1
86+
with:
87+
# This functionality is poorly implemented and has been
88+
# causing problems due to the MITM implementation hogging or
89+
# leaking memory. If this happens to you just uncomment
90+
# this line.
91+
# monitor_permissions: "false"
92+
# Use a variable to specify the permissions monitoring
93+
# configuration. By default this will yield the
94+
# configuration stored in the cisagov organization-level
95+
# variable, but if you want to use a different configuration
96+
# then simply:
97+
# 1. Create a repository-level variable with the name
98+
# ACTIONS_PERMISSIONS_CONFIG.
99+
# 2. Set this new variable's value to the configuration you
100+
# want to use for this repository.
101+
#
102+
# Note in particular that changing the permissions
103+
# monitoring configuration *does not* require you to modify
104+
# this workflow.
105+
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
106+
107+
- name: Checkout repository
108+
uses: actions/checkout@v4
109+
110+
# Initializes the CodeQL tools for scanning.
111+
- name: Initialize CodeQL
112+
uses: github/codeql-action/init@v3
113+
with:
114+
languages: ${{ matrix.language }}
115+
116+
# Autobuild attempts to build any compiled languages (C/C++, C#, or
117+
# Java). If this step fails, then you should remove it and run the build
118+
# manually (see below).
119+
- name: Autobuild
120+
uses: github/codeql-action/autobuild@v3
121+
122+
# ℹ️ Command-line programs to run using the OS shell.
123+
# 📚 https://git.io/JvXDl
124+
125+
# ✏️ If the Autobuild fails above, remove it and uncomment the following
126+
# three lines and modify them (or add more) to build your code if your
127+
# project uses a compiled language
128+
129+
# - run: |
130+
# make bootstrap
131+
# make release
132+
133+
- name: Perform CodeQL Analysis
134+
uses: github/codeql-action/analyze@v3

0 commit comments

Comments
 (0)