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

cisagovbot · 2021-07-22T20:35:11Z

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-docker.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/vdp-scanner-docker.git vdp-scanner-docker
cd vdp-scanner-docker
git remote add skeleton https://github.com/cisagov/skeleton-docker.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 checkout --ours -- .github/lineage.yml
git add .github/lineage.yml
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.
Check the "Everything is cool" checkbox below:
- ✌️ The conflicts in this pull request have been resolved.
Mark this draft pull request "Ready for review".

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

Add rules to enforce ATX-closed headers, dashes for unordered list elements, and `1.` for ordered list elements.

Add <h1> and <img> tags to the allowed list for MD033 (HTML elements) to support using an image as the first thing in a markdown file (header image).

This converts the existing `.mdl_config.json` file to an equivalent `.mdl_config.yaml` file. The reference in the markdownlint pre-commit hook configuration is updated to match. Co-authored-by: Shane Frasier <[email protected]>

Now that this is a YAML file we can add comments explaining the rule modifications we use. This will make it easier to edit or expand in the future.

This hook will validate any pre-commit hook manifest files in the repository.

We should be doing this because the Packer and Terraform pre-commit hooks leverage the corresponding executables; therefore, it makes sense to go ahead and install the particular versions of those executables that we support. Also add support for optionally debugging via tmate. See also cisagov/skeleton-generic#74.

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

There is no reason to create /usr/bin/terraform. This is a vestige of an earlier age. Co-authored-by: Nick M. <[email protected]>

The Terraform installation does not destroy the existing system Terraform installation, and neither should the Packer installation. Co-authored-by: Nick M. <[email protected]>

Note that this change is dependent on the merging of cisagov/setup-env-github-action#31. Co-authored-by: Nick M. <[email protected]>

Some variables defined in the go installation are used in the cache task, so the go installation must happen first. Co-authored-by: Nick M. <[email protected]>

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

As of [Go 1.16](https://tip.golang.org/doc/go1.16#go-command) the `GO111MODULE` environment variable defaults to `on` and `go get` has been deprecated for module installation. Co-authored-by: Nick M. <[email protected]>

The `shfmt` tool does not ship on the GitHub Actions runners so we must install it manually.

We have had a difficult time with how beautysh parses some shellscripts. I went in pursuit of an alternative and I believe shfmt to be a good alternative. Co-authored-by: Shane Frasier <[email protected]>

This is performed by running `pre-commit autoupdate`, but with the `ansible-lint` hook held back manually.

Update pre-commit Hooks

Add the validate_manifest Hook to pre-commit Configuration

…ting

Update markdownlint Configuration

…_shfmt Replace beautysh hook with cisagov/pre-commit-shfmt

Update to reflect the new pre-commit configuration.

⚠️ CONFLICT! Lineage pull request for: skeleton

…tion

…onfiguration Standardize the Layout of the Lineage Configuration File

Update the Pin for actions/github-script to v4

Use preferred capitalization for Docker and Docker Hub

dav3r

LGTM! 👍

mcdonnnj and others added 30 commits June 7, 2021 08:26

Standardize the layout of the Lineage configuration file

ca4306a

Add style enforcement rules

1e8f822

Add rules to enforce ATX-closed headers, dashes for unordered list elements, and `1.` for ordered list elements.

Add rule for image headers

afc6bd6

Add <h1> and <img> tags to the allowed list for MD033 (HTML elements) to support using an image as the first thing in a markdown file (header image).

Bump actions/github-script pin from v3 to v4

33a28ee

Switch to a YAML markdownlint configuration file

ce173f4

This converts the existing `.mdl_config.json` file to an equivalent `.mdl_config.yaml` file. The reference in the markdownlint pre-commit hook configuration is updated to match. Co-authored-by: Shane Frasier <[email protected]>

Add comments to markdownlint configuration

f2a4230

Now that this is a YAML file we can add comments explaining the rule modifications we use. This will make it easier to edit or expand in the future.

Add the validate_manifest hook from pre-commit

d4781ee

This hook will validate any pre-commit hook manifest files in the repository.

Break out the curl cache creation into its own step

c481043

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

Remove unnecessary line in tasks

70414cf

There is no reason to create /usr/bin/terraform. This is a vestige of an earlier age. Co-authored-by: Nick M. <[email protected]>

Modify the Packer installation to model that of Terraform

b629f7f

The Terraform installation does not destroy the existing system Terraform installation, and neither should the Packer installation. Co-authored-by: Nick M. <[email protected]>

Install a specific version of terraform-docs

181d1b2

Note that this change is dependent on the merging of cisagov/setup-env-github-action#31. Co-authored-by: Nick M. <[email protected]>

Move go installation so that it takes place before the cache task

bb6e566

Some variables defined in the go installation are used in the cache task, so the go installation must happen first. Co-authored-by: Nick M. <[email protected]>

Capitalize Go for consistency

337d1ef

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

Prefer the newer "go install" syntax

8ee2116

As of [Go 1.16](https://tip.golang.org/doc/go1.16#go-command) the `GO111MODULE` environment variable defaults to `on` and `go get` has been deprecated for module installation. Co-authored-by: Nick M. <[email protected]>

Install the shfmt tool for GHA

e2a729d

The `shfmt` tool does not ship on the GitHub Actions runners so we must install it manually.

Replace the beautysh hook with pre-commit-shfmt

406b688

We have had a difficult time with how beautysh parses some shellscripts. I went in pursuit of an alternative and I believe shfmt to be a good alternative. Co-authored-by: Shane Frasier <[email protected]>

Apply changes from the shfmt pre-commit hook

2b48e75

Use preferred capitalization for Docker Hub

4d37dfb

Satisfy linter by shortening a long line

eede87c

Use preferred capitalization for Docker Hub

408969a

Capitalize Docker in README

51076ed

Fix additional Docker and Docker Hub capitalizations

440753c

Update pre-commit hooks

1708b5c

This is performed by running `pre-commit autoupdate`, but with the `ansible-lint` hook held back manually.

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

d7dcfee

Update pre-commit Hooks

Merge branch 'develop' into improvement/add_pre-commit_hook

c17800a

Merge pull request #80 from cisagov/improvement/add_pre-commit_hook

41a5286

Add the validate_manifest Hook to pre-commit Configuration

Merge branch 'develop' into improvement/update_mdl_configuration

e607360

Merge branch 'develop' into improvement/install-tf-and-packer-for-lin…

f6ad0e9

…ting

Merge pull request #79 from cisagov/improvement/update_mdl_configuration

382c39c

Update markdownlint Configuration

mcdonnnj added 9 commits July 19, 2021 13:21

Merge pull request #84 from cisagov/improvement/replace_beautysh_with…

81cdb4d

…_shfmt Replace beautysh hook with cisagov/pre-commit-shfmt

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

a5e938a

Satisfy pre-commit hooks

6ad71a8

Update to reflect the new pre-commit configuration.

Merge pull request #66 from cisagov/lineage/skeleton

78450f5

⚠️ CONFLICT! Lineage pull request for: skeleton

Merge branch 'develop' into improvement/standardize_lineage_configura…

22951ea

…tion

Merge pull request #60 from cisagov/improvement/standardize_lineage_c…

0f98fd6

…onfiguration Standardize the Layout of the Lineage Configuration File

Merge branch 'develop' into update/bump_github-script_to_v4

fa87fbb

Merge pull request #63 from cisagov/update/bump_github-script_to_v4

d10c669

Update the Pin for actions/github-script to v4

Merge branch 'develop' into dav3r-patch-1

9c8bc18

cisagovbot assigned dav3r, felddy, jsf9k and mcdonnnj Jul 22, 2021

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

mcdonnnj unassigned felddy, jsf9k and dav3r Jul 22, 2021

Merge github.com:cisagov/skeleton-docker into lineage/skeleton

6560cb9

mcdonnnj force-pushed the lineage/skeleton branch from 10284e0 to 6560cb9 Compare July 23, 2021 07:27

mcdonnnj marked this pull request as ready for review July 23, 2021 14:40

mcdonnnj requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners July 23, 2021 14:40

jsf9k approved these changes Jul 23, 2021

View reviewed changes

Merge pull request #65 from cisagov/dav3r-patch-1

c6aa7f0

Use preferred capitalization for Docker and Docker Hub

dav3r approved these changes Jul 23, 2021

View reviewed changes

Merge github.com:cisagov/skeleton-docker into lineage/skeleton

5c24a6d

mcdonnnj merged commit 54da2c5 into develop Jul 23, 2021

mcdonnnj deleted the lineage/skeleton branch July 23, 2021 15:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jul 22, 2021 •

edited by mcdonnnj

Loading

dav3r left a comment

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

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

Conversation

cisagovbot commented Jul 22, 2021 • edited by mcdonnnj Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

dav3r left a comment

Choose a reason for hiding this comment

cisagovbot commented Jul 22, 2021 •

edited by mcdonnnj

Loading