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

cisagovbot · 2024-05-01T08:32:59Z

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-users-non-admin.git cool-users-non-admin
cd cool-users-non-admin
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 examples/basic_usage/README.md examples/basic_usage/outputs.tf examples/basic_usage/variables.tf examples/basic_usage/versions.tf examples/basic_usage/vpc.tf main.tf outputs.tf variables.tf versions.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

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.

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] <[email protected]>

Also add a runner hardening task to the labeler job.

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

…up-env files Co-authored-by: Nick <[email protected]>

@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 <[email protected]>

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] <[email protected]>

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.

We also symlink the .terrafrom-docs.yml file from the root of the repo.

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] <[email protected]>

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] <[email protected]>

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 <[email protected]>

Co-authored-by: Shane Frasier <[email protected]>

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 <[email protected]>

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

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

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 <[email protected]>

Co-authored-by: Shane Frasier <[email protected]>

Add a key to support outputting ATX closed headers which is our preference. This is also required to make updating the README(s) more convenient. NOTE: This functionality is entirely dependent on the code in the `improvement/support_atx_closed_markdown_headers` branch of mcdonnnj/terraform-docs. There is a PR (745) to the original repository but it has not been merged. Please note that I'm not using auto-linking language to avoid inundating the PR with links due to this commit being re-used in all downstream repositories.

Lineage pull request for: skeleton

Alphabetize Terraform attributes

Add `terraform-docs` injection headers to example `README.md`

…e/skeleton

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 <[email protected]>

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

c356768

…up-env files Co-authored-by: Nick <[email protected]>

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.

Add terraform-docs injection headers to example README.md

6c39dcf

We also symlink the .terrafrom-docs.yml file from the root of the repo.

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 <[email protected]>

Remove unnecessary capitalizations and fix grammar

f5fa0ff

Co-authored-by: Shane Frasier <[email protected]>

Simplify steps in the build/install portion of workflow

36361dd

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

mcdonnnj added 4 commits April 29, 2024 16:18

Merge pull request #217 from cisagov/lineage/skeleton

74a335e

Lineage pull request for: skeleton

Merge pull request #216 from cisagov/improvement/alphabetize_attributes

f9ec86e

Alphabetize Terraform attributes

Merge pull request #195 from cisagov/documentation/add-injection-headers

f26dccd

Add `terraform-docs` injection headers to example `README.md`

cisagovbot assigned dav3r, felddy, jasonodoom, jsf9k and mcdonnnj May 1, 2024

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

jsf9k unassigned felddy, jasonodoom, dav3r and mcdonnnj May 6, 2024

jsf9k added the github-actions Pull requests that update GitHub Actions code label May 6, 2024

jsf9k added 2 commits May 6, 2024 16:11

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

f58d673

…e/skeleton

Alphabetize

df4671c

jsf9k force-pushed the lineage/skeleton branch from 210ae2c to df4671c Compare May 6, 2024 20:13

jsf9k marked this pull request as ready for review May 6, 2024 20:18

jsf9k requested review from dav3r, felddy, jasonodoom, jsf9k and mcdonnnj as code owners May 6, 2024 20:18

jsf9k enabled auto-merge May 6, 2024 20:19

jsf9k requested a review from a team May 6, 2024 20:19

dav3r approved these changes May 6, 2024

View reviewed changes

dv4harr10 approved these changes May 7, 2024

View reviewed changes

jsf9k merged commit 54f7c32 into develop May 7, 2024
5 checks passed

jsf9k deleted the lineage/skeleton branch May 7, 2024 13:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented May 1, 2024 •

edited by jsf9k

Loading

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

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

Conversation

cisagovbot commented May 1, 2024 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

cisagovbot commented May 1, 2024 •

edited by jsf9k

Loading