Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial Integration of skeleton-generic #302

Merged
merged 164 commits into from
Dec 18, 2020
Merged

Conversation

mcdonnnj
Copy link
Member

@mcdonnnj mcdonnnj commented Dec 17, 2020

🗣 Description

This PR is an initial integration of cisagov/skeleton-generic.

💭 Motivation and Context

I'm moving forward with working on #301 , and this gets the framework for everything in place to work on passing each pre-commit hook group and merging those in their own PRs.

🧪 Testing

The GitHub Actions workflow is passing with the pared down pre-commit configuration to align with the progress made in #295 .

✅ Checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.

jsf9k and others added 30 commits March 11, 2019 08:52
Rename repo to skeleton-generic
In particular, mention pyenv-installer.
They are not needed there.

Also run pre-commit autoupdate to pick up the latest version of hooks.
…_docker_compose

Add pre-commit hook for docker-compose linting
Also ran pre-commit autoupdate, which picked up a newer version of the
pyupgrade hook.
This is a warning about line breaks before binary operators.  It no
longer agrees with PEP8.  See, for example, here:
psf/black#21.

Guido agrees here:
python/peps@c59c437.
Also add flake8-docstrings as an additional dependency in the
.pre-commit-config.yml file.
Also update the URL for black since it moved GitHub orgs from ambv to
python.
…ss_yamllint

Make .bandit.yml pass yamllint
This should speed up TravisCI builds.
Add changes from running pre-commit autoupdate
jsf9k and others added 11 commits November 10, 2020 22:22
There is no need to run python code to determine the python version.
Resolves #58.

See here for details:
https://github.com/actions/setup-python/blob/main/action.yml#L14-L16
Group related pre-commit hooks together. Make sure that hooks are
alphabetically sorted within those groups.
…gihub-dir

Ensure that the cisagov devs are the owners of the .github directory
…re-simply

Use the python version output by actions/setup-python
Removed name because it was not more informative than the default. Swapped out
a hardcoded job reference for the github.job context value. Switch the base
cache key to a step environment value so we can set it once and reuse. Removed
additional restore-key value that might have undesirable results.
Comment out all hooks that haven't been run and resolved yet. This leaves only
the hooks used in #295 enabled for now.
@mcdonnnj mcdonnnj added the improvement This issue or pull request will add or improve functionality, maintainability, or ease of use label Dec 17, 2020
@mcdonnnj mcdonnnj self-assigned this Dec 17, 2020
Copy link
Member

@jsf9k jsf9k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me! Thanks for dragging this 900 pound gorilla into the light!

I had one question, but I am happy to approve this no matter the answer.

*.tfvars
*.dyn.tf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need the *.dyn.tf line for the code generated in the terraform/dyn_* directories? I'm not sure, so I'm asking.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's a good question. We probably do and I just got overzealous with .gitignore cleaning.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have restored that pattern in 22c028b

I was overzealous and removed the *.dyn.tf pattern from this repository's
.gitignore file. Since our Terraform configuration uses modules, this is still
a necessary pattern.
Copy link
Contributor

@hillaryj hillaryj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💀

@mcdonnnj mcdonnnj merged commit 2ad5948 into develop Dec 18, 2020
@mcdonnnj mcdonnnj deleted the initial_skeletonization branch December 18, 2020 15:56
@mcdonnnj mcdonnnj linked an issue Feb 11, 2022 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement This issue or pull request will add or improve functionality, maintainability, or ease of use
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integrate skeleton-generic at a Minimum
5 participants