-
Notifications
You must be signed in to change notification settings - Fork 12
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
Update resource to require token for metric endpoint #52
Conversation
@ZacharyWills There are some merge conflicts with this currently. Would you mind rebasing and resubmitting after #54 can be merged, hopefully? |
@mwengren Give it another look and let me know if it's ready to merge. |
@ZacharyWills My preference would be to keep merge commits out of PRs, if possible. It will make for a cleaner project history. I think you could reapply your changes in the original three commits by running something like
from your feature branch to rewind and then reapply them from the head of the Then just do a force push to the same branch on your remote and it should clean things up a bit in this PR. I don't see any issues with the changes, but to be honest, I don't really have the bandwidth to test them so we'll have to test on the next time we redeploy. If @patrick-tripp or @jonmjoyce don't see any issues, we can merge this once you've updated the branch I think. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most of these changes are changes in spacing/formatting so it's difficult to see what the actual code changes were. But the few I found looked fine without testing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the two added lines in main.tf as discussed.
Updated as per requested changes in the PR.
Updated instance resource to add token requirements for AWS Instance.
in reference to issue #51