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

cisagovbot · 2024-09-25T08:24:45Z

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-generic.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/skeleton-packer.git skeleton-packer
cd skeleton-packer
git remote add skeleton https://github.com/cisagov/skeleton-generic.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/workflows/build.yml 
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 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`

jsf9k · 2024-11-07T23:48:41Z

I think this PR may need a PR similar to cisagov/skeleton-ansible-role#208 to be in place before it can succeed in order to get around the error from the pip-audit pre-commit hook. @mcdonnnj, what do you think?

jsf9k · 2024-11-08T18:25:45Z

I think this PR may need a PR similar to cisagov/skeleton-ansible-role#208 to be in place before it can succeed in order to get around the error from the pip-audit pre-commit hook. @mcdonnnj, what do you think?

Please see commits 26a8baf and 19fbaf3, as well as cisagov/skeleton-generic#196 and cisagov/skeleton-ansible-role#209. The commit in this PR gets rid of the pip-audit error from the linter, and the two PRs are to keep the other skeleton repos in sync with this one.

This is being done because the pip-audit pre-commit hook identifies a vulnerability in ansible-core version 2.16.13. Note that this requires that we bump up ansible to version 10 since all versions of ansible 9 have a dependency on ~=2.16.X.

Version 24.10.0 is the first version that supports Fedora 41 as a valid platform.

The pin of ansible-core was originally put in place because the pip-audit pre-commit hook identifies a vulnerability in ansible-core 2.16.13. Normally we would pin ansible-core to >2.16.13, but in the spirit of the earlier, optional pin of ansible>=10 we pin ansible-core to >=2.17. This effectively also pins ansible to >=10. Co-authored-by: Nick M <[email protected]>

jsf9k · 2024-11-14T02:55:02Z

@mcdonnnj - After commit a00c336 pip-audit finds a vulnerability in ansible-core==2.17.6. I am confused as to why this does not show up in cisagov/skeleton-ansible-role#209.

This is the vulnerability pip-audit finds for ansible-core versions 2.16.13, 2.17.6, and even 2.18.0.

The pin of ansible-core was originally put in place because the pip-audit pre-commit hook identifies a vulnerability in ansible-core 2.16.13. Normally we would pin ansible-core accordingly (>2.16.13), but the earlier pin of ansible>=10 effectively pins ansible-core to >=2.17 so that's what do. Co-authored-by: Nick M <[email protected]>

This is being done only temporarily, and only because there is no recent version of ansible-core that does not exhibit the vulnerability. Without this change we get a failure from the pip-audit pre-commit hook that we cannot do anything about. See #380 for more details.

This adds even more evidence for why it is a good idea to go ahead and upgrade ansible and ansible-core, in addition to the vulnerability that pip-audit turned up. Co-authored-by: Nick M <[email protected]>

…n-for-ansible-core Bump up the lower bound on `ansible-core`

…-pre-commit-hook-version Update the version of the `ansible-lint` `pre-commit` hook

jsf9k · 2024-11-20T19:20:07Z

@mcdonnnj - Around Halloween you said that you wanted to rebase #378 on top of this PR when it was ready. It's ready now.

jsf9k · 2024-12-07T18:02:00Z

@mcdonnnj - Around Halloween you said that you wanted to rebase #378 on top of this PR when it was ready. It's ready now.

@mcdonnnj - Reminder to rebase when you have time. I'd like to kick off Lineage for this repo early next week.

jsf9k · 2024-12-09T21:11:59Z

These changes are included in #378.

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`

Bump up the lower bound on ansible-core

26a8baf

This is being done because the pip-audit pre-commit hook identifies a vulnerability in ansible-core version 2.16.13. Note that this requires that we bump up ansible to version 10 since all versions of ansible 9 have a dependency on ~=2.16.X.

jsf9k force-pushed the lineage/skeleton branch from 72964b2 to 26a8baf Compare November 8, 2024 18:27

Bump up the lower bound on ansible-core

12a91ad

This is being done because the pip-audit pre-commit hook identifies a vulnerability in ansible-core version 2.16.13. Note that this requires that we bump up ansible to version 10 since all versions of ansible 9 have a dependency on ~=2.16.X.

This was referenced Nov 8, 2024

Bump up the lower bound on ansible-core cisagov/skeleton-ansible-role#209

Merged

Bump up the lower bound on ansible-core cisagov/skeleton-generic#196

Merged

jsf9k and others added 2 commits November 13, 2024 10:29

Update the version of the ansible-lint pre-commit hook

b9f798d

Version 24.10.0 is the first version that supports Fedora 41 as a valid platform.

jsf9k force-pushed the lineage/skeleton branch from 19fbaf3 to a00c336 Compare November 14, 2024 15:56

jsf9k mentioned this pull request Nov 18, 2024

Remove ignored vulnerability in pip-audit pre-commit hook #380

Open

jsf9k and others added 2 commits November 20, 2024 12:21

Add comments about looming EOL issues for ansible and ansible-core

bd85261

This adds even more evidence for why it is a good idea to go ahead and upgrade ansible and ansible-core, in addition to the vulnerability that pip-audit turned up. Co-authored-by: Nick M <[email protected]>

Add comments about looming EOL issues for ansible and ansible-core

d077b67

This adds even more evidence for why it is a good idea to go ahead and upgrade ansible and ansible-core, in addition to the vulnerability that pip-audit turned up. Co-authored-by: Nick M <[email protected]>

jsf9k requested a review from mcdonnnj November 20, 2024 17:50

jsf9k added 2 commits November 20, 2024 17:52

Merge pull request #196 from cisagov/improvement/add-a-lower-bound-pi…

f7ccd9a

…n-for-ansible-core Bump up the lower bound on `ansible-core`

Merge pull request #197 from cisagov/improvement/upgrade-ansible-lint…

a794735

…-pre-commit-hook-version Update the version of the `ansible-lint` `pre-commit` hook

dav3r approved these changes Nov 20, 2024

View reviewed changes

Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

9978de5

dav3r approved these changes Nov 20, 2024

View reviewed changes

mcdonnnj mentioned this pull request Dec 9, 2024

Update the ansible version pin #372

Closed

6 tasks

jsf9k mentioned this pull request Dec 9, 2024

Use the same version of Bandit throughout the pre-commit config file #375

Closed

6 tasks

mcdonnnj approved these changes Dec 9, 2024

View reviewed changes

github-merge-queue bot closed this pull request by merging all changes into develop in 6cefb69 Dec 10, 2024

jsf9k deleted the lineage/skeleton branch December 10, 2024 14:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Sep 25, 2024 •

edited by jsf9k

Loading

jsf9k commented Nov 7, 2024

jsf9k commented Nov 8, 2024 •

edited

Loading

jsf9k commented Nov 14, 2024 •

edited

Loading

jsf9k commented Nov 20, 2024

jsf9k commented Dec 7, 2024

jsf9k commented Dec 9, 2024

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

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

Conversation

cisagovbot commented Sep 25, 2024 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

jsf9k commented Nov 7, 2024

jsf9k commented Nov 8, 2024 • edited Loading

jsf9k commented Nov 14, 2024 • edited Loading

jsf9k commented Nov 20, 2024

jsf9k commented Dec 7, 2024

jsf9k commented Dec 9, 2024

cisagovbot commented Sep 25, 2024 •

edited by jsf9k

Loading

jsf9k commented Nov 8, 2024 •

edited

Loading

jsf9k commented Nov 14, 2024 •

edited

Loading