⚠️ 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-tf-module.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/cool-admin-provisioner-iam.git cool-admin-provisioner-iam
   cd cool-admin-provisioner-iam
   git remote add skeleton https://github.com/cisagov/skeleton-tf-module.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 README.md examples/basic_usage/.terraform.lock.hcl examples/basic_usage/README.md 
   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.
• 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

Syncs this repository with upstream cisagov/skeleton-tf-module updates, primarily modernizing CI/lint tooling and tightening Python packaging/security scanning configuration.

Changes:

• Update pre-commit hook versions/config (including new flake8 plugins and a pip-audit CVE ignore).
• Refresh GitHub Actions workflow configuration and action versions (labeling, build, etc.).
• Simplify Python bootstrap/requirements (remove wheel, pin setuptools minimum) and apply minor Markdown formatting updates.

Reviewed changes

Copilot reviewed 11 out of 13 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
setup-env	Stops upgrading/installing wheel during environment bootstrap.
requirements.txt	Removes wheel and sets a minimum setuptools version.
README.md	Adjusts Markdown table delimiter formatting (lint-friendly).
.terraform.lock.hcl	Updates provider lock hashes (likely due to regenerated lockfile).
.pre-commit-config.yaml	Bumps hook versions, adds flake8 plugins, adds pip-audit ignore for a specific CVE, removes Bandit custom config usage, adds terraform providers lock hook.
.github/workflows/sync-labels.yml	Updates labeler action major version.
.github/workflows/label-prs.yml	Uses default pull_request activity types (removes explicit list) and documents intent.
.github/workflows/dependency-review.yml	Documents use of default pull_request activity types.
.github/workflows/codeql-analysis.yml	Documents use of default pull_request activity types.
.github/workflows/build.yml	Updates cache/action versions, adjusts caching key formatting, updates terraform-docs fork branch usage, removes wheel from pip bootstrap, tweaks go-critic install path.
.github/labeler.yml	Removes .bandit.yml from “test” label patterns (file deleted).
.flake8	Expands enabled rule sets and updates ignore list/documentation.
.bandit.yml	Removes Bandit configuration file.

Files not reviewed (1)

• .terraform.lock.hcl: Language not supported

---

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