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

cisagovbot · 2024-03-07T23:23:34Z

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/openvpn-packer.git openvpn-packer
cd openvpn-packer
git remote add skeleton https://github.com/cisagov/skeleton-packer.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 src/example.yml src/packer.pkr.hcl src/playbook.yml src/version.txt 
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 future TODOs are captured in issues, which are referenced in code comments.
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.

✅ Pre-merge checklist

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.
Revert to using the default branch of cisagov/ansible-role-cdm-tanium-client once Use latest version of Tanium Client system packages and support Amazon Linux 2023 ansible-role-cdm-tanium-client#54 is merged.
Revert to using the default branch of cisagov/ansible-role-crowdstrike once Use the latest versions we have of the system packages ansible-role-crowdstrike#21 is merged.
Finalize version.

✅ Post-merge checklist

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

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] <support@github.com>

Also add a runner hardening task to the labeler job.

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

…up-env files Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

@mcdonnnj

@mcdonnnj correctly pointed out that other projects add their own configuration files that match, e.g., the /.*.yaml pattern. We want to ensure that we only own the linter configuration files from the skeleton. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 2 to 3. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](hashicorp/setup-terraform@v2...v3) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

We prefer block style to flow style for sequences and mappings in YAML.

We prefer to alphabetize mapping keys in YAML documents whenever possible.

This should improve compatibility with merge queues. We configure it to only trigger on the `checks_requested` type which is currently the only supported type for this trigger. If additional types are added in the future they should be added if appropriate.

This agrees with the changes in cisagov/skeleton-tf-module#188.

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v4...v5) --- 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>

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

This hook bundles the binaries for shfmt with a Python package which removes the need to manually install the tool for the hook to function.

The new pre-commit hook provides `shfmt` binaries so we no longer need to ensure it is installed.

Since shfmt now supports long command line options we should use them as that is our preference. The single quotes for the number of spaces to indent is changed to double quotes to align with our usual quotation style.

These options are baked into the functionality of the old hook but must be explicitly declared for the new hook.

This sets the default shell for any run steps in the build workflow to mirror our standard shellscript writing practices. In addition to enabling our standard options it will also enable errtrace and print any commands that are run which should make debugging/troubleshooting more straightforward.

This will run the Go tool `goimports` against the repository if it contains any Go files. This tool bundles the functionality of `go fmt` with the additional benefit of sorting Go imports much like the isort tool we use for Python code.

@mcdonnnj

This is a temporary fix until @mcdonnnj has his PR approved and merged into the terraform-docs repo. This fix will perform a shallow clone of his forked branch, build the binary, and install it.

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

Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

PATH is handled by `setup-go` so we can refactor the code setting it. Also we are taking advantage of the -C switch to handle building from the cloned repository. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

`TODO` was placed on the wrong comment block. Also I am adding a link to the issue for the TODO.

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

This commit is introducing 2 new flags into the setup-env script. -l or --list-versions will list available Python versions and allow the user to select a version interactively. The second flag -v or --version will allow a user to set the version if installed. (e.g. ./setup-env -v 3.9.6)

This makes the code a bit cleaner and still accomplishes the same functionality Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

ansible-core 2.16.3 and later suffer from the bug discussed in ansible/ansible#82702, which breaks any symlinked files in vars, tasks, etc. for any Ansible role installed via ansible-galaxy.

This issue reminds us to remove the pin against ansible-core when that becomes possible.

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

…um-client This change is being made for testing purposes, and this commit can be reverted or dropped once cisagov/ansible-role-cdm-tanium-client#54 has been merged.

This change is being made for testing purposes, and this commit can be reverted or dropped once cisagov/ansible-role-crowdstrike#21 has been merged.

…cdm-tanium-client" This reverts commit 7d83a0b. We can do this now that cisagov/ansible-role-cdm-tanium-client#54 has been merged.

…crowdstrike" This reverts commit d8f464d. We can do this now that cisagov/ansible-role-crowdstrike#21 has been merged.

jsf9k · 2024-03-19T22:02:29Z

I built a staging AMI with these changes, deployed it to our staging COOL environment, and verified that it functions as expected.

mcdonnnj

LGTM ✔

dependabot bot and others added 30 commits September 13, 2023 02:01

Add a diagnostics job for the label syncing workflow

371179e

Also add a runner hardening task to the labeler job.

Make the dev team the owners of the linter configuration files

1f611fc

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

Make dev team members the codeowners of the requirements*.txt and set…

c356768

…up-env files Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Prefer block style to flow style

9f31700

We prefer block style to flow style for sequences and mappings in YAML.

Alphabetize entries in the build workflow

696433a

We prefer to alphabetize mapping keys in YAML documents whenever possible.

Bump the AWS Terraform provider version to 4.9

5e600a0

This agrees with the changes in cisagov/skeleton-tf-module#188.

Switch pre-commit hooks for running shfmt

4a63dbe

This hook bundles the binaries for shfmt with a Python package which removes the need to manually install the tool for the hook to function.

Remove installation of shfmt in the build workflow

3236b1b

The new pre-commit hook provides `shfmt` binaries so we no longer need to ensure it is installed.

Use long options for shfmt arguments

5ddb14d

Since shfmt now supports long command line options we should use them as that is our preference. The single quotes for the number of spaces to indent is changed to double quotes to align with our usual quotation style.

Add additional shfmt options

8ecd957

These options are baked into the functionality of the old hook but must be explicitly declared for the new hook.

Add ATX Header Support for terraform-docs

f6d9d6e

This is a temporary fix until @mcdonnnj has his PR approved and merged into the terraform-docs repo. This fix will perform a shallow clone of his forked branch, build the binary, and install it.

Add prepended names to variables to describe their function

544e478

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

Remove unnecessary capitalizations and fix grammar

f5fa0ff

Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

Add TODO label

3711ebe

Move TODO and add link to the issue

d114fb4

`TODO` was placed on the wrong comment block. Also I am adding a link to the issue for the TODO.

Alphabetize switches

c907cfc

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

Add /dev/null and remove TMPFILE

c10929a

This makes the code a bit cleaner and still accomplishes the same functionality Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

Place flags in the correct order for -r and -p

adada40

Remove unneccessary spacing

1861b9b

Alphabetize flags and descriptions

3f623e4

Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

jsf9k added github-actions Pull requests that update GitHub Actions code packer Pull requests that update Packer code ansible Pull requests that update Ansible code labels Mar 11, 2024

jsf9k and others added 4 commits March 13, 2024 14:13

Pin ansible-core to earlier than 2.16.3

2c72ea2

ansible-core 2.16.3 and later suffer from the bug discussed in ansible/ansible#82702, which breaks any symlinked files in vars, tasks, etc. for any Ansible role installed via ansible-galaxy.

Include a reference to cisagov/skeleton-packer#312

b310cba

This issue reminds us to remove the pin against ansible-core when that becomes possible.

Mention the related issue cisagov/skeleton-ansible-role#178

227ea44

Remove duplicate octothorpe

d248f45

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

jsf9k force-pushed the lineage/skeleton branch from 7dbcaab to d248f45 Compare March 13, 2024 18:14

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

5fa976d

jsf9k mentioned this pull request Mar 15, 2024

Use latest version of Tanium Client system packages and support Amazon Linux 2023 cisagov/ansible-role-cdm-tanium-client#54

Merged

7 tasks

Temporarily use a non-default branch of cisagov/ansible-role-cdm-tani…

7d83a0b

…um-client This change is being made for testing purposes, and this commit can be reverted or dropped once cisagov/ansible-role-cdm-tanium-client#54 has been merged.

jsf9k removed the blocked This issue or pull request is awaiting the outcome of another issue or pull request label Mar 15, 2024

dav3r approved these changes Mar 19, 2024

View reviewed changes

jsf9k added 3 commits March 19, 2024 11:55

Temporarily use a non-default branch of cisagov/ansible-role-crowdstrike

d8f464d

This change is being made for testing purposes, and this commit can be reverted or dropped once cisagov/ansible-role-crowdstrike#21 has been merged.

Revert "Temporarily use a non-default branch of cisagov/ansible-role-…

526cef9

…cdm-tanium-client" This reverts commit 7d83a0b. We can do this now that cisagov/ansible-role-cdm-tanium-client#54 has been merged.

Revert "Temporarily use a non-default branch of cisagov/ansible-role-…

95bafb1

…crowdstrike" This reverts commit d8f464d. We can do this now that cisagov/ansible-role-crowdstrike#21 has been merged.

jsf9k marked this pull request as ready for review March 19, 2024 22:02

jsf9k requested review from felddy, jasonodoom, jsf9k and mcdonnnj as code owners March 19, 2024 22:02

jsf9k requested a review from a team March 19, 2024 22:02

mcdonnnj approved these changes Mar 20, 2024

View reviewed changes

jsf9k approved these changes Mar 20, 2024

View reviewed changes

Finalize version from 0.4.0-rc.1 to 0.4.0

ab8d308

jsf9k enabled auto-merge March 20, 2024 14:27

jsf9k merged commit 74b76d2 into develop Mar 20, 2024
8 of 9 checks passed

jsf9k deleted the lineage/skeleton branch March 20, 2024 14:43

jsf9k mentioned this pull request Mar 20, 2024

Fix Bookworm DHCP search domain issue cisagov/openvpn-server-tf-module#96

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Mar 7, 2024 •

edited by jsf9k

Loading

jsf9k commented Mar 19, 2024

mcdonnnj left a comment

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

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

Conversation

cisagovbot commented Mar 7, 2024 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

✅ Pre-merge checklist

✅ Post-merge checklist

jsf9k commented Mar 19, 2024

mcdonnnj left a comment

Choose a reason for hiding this comment

cisagovbot commented Mar 7, 2024 •

edited by jsf9k

Loading