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

cisagovbot · 2023-05-22T03:26:55Z

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-packer.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 git@github.com:cisagov/nessus-packer.git nessus-packer
cd nessus-packer
git remote add skeleton https://github.com/cisagov/skeleton-packer.git
git remote set-url --push skeleton no_push
git switch develop
git checkout -b 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 .github/dependabot.yml src/aws.yml src/example.yml src/requirements.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

Remove any of the following that do not apply. If you're unsure about
any of these, don't hesitate to ask. We're here to help!

✌️ The conflicts in this pull request have been resolved.
All relevant type-of-change labels have been added.
All new and existing tests pass.

✅ Pre-merge checklist

Remove any of the following that do not apply. These boxes should
remain unchecked until the pull request has been approved.

Bump major, minor, patch, or pre-release version as
appropriate
via the bump_version.sh script if this repository is
versioned and the changes in this PR warrant a version
bump.
Finalize version.

✅ Post-merge checklist

Remove any of the following that do not apply.

Create a release.

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

The former is more flexible, as described in cisagov/skeleton-packer#198.

Co-authored-by: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>

If pip is installed first, then the OS _could_ pull different Python packages than what would be installed via the cisagov/ansible-role-python role; hence, the new ordering is more controlled. Co-authored-by: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

Add comments attributing two ignore directives with this repository. Add a new, commented out ignore directive for github-actions for a dependency that should be managed in this repository.

@jasonodoom

Add @jasonodoom as a default codeowner

This is the latest minor release of Python so it makes sense to use it as the default for this job.

…n_for_lint_job Use Python 3.11 for the `lint` job in the `build` workflow

This is done automatically with the `pre-commit autoupdate` command. However the `ansible-lint` hook is manually kept back as we have not tested functionality to confirm that our roles will generally pass with the new version.

Update `pre-commit` hooks

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

…s/setup-go-4 Bump actions/setup-go from 3 to 4

When wheel gets installed alongside other packages, it may not get used when those other packages are installed. When that happens I see warnings like this: DEPRECATION: ansible-core is being installed using the legacy 'setup.py install' method, because it does not have a 'pyproject.toml' and the 'wheel' package is not installed. pip 23.1 will enforce this behaviour change. A possible replacement is to enable the '--use-pep517' option. Discussion can be found at pypa/pip#8559 This change should get rid of these warnings. Nota bene: This is the practice we follow in the Dockerfile in cisagov/skeleton-docker, but for some reason we never started using it in our workflows.

…nd-wheel-with-pip Install/upgrade setuptools and wheel when upgrading pip

⚠️ CONFLICT! Lineage pull request for: skeleton

…nore_directives Update the dependabot ignore configuration

…to-roles-block Prefer ansible.builtin.include_role to a roles block

.github/dependabot.yml

jsf9k · 2023-05-22T19:39:35Z

I would say that this change requires a version bump, since although the code hasn't functionally changed it has changed. What do you say, @mcdonnnj?

.github/dependabot.yml

jsf9k · 2023-05-22T20:06:59Z

I would say that this change requires a version bump, since although the code hasn't functionally changed it has changed. What do you say, @mcdonnnj?

@jmorrowomni, please see here, which also applies to this PR.

jsf9k

You need to update nessus.yml to use ansible.builtin.include_role.

jmorrowomni · 2023-05-26T16:53:28Z

You need to update nessus.yml to use ansible.builtin.include_role.

@jsf9k Code updated in 4836612. Release will be available whenever GitHub decides it likes me enough to let me create one

jsf9k · 2023-05-26T16:55:25Z

You need to update nessus.yml to use ansible.builtin.include_role.

@jsf9k Code updated in 4836612. Release will be available whenever GitHub decides it likes me enough to let me create one

Excellent! Now we have an example to send along to GitHub support. I'll do that now.

jsf9k · 2023-05-31T13:51:35Z

@jmorrowomni, after you create a pre-release or release the code in terraform-post-packer must be run for the new AMI to be made available to COOL staging or production, respectively. I took care of it for this repository, but in the future you should make sure to ask someone in @cisagov/team-ois to do this for you for any *-packer repo PRs where a pre-release or release is created.

jmorrowomni · 2023-05-31T13:56:57Z

@jmorrowomni, after you create a pre-release or release the code in terraform-post-packer must be run for the new AMI to be made available to COOL staging or production, respectively. I took care of it for this repository, but in the future you should make sure to ask someone in @cisagov/team-ois to do this for you for any *-packer repo PRs where a pre-release or release is created.

Understood, will do going forward

jsf9k and others added 20 commits February 27, 2023 10:54

Prefer ansible.builtin.include_role to a roles block

9993a8c

The former is more flexible, as described in cisagov/skeleton-packer#198.

Alphabetize attributes

80d6039

Fix misleading task name

ff2984a

Co-authored-by: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>

Add a comment explaining why Python is installed before pip

45ea09c

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

Update the dependabot ignore configuration

bec8606

Add comments attributing two ignore directives with this repository. Add a new, commented out ignore directive for github-actions for a dependency that should be managed in this repository.

Add @jasonodoom as a default codeowner

744f07e

Merge pull request #128 from cisagov/add-odoom-to-default-codeowners

3eed760

Add @jasonodoom as a default codeowner

Use Python 3.11 for the lint job in the build workflow

8d39c8b

This is the latest minor release of Python so it makes sense to use it as the default for this job.

Merge pull request #130 from cisagov/improvement/update_python_versio…

5f4b768

…n_for_lint_job Use Python 3.11 for the `lint` job in the `build` workflow

Update pre-commit hook versions

db5e7ff

This is done automatically with the `pre-commit autoupdate` command. However the `ansible-lint` hook is manually kept back as we have not tested functionality to confirm that our roles will generally pass with the new version.

Merge pull request #129 from cisagov/maintenance/update_pre-commit_hooks

c9028cf

Update `pre-commit` hooks

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

847cd13

…s/setup-go-4 Bump actions/setup-go from 3 to 4

Merge pull request #126 from cisagov/improvement/install-setuptools-a…

7250368

…nd-wheel-with-pip Install/upgrade setuptools and wheel when upgrading pip

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

e57185b

Merge pull request #231 from cisagov/lineage/skeleton

baed0ba

⚠️ CONFLICT! Lineage pull request for: skeleton

Merge pull request #230 from cisagov/improvement/update_dependabot_ig…

b3e0906

…nore_directives Update the dependabot ignore configuration

Merge pull request #226 from cisagov/improvement/prefer-include-role-…

cd3a3bf

…to-roles-block Prefer ansible.builtin.include_role to a roles block

cisagovbot assigned dav3r, jsf9k and mcdonnnj May 22, 2023

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label May 22, 2023

jmorrowomni requested a review from dv4harr10 May 22, 2023 19:00

jmorrowomni assigned jmorrowomni and unassigned jsf9k and dav3r May 22, 2023

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

9e0fd70

jmorrowomni force-pushed the lineage/skeleton branch from e44b035 to 9e0fd70 Compare May 22, 2023 19:07

Replace missing requirement

7c6e850

jmorrowomni marked this pull request as ready for review May 22, 2023 19:29

jmorrowomni requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners May 22, 2023 19:29

jsf9k requested changes May 22, 2023

View reviewed changes

.github/dependabot.yml Show resolved Hide resolved

.github/dependabot.yml Show resolved Hide resolved

jsf9k requested changes May 22, 2023

View reviewed changes

.github/dependabot.yml Outdated Show resolved Hide resolved

.github/dependabot.yml Outdated Show resolved Hide resolved

jmorrowomni added 3 commits May 25, 2023 08:54

Move comments to match skeleton formatting

8a5f82c

Bump version from 0.1.6 to 0.1.7

49da055

Bump version from 0.1.7 to 0.1.7-rc.1

a17e6c8

dav3r approved these changes May 25, 2023

View reviewed changes

jsf9k approved these changes May 25, 2023

View reviewed changes

jsf9k requested changes May 25, 2023

View reviewed changes

jmorrowomni added 2 commits May 26, 2023 11:48

Update Nessus playbook to use ansible.builtin.include_role

4836612

Bump version from 0.1.7-rc.1 to 0.1.7-rc.2

8f28daf

jsf9k approved these changes May 30, 2023

View reviewed changes

Finalize version from 0.1.7-rc.2 to 0.1.7

918c6cd

dv4harr10 approved these changes May 30, 2023

View reviewed changes

jmorrowomni merged commit 2c41b30 into develop May 31, 2023
6 checks passed

jmorrowomni deleted the lineage/skeleton branch May 31, 2023 11:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented May 22, 2023 •

edited by jmorrowomni

Loading

jsf9k commented May 22, 2023

jsf9k commented May 22, 2023

jsf9k left a comment

jmorrowomni commented May 26, 2023

jsf9k commented May 26, 2023

jsf9k commented May 31, 2023

jmorrowomni commented May 31, 2023

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

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

Conversation

cisagovbot commented May 22, 2023 • edited by jmorrowomni Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

✅ Pre-merge checklist

✅ Post-merge checklist

jsf9k commented May 22, 2023

jsf9k commented May 22, 2023

jsf9k left a comment

Choose a reason for hiding this comment

jmorrowomni commented May 26, 2023

jsf9k commented May 26, 2023

jsf9k commented May 31, 2023

jmorrowomni commented May 31, 2023

cisagovbot commented May 22, 2023 •

edited by jmorrowomni

Loading