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

Update resource to require token for metric endpoint #52

Merged
merged 7 commits into from
Jul 10, 2023

Conversation

ZacharyWills
Copy link
Contributor

@ZacharyWills ZacharyWills commented May 30, 2023

Updated instance resource to add token requirements for AWS Instance.

in reference to issue #51

@mwengren
Copy link
Member

mwengren commented Jun 7, 2023

@ZacharyWills There are some merge conflicts with this currently. Would you mind rebasing and resubmitting after #54 can be merged, hopefully?

@ZacharyWills
Copy link
Contributor Author

@mwengren Give it another look and let me know if it's ready to merge.

@mwengren
Copy link
Member

mwengren commented Jul 6, 2023

@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

git rebase -i main

from your feature branch to rewind and then reapply them from the head of the main branch. You might even be able to skip the -i flag in this case and apply them directly without editing the commit history interactively.

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.

Copy link
Member

@jonmjoyce jonmjoyce left a 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.

terraform/main.tf Show resolved Hide resolved
@patrick-tripp patrick-tripp self-requested a review July 7, 2023 18:10
Copy link
Member

@patrick-tripp patrick-tripp left a 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.
@patrick-tripp patrick-tripp merged commit 93a033e into ioos:main Jul 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants