Skip to content

Commit 77c0e91

Browse files
committed
Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton
2 parents 28ba702 + cd12ae0 commit 77c0e91

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

.github/labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ python:
4646
- changed-files:
4747
- any-glob-to-any-file:
4848
- "**/*.py"
49+
shell script:
50+
- changed-files:
51+
- any-glob-to-any-file:
52+
# If this project has any shell scripts that do not end in the ".sh"
53+
# extension, add them below.
54+
- "**/*.sh"
55+
- bump-version
56+
- setup-env
4957
terraform:
5058
- changed-files:
5159
- any-glob-to-any-file:

.github/labels.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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: f15a53
5+
- color: ff5850
66
description: Pull requests that update Ansible code
77
name: ansible
88
- color: eb6420
@@ -20,7 +20,7 @@
2020
- color: 0366d6
2121
description: Pull requests that update a dependency file
2222
name: dependencies
23-
- color: 2497ed
23+
- color: 1d63ed
2424
description: Pull requests that update Docker code
2525
name: docker
2626
- color: 5319e7
@@ -47,7 +47,7 @@
4747
- color: fef2c0
4848
description: This issue or pull request is not applicable, incorrect, or obsolete
4949
name: invalid
50-
- color: f1d642
50+
- color: f0db4f
5151
description: Pull requests that update JavaScript code
5252
name: javascript
5353
- color: ce099a
@@ -62,7 +62,7 @@
6262
- color: 02a8ef
6363
description: Pull requests that update Packer code
6464
name: packer
65-
- color: 3772a4
65+
- color: 3776ab
6666
description: Pull requests that update Python code
6767
name: python
6868
- color: ef476c
@@ -71,13 +71,16 @@
7171
- color: d73a4a
7272
description: This issue or pull request addresses a security issue
7373
name: security
74+
- color: 4eaa25
75+
description: Pull requests that update shell scripts
76+
name: shell script
7477
- color: 7b42bc
7578
description: Pull requests that update Terraform code
7679
name: terraform
7780
- color: 00008b
7881
description: This issue or pull request adds or otherwise modifies test code
7982
name: test
80-
- color: 2b6ebf
83+
- color: 2678c5
8184
description: Pull requests that update TypeScript code
8285
name: typescript
8386
- color: 1d76db

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
101101
- id: setup-env
102102
uses: cisagov/setup-env-github-action@v1
103-
- uses: actions/checkout@v5
103+
- uses: actions/checkout@v6
104104
- id: setup-python
105105
uses: actions/setup-python@v6
106106
with:

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,19 @@ jobs:
113113
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
114114

115115
- name: Checkout repository
116-
uses: actions/checkout@v5
116+
uses: actions/checkout@v6
117117

118118
# Initializes the CodeQL tools for scanning.
119119
- name: Initialize CodeQL
120-
uses: github/codeql-action/init@v3
120+
uses: github/codeql-action/init@v4
121121
with:
122122
languages: ${{ matrix.language }}
123123

124124
# Autobuild attempts to build any compiled languages (C/C++, C#, or
125125
# Java). If this step fails, then you should remove it and run the build
126126
# manually (see below).
127127
- name: Autobuild
128-
uses: github/codeql-action/autobuild@v3
128+
uses: github/codeql-action/autobuild@v4
129129

130130
# ℹ️ Command-line programs to run using the OS shell.
131131
# 📚 https://git.io/JvXDl
@@ -139,4 +139,4 @@ jobs:
139139
# make release
140140

141141
- name: Perform CodeQL Analysis
142-
uses: github/codeql-action/analyze@v3
142+
uses: github/codeql-action/analyze@v4

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
9090
- id: checkout-repo
9191
name: Checkout the repository
92-
uses: actions/checkout@v5
92+
uses: actions/checkout@v6
9393
- id: dependency-review
9494
name: Review dependency changes for vulnerabilities and license changes
9595
uses: actions/dependency-review-action@v4

.github/workflows/label-prs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
permissions:
6060
# Permissions required by actions/labeler
6161
contents: read
62-
issues: write
6362
pull-requests: write
6463
runs-on: ubuntu-latest
6564
steps:

.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
# monitoring configuration *does not* require you to modify
8585
# this workflow.
8686
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
87-
- uses: actions/checkout@v5
87+
- uses: actions/checkout@v6
8888
- name: Sync repository labels
8989
if: success()
9090
uses: crazy-max/ghaction-github-labeler@v5

.pre-commit-config.yaml

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ repos:
6363

6464
# GitHub Actions hooks
6565
- repo: https://github.com/python-jsonschema/check-jsonschema
66-
rev: 0.33.3
66+
rev: 0.35.0
6767
hooks:
6868
- id: check-github-actions
6969
- id: check-github-workflows
7070

7171
# pre-commit hooks
7272
- repo: https://github.com/pre-commit/pre-commit
73-
rev: v4.3.0
73+
rev: v4.4.0
7474
hooks:
7575
- id: validate_manifest
7676

7777
# Go hooks
7878
- repo: https://github.com/TekWizely/pre-commit-golang
79-
rev: v1.0.0-rc.2
79+
rev: v1.0.0-rc.4
8080
hooks:
8181
# Go Build
8282
- id: go-build-repo-mod
@@ -129,13 +129,13 @@ repos:
129129

130130
# Python hooks
131131
- repo: https://github.com/PyCQA/bandit
132-
rev: 1.8.6
132+
rev: 1.9.1
133133
hooks:
134134
- id: bandit
135135
args:
136136
- --config=.bandit.yml
137137
- repo: https://github.com/psf/black-pre-commit-mirror
138-
rev: 25.1.0
138+
rev: 25.11.0
139139
hooks:
140140
- id: black
141141
- repo: https://github.com/PyCQA/flake8
@@ -145,11 +145,11 @@ repos:
145145
additional_dependencies:
146146
- flake8-docstrings==1.7.0
147147
- repo: https://github.com/PyCQA/isort
148-
rev: 6.0.1
148+
rev: 7.0.0
149149
hooks:
150150
- id: isort
151151
- repo: https://github.com/pre-commit/mirrors-mypy
152-
rev: v1.18.1
152+
rev: v1.18.2
153153
hooks:
154154
- id: mypy
155155
- repo: https://github.com/pypa/pip-audit
@@ -165,13 +165,19 @@ repos:
165165
- --requirement
166166
- requirements.txt
167167
- repo: https://github.com/asottile/pyupgrade
168-
rev: v3.20.0
168+
rev: v3.21.1
169169
hooks:
170170
- id: pyupgrade
171+
args:
172+
# Python 3.10 is currently the oldest non-EOL version of
173+
# Python, so we want to apply all rules that apply to this
174+
# version or later. See here for more details:
175+
# https://www.gyford.com/phil/writing/2025/08/26/how-to-use-pyupgrade/
176+
- --py310-plus
171177

172178
# Ansible hooks
173179
- repo: https://github.com/ansible/ansible-lint
174-
rev: v25.9.0
180+
rev: v25.11.1
175181
hooks:
176182
- id: ansible-lint
177183
additional_dependencies:
@@ -187,35 +193,17 @@ repos:
187193
# hook identifies a vulnerability in ansible-core 2.16.13,
188194
# but all versions of ansible 9 have a dependency on
189195
# ~=2.16.X.
190-
#
191-
# It is also a good idea to go ahead and upgrade to version
192-
# 10 since version 9 is going EOL at the end of November:
193-
# https://endoflife.date/ansible
194196
# - ansible>=10,<11
195-
# ansible-core 2.16.3 through 2.16.6 suffer from the bug
196-
# discussed in ansible/ansible#82702, which breaks any
197-
# symlinked files in vars, tasks, etc. for any Ansible role
198-
# installed via ansible-galaxy. Hence we never want to
199-
# install those versions.
200-
#
201-
# Note that the pip-audit pre-commit hook identifies a
202-
# vulnerability in ansible-core 2.16.13. The pin of
203-
# ansible-core to >=2.17 effectively also pins ansible to
204-
# >=10.
205-
#
206-
# It is also a good idea to go ahead and upgrade to
207-
# ansible-core 2.17 since security support for ansible-core
208-
# 2.16 ends this month:
209-
# https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix
197+
# ansible-core<2.17.7 suffers from GHSA-99w6-3xph-cx78.
210198
#
211199
# Note that any changes made to this dependency must also be
212200
# made in requirements.txt in cisagov/skeleton-packer and
213201
# requirements-test.txt in cisagov/skeleton-ansible-role.
214-
- ansible-core>=2.17
202+
- ansible-core>=2.17.7
215203

216204
# Terraform hooks
217205
- repo: https://github.com/antonbabenko/pre-commit-terraform
218-
rev: v1.100.0
206+
rev: v1.103.0
219207
hooks:
220208
- id: terraform_fmt
221209
- id: terraform_validate

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# ssm-read-role-tf-module #
22

33
[![GitHub Build Status](https://github.com/cisagov/ssm-read-role-tf-module/workflows/build/badge.svg)](https://github.com/cisagov/ssm-read-role-tf-module/actions)
4+
[![License](https://img.shields.io/github/license/cisagov/ssm-read-role-tf-module)](https://spdx.org/licenses/)
5+
[![CodeQL](https://github.com/cisagov/ssm-read-role-tf-module/workflows/CodeQL/badge.svg)](https://github.com/cisagov/ssm-read-role-tf-module/actions/workflows/codeql-analysis.yml)
46

57
A Terraform module for creating an IAM role and policy for reading SSM parameters.
68

0 commit comments

Comments
 (0)