⚠️ 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-users-non-admin.git cool-users-non-admin
   cd cool-users-non-admin
   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 .terraform.lock.hcl README.md 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

Lineage sync from cisagov/skeleton-tf-module bringing the repository’s tooling/configuration in line with the upstream skeleton (pre-commit, CI workflows, and dependency/lockfile housekeeping).

Changes:

• Update pre-commit hooks (versions, flake8 plugin set, pip-audit ignore, and add terraform providers lock hook).
• Refresh GitHub Actions workflows (action version bumps and trigger documentation/formatting adjustments).
• Adjust Python bootstrap/deps (remove wheel from installs/requirements; pin setuptools) and refresh Terraform provider lockfile.

Reviewed changes

Copilot reviewed 11 out of 13 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
setup-env	Removes wheel from the initial pip upgrade step.
requirements.txt	Drops wheel and pins setuptools to a minimum version.
README.md	Table delimiter formatting updates (lint/markdown style).
.terraform.lock.hcl	Updates the locked AWS provider version and hashes.
.pre-commit-config.yaml	Bumps hook revisions, adjusts Python hooks, adds pip-audit ignore, adds terraform providers lock generation.
.github/workflows/sync-labels.yml	Bumps GitHub label sync action major version.
.github/workflows/label-prs.yml	Uses default pull_request activity types; adds explanatory comment.
.github/workflows/dependency-review.yml	Adds note about default pull_request activity types.
.github/workflows/codeql-analysis.yml	Adds note about default pull_request activity types.
.github/workflows/build.yml	Updates cache/setup actions, terraform-docs branch variable, and pip upgrade command; adds clarifying comments.
.github/labeler.yml	Removes .bandit.yml from label matching since it’s deleted.
.flake8	Expands selected rule families and updates ignore list/documentation.
.bandit.yml	Removes Bandit config file (and corresponding pre-commit usage).

Files not reviewed (1)

• .terraform.lock.hcl: Language not supported

---

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