⚠️ 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/provisionaccount-role-tf-module.git provisionaccount-role-tf-module
   cd provisionaccount-role-tf-module
   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/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 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

This pull request updates repo maintenance/tooling: Python bootstrap dependencies, pre-commit hook versions, GitHub Actions workflow triggers/caching, and regenerates Terraform docs output formatting (Markdown tables / terraform-docs fork branch).

Changes:

• Remove wheel from bootstrap installs and requirements; tighten setuptools requirement.
• Refresh generated Terraform-docs Markdown table delimiter formatting in READMEs and update example .terraform.lock.hcl.
• Bump multiple pre-commit hook versions and adjust GitHub Actions workflows (default PR event types, cache action version/formatting, terraform-docs fork branch name).

Reviewed changes

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

Show a summary per file

File	Description
setup-env	Updates pip bootstrap install set (drops wheel).
requirements.txt	Removes wheel and pins setuptools minimum version.
README.md	Regenerates TF docs Markdown tables with spaced delimiter rows.
examples/basic_usage/README.md	Regenerates TF docs output for the example.
examples/basic_usage/.terraform.lock.hcl	Updates locked AWS provider version/hashes.
.pre-commit-config.yaml	Bumps hook revisions across linters/formatters/security tools.
.github/workflows/label-prs.yml	Uses default pull_request activity types (removes explicit list) and documents intent.
.github/workflows/dependency-review.yml	Documents using default pull_request activity types.
.github/workflows/codeql-analysis.yml	Documents using default pull_request activity types.
.github/workflows/build.yml	Updates terraform-docs fork branch, cache action version, and reformats cache key construction.

Files not reviewed (1)

• examples/basic_usage/.terraform.lock.hcl: Language not supported

---

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

You can also share your feedback on Copilot code review. Take the survey.