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

Pull in Upstream Changes #16

Merged
merged 28 commits into from
Apr 7, 2020
Merged

Pull in Upstream Changes #16

merged 28 commits into from
Apr 7, 2020

Conversation

mcdonnnj
Copy link
Member

@mcdonnnj mcdonnnj commented Mar 31, 2020

🗣 Description

This PR pulls in the changes in cisagov/skeleton-generic#40 (and a bit more from before).

💭 Motivation and Context

Keep it up to date!

🧪 Testing

pre-commit runs without issue.

📷 Screenshots (if appropriate)

🚥 Types of Changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (causes existing functionality to change)

✅ Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

felddy and others added 13 commits February 20, 2020 22:14
This should resolve the issue seen when the Python version changes before there
is an update to .pre-commit-config.yml which results in pre-commit pointing to
a non-existent Python installation.
Incorporate the Python version into keys for pip and pre-commit caches.
…cks to environment variables declared before the job block.
Change Cache Paths to Environment Variables
…ame as long

as they are not nested in the same heading group.
Add markdownlint Configuration Option for MD024
  terraform_validate_no_variables was changed to terraform_validate in the
  following commit:
  antonbabenko/pre-commit-terraform@35e0356.
Ran pre-commit autoupdate.
Update pre-commit Hooks and Fix Broken Hook ID
@mcdonnnj mcdonnnj requested review from dav3r, felddy, jsf9k and a team as code owners March 31, 2020 19:56
@mcdonnnj mcdonnnj self-assigned this Mar 31, 2020
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

Fantastic!

Copy link
Member

@felddy felddy left a comment

Choose a reason for hiding this comment

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

🍪

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.

Very nice work, @mcdonnnj! I am following antonbabenko/pre-commit-terraform#100.

I made one suggestion, which you can take or leave.

main.tf Outdated
@@ -7,6 +7,11 @@
# The AWS account ID being used
data "aws_caller_identity" "current" {}

# Default provider information.
Copy link
Member

Choose a reason for hiding this comment

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

I suggest moving this provider block above the aws_caller_identity, or to a separate file called providers.tf. No big deal if you disagree.

Copy link
Member Author

Choose a reason for hiding this comment

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

Forgot to mention that I fixed this in 0176807 by moving it to providers.tf. Thanks for the feedback!

@jsf9k jsf9k added the bug This issue or pull request addresses broken functionality label Apr 2, 2020
…nto the

providers.tf per excellent feedback.
mcdonnnj added 9 commits April 2, 2020 11:25
… runs.

+Add directive to find and initialize Terraform directories.
-Removed directive that searched for Terraform directories.
`pre-commit-terraform` hook since the PR I submitted,
antonbabenko/pre-commit-terraform#100,
was approved. This will fix issues with `skeleton-tf-module` related to multiple
directories with Terraform code.
…hen the

failure is with setup rather than hooks running.
…lding.

Adjust description for pre-commit hook setup to better convey what is being
done.
…commit-terraform_hook

Update pre-commit Hooks to Include Bugfix
@mcdonnnj mcdonnnj requested review from felddy, jsf9k and dav3r April 7, 2020 18:12
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

It's still all good from me. 👍 Thanks for helping us get our Terraform house in order.

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.

Still looks good to me! Approved!

@mcdonnnj mcdonnnj merged commit 9746cdf into develop Apr 7, 2020
@mcdonnnj mcdonnnj deleted the improvements/upstream_updates branch April 7, 2020 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue or pull request addresses broken functionality
Projects
Development

Successfully merging this pull request may close these issues.

4 participants