⚠️ CONFLICT! Lineage pull request for: skeleton #38

cisagovbot · 2024-11-08T10:30:52Z

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

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

Clone the repository locally, and reapply the merge:

git clone [email protected]:cisagov/cool-userservices-networking.git cool-userservices-networking
cd cool-userservices-networking
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

Review the changes displayed by the status command. Fix any conflicts and
possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the
branch, commit, and push your changes:
```
git add .github/CODEOWNERS README.md examples/basic_usage/README.md examples/basic_usage/versions.tf variables.tf 
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.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
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 relevant repo and/or project documentation has been updated to reflect 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

This commit will make a few changes. The orginal version of the semantic checking function was a bit more difficult to read. It is now somewhat easier to follow how the regex is structured. Also the function has been renamed to check_python_version since it has 2 functions, making sure that the version is semantically correct and the second is to make sure that it is installed on the user's machine. This makes it easier to follow the logic for the flags, -p or --python-version and -l or --list-versions

…ttps://github.com/cisagov/skeleton-generic into improvement/correct-semantic-python-version-checks

Co-authored-by: dav3r <[email protected]>

Add the `check-useless-excludes` meta hook to verify that any defined `exclude` directives apply to at least one file in the repository.

Instead of manually installing Packer we can instead leverage the hashicorp/setup-packer Action just as we do for Terraform.

He is no longer a member of @cisagov/vm-dev.

Previously we only provided a lower bound for the version, but pinning to a specific version aligns with what has been done with the prettier hook and how pre-commit hooks are pinned in general. The flake8-docstrings package is rarely updated, so there is no real downside to pinning to a specific version. Co-authored-by: Nick <[email protected]>

Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [crazy-max/ghaction-github-status](https://github.com/crazy-max/ghaction-github-status) from 3 to 4. - [Release notes](https://github.com/crazy-max/ghaction-github-status/releases) - [Commits](crazy-max/ghaction-github-status@v3...v4) --- updated-dependencies: - dependency-name: crazy-max/ghaction-github-status dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier hook was manually held back because the latest tags are for alpha releases of the next major version.

Use the latest v3 release available from NPM.

…max/ghaction-github-status-4 Bump crazy-max/ghaction-github-status from 3 to 4

…s/cache-4 Bump actions/cache from 3 to 4

Use an Action to install Packer in our GitHub Actions workflows

…hon-version-checks Add checks for correct semantic version of Python

@jasonodoom

Remove @jasonodoom as a codeowner

The pip-audit tool will audit any supplied pip requirements files for vulnerable packages.

…hook Add the `check-useless-excludes` hook to the pre-commit configuration

…mmit_hook Add a pre-commit hook to run `pip-audit`

Lineage pull request for: skeleton

…-non-nullable Specify all variables as non-`nullable`

This agrees with the advice for Terraform modules given here: https://developer.hashicorp.com/terraform/language/expressions/version-constraints#terraform-core-and-provider-versions Note that these changes should not be made to root modules.

…ictions Loosen version restrictions

…e/skeleton

Michael Saki and others added 30 commits February 14, 2024 12:59

Add checks for semantic python versions

33582a1

Add checks for semantic python versions

cea8edc

Merge branch 'improvement/correct-semantic-python-version-checks' of h…

f7b9d05

…ttps://github.com/cisagov/skeleton-generic into improvement/correct-semantic-python-version-checks

Remove example of correct semantic version

327ab73

Refactor the error message for the user

4dedf50

Improve the semantic error message

e84deea

Fix grammar

5fdc7be

Co-authored-by: dav3r <[email protected]>

Refactor regex, add link, and improve comments

42ef8c2

Update link to use semver.org over regex101.com

a77e5e1

Remove unnecessary period

5fe14c7

Co-authored-by: dav3r <[email protected]>

Add a meta hook to the pre-commit configuration

b7896a0

Add the `check-useless-excludes` meta hook to verify that any defined `exclude` directives apply to at least one file in the repository.

Remove exclude directive that does not apply to any files

260566f

Add a lower-bound pin for flake8-docstrings

a68994d

Use the hashicorp/setup-packer GitHub Action

43b91c7

Instead of manually installing Packer we can instead leverage the hashicorp/setup-packer Action just as we do for Terraform.

Remove @jasonodoom as a codeowner

8ada75d

He is no longer a member of @cisagov/vm-dev.

Update pre-commit hook versions

6a58c2c

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier hook was manually held back because the latest tags are for alpha releases of the next major version.

Manually update the prettier hook

553efcb

Use the latest v3 release available from NPM.

Merge pull request #170 from cisagov/dependabot/github_actions/crazy-…

184e749

…max/ghaction-github-status-4 Bump crazy-max/ghaction-github-status from 3 to 4

Merge pull request #171 from cisagov/dependabot/github_actions/action…

d99c117

…s/cache-4 Bump actions/cache from 3 to 4

Merge pull request #187 from cisagov/improvement/use_setup_packer_action

2491ca0

Use an Action to install Packer in our GitHub Actions workflows

Merge pull request #176 from cisagov/improvement/correct-semantic-pyt…

f6c9537

…hon-version-checks Add checks for correct semantic version of Python

Merge pull request #188 from cisagov/remove-odoom-as-a-codeowner

10e5f6f

Remove @jasonodoom as a codeowner

Add a pre-commit hook to run pip-audit

045a998

The pip-audit tool will audit any supplied pip requirements files for vulnerable packages.

Merge pull request #178 from cisagov/improvement/add_pre-commit_meta_…

28dc4ce

…hook Add the `check-useless-excludes` hook to the pre-commit configuration

Merge pull request #179 from cisagov/improvement/add_pip-audit_pre-co…

5801cec

…mmit_hook Add a pre-commit hook to run `pip-audit`

mcdonnnj and others added 6 commits November 5, 2024 12:01

Enable new dependabot ignore directives

35287ff

Merge pull request #219 from cisagov/lineage/skeleton

e2722ef

Lineage pull request for: skeleton

Merge pull request #221 from cisagov/improvement/specify-variables-as…

d0a08ae

…-non-nullable Specify all variables as non-`nullable`

Update Terraform docs in README to match changes from recent commits

c9d0d35

Merge pull request #220 from cisagov/improvement/loosen-version-restr…

e7315c0

…ictions Loosen version restrictions

cisagovbot assigned dav3r, jsf9k and mcdonnnj Nov 8, 2024

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Nov 8, 2024

jsf9k unassigned dav3r and mcdonnnj Nov 18, 2024

Merge remote-tracking branch 'skeleton-tf-module/develop' into lineag…

0fb91ae

…e/skeleton

jsf9k force-pushed the lineage/skeleton branch from 2c6d097 to 0fb91ae Compare November 18, 2024 17:26

jsf9k marked this pull request as ready for review November 18, 2024 17:34

jsf9k requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners November 18, 2024 17:34

jsf9k enabled auto-merge November 18, 2024 17:34

jsf9k requested a review from a team November 18, 2024 17:34

dav3r approved these changes Nov 18, 2024

View reviewed changes

dv4harr10 approved these changes Nov 19, 2024

View reviewed changes

jsf9k merged commit b6422ba into develop Nov 19, 2024
4 checks passed

jsf9k deleted the lineage/skeleton branch November 19, 2024 17:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⚠️ CONFLICT! Lineage pull request for: skeleton #38

⚠️ CONFLICT! Lineage pull request for: skeleton #38

cisagovbot commented Nov 8, 2024 •

edited by jsf9k

Loading

⚠️ CONFLICT! Lineage pull request for: skeleton #38

⚠️ CONFLICT! Lineage pull request for: skeleton #38

Conversation

cisagovbot commented Nov 8, 2024 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

cisagovbot commented Nov 8, 2024 •

edited by jsf9k

Loading