⚠️ 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/ssm-read-role-tf-module.git ssm-read-role-tf-module
   cd ssm-read-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 PR updates the repo’s development/tooling dependencies and generated Terraform documentation formatting (likely to satisfy markdownlint table rules), along with minor CI/workflow maintenance.

Changes:

• Update pre-commit hook versions and related CI setup (including caching and terraform-docs fork branch selection).
• Refresh generated Terraform docs table delimiter formatting in README files.
• Adjust Python environment/requirements (drop wheel, constrain setuptools) and update the Terraform provider lockfile.

Reviewed changes

Copilot reviewed 8 out of 10 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
setup-env	Stop installing wheel during environment bootstrap; only upgrade pip and setuptools.
requirements.txt	Remove wheel; add a minimum setuptools version constraint.
README.md	Normalize Terraform-docs-generated markdown table separator formatting.
examples/basic_usage/README.md	Update generated docs formatting; currently introduces a malformed/contradictory Providers section.
examples/basic_usage/.terraform.lock.hcl	Bump AWS provider lock version/hashes.
.pre-commit-config.yaml	Bump multiple hook versions (markdownlint, prettier, yamllint, bandit, black, isort, mypy, pip-audit, etc.).
.github/workflows/label-prs.yml	Switch to default pull_request activity types and document the choice.
.github/workflows/dependency-review.yml	Add comment documenting default pull_request activity types.
.github/workflows/codeql-analysis.yml	Add comment documenting default pull_request activity types.
.github/workflows/build.yml	Update cache action version/formatting, terraform-docs fork branch name, and drop wheel from dependency install step.

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.