⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-generic.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with your project.

The lineage/skeleton branch has one or more unresolved merge conflicts that you must resolve before merging this pull request!

How to resolve the conflicts

1. Take ownership of this pull request by removing any other assignees.

2. Clone the repository locally, and reapply the merge:

   git clone git@github.com:cisagov/skeleton-docker.git skeleton-docker
   cd skeleton-docker
   git remote add skeleton https://github.com/cisagov/skeleton-generic.git
   git remote set-url --push skeleton no_push
   git switch develop
   git switch --create lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:

   git add .bandit.yml .pre-commit-config.yaml 
   git commit
   git push --force --set-upstream origin lineage/skeleton

   Note that you may append to the default merge commit message that git creates for you, but please do not delete the existing content. It provides useful information about the merge that is being performed.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

• ✌️ The conflicts in this pull request have been resolved.
• All future TODOs are captured in issues, which are referenced in code comments.
• All relevant type-of-change labels have been added.
• Tests have been added and/or modified to cover the changes in this PR.
• All new and existing tests pass.

---

Note

You are seeing this because one of this repository's maintainers has configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

[Copilot]

Pull request overview

This Lineage PR syncs this repository with upstream cisagov/skeleton-generic, primarily updating CI/lint tooling and tightening a couple of tests for style consistency.

Changes:

• Refresh pre-commit hook versions and extend linting via additional flake8 plugins; add a pip-audit CVE ignore and a Terraform providers lock hook.
• Update GitHub Actions workflow dependencies (e.g., label sync action, setup-terraform action) and adjust the go-critic install path in CI.
• Minor readability/style updates in container tests (variable naming and assertion formatting).

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
tests/container_test.py	Minor test readability/style adjustments (timeout var, assertion formatting).
.pre-commit-config.yaml	Hook version bumps; adds flake8 plugins, pip-audit ignore, and a Terraform lockfile hook.
.github/workflows/sync-labels.yml	Updates label sync action version.
.github/workflows/build.yml	Updates setup-terraform action major version and changes go-critic install path.
.flake8	Expands/clarifies selected flake8 rule sets and adjusts ignored codes.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.