-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
Add protocol_version to lb target groups #16132
Add protocol_version to lb target groups #16132
Conversation
Thank you for your contribution! 🚀 Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the Additional details:
|
name = "%s" | ||
port = 80 | ||
protocol = "HTTP" | ||
protocol_version = "GRPC" | ||
vpc_id = aws_vpc.test2.id |
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.
I bet the terrafmt
error is due to the spacing here (the =
signs aren't all in line).
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.
Looks like that is correct I fixed it.
tools/go.mod
Outdated
@@ -7,6 +7,7 @@ require ( | |||
github.com/client9/misspell v0.3.4 | |||
github.com/golangci/golangci-lint v1.32.2 | |||
github.com/katbyte/terrafmt v0.2.1-0.20200913185704-5ff4421407b4 | |||
github.com/pavius/impi v0.0.3 // indirect |
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.
Whether this came in by accident or from the merge, it seems worth rebasing and taking this out.
I can help you with how to rebase if you want a second pair of eyes!
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.
I think all of go.mod files were mistakes. At the time it was required because I needed the latest aws-go lib. I attempted to revert it but I don't know if I did it correctly. If it isn't I would welcome some help.
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.
Hmm, you've built a little merge-history puzzle!
Using an alias I have defined:
% git la -8
* 6bd6a2037 <Mike> (HEAD, fivehole/f-lb-target-group-protocol-version) Merge branch 'f-lb-target-group-protocol-version' of https://github.com/fivehole68/terraform-provider-aws into f-lb-target-group-protocol-version [ae448c373 b5065c049]
|\
| * b5065c049 <Mike> fix terrafmt errors [e93c7ae6b]
| * e93c7ae6b <fivehole68> Merge branch 'master' into f-lb-target-group-protocol-version [c76539c8c f66074baa]
| |\
| * | c76539c8c <Mike> Remove comment [484151258]
| * | 484151258 <Mike> Add support for protocol version to target groups [b1d2e1dbc]
* | | ae448c373 <Mike> Revert go files [74d6b7c9d]
* | | 74d6b7c9d <Mike> Add support for protocol version to target groups [f66074baa]
| |/
|/|
* | f66074baa <Dirk Avery> Update CHANGELOG.md [2713c9186]
I know I mentioned rebasing, but probably the easier next step is to just merge the latest master into your branch, and then overwrite a couple lingering go.mod and go.sum files.
Something like this might do the trick:
# look at your branch
git checkout f-lb-target-group-protocol-version
git log --decorate --graph --oneline -10
git diff --stat hashicorp/master f-lb-target-group-protocol-version
# fetch and merge in the latest upstream
git remote -v # below I assume Hashicorp's remote is named hashicorp
git fetch hashicorp
git merge hashicorp/master
# look at your branch again
git log --decorate --graph --oneline -10
git diff --stat hashicorp/master f-lb-target-group-protocol-version
# use checkout to overwrite a couple unintentional differences
git checkout hashicorp/master tools/go.mod
git checkout hashicorp/master tools/go.sum
git commit -am "Fix dep file merge issues"
...
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.
Looks like that worked. Thanks
An idle thought: can you rename this pull request? I assume the "f" stands for your name? I am not expert in the code being modified, but this handles a lot more of the I like this pull request a lot! 😺 |
Remove comment fix terrafmt errors
…om/fivehole68/terraform-provider-aws into f-lb-target-group-protocol-version
…p-protocol-version
If you allow me, one advice that I could give to you is use Hope this could be merge soon 🚀 |
The maintainers could also just do a squish merge to clean it all up in a click: what do they prefer? |
Is there anything else that is waiting on me to get this merged? |
I've posted a comment here about this too hoping to get someone's attention: |
Hi, is there any update on this PR when this is going to get merge. |
@breathingdust ☝️ Can we have someone from Hashicorp to review this PR? Thanks! |
Hi all 👋, just a quick update that this is in the queue for review and inclusion. Shouldn't be too much longer, we appreciate your patience! |
Hi @fivehole68! Thank you for getting this enhancement together. I did some work on rebasing and making a few changes. Since I wasn't able to push to your branch, I opened a new PR (#17534). It still includes your commits, but will make it easier get it merged quickly. I'm going to close this PR so we can track things in the new one. |
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks! |
Community Note
Relates OR Closes #15929
Release note for CHANGELOG:
Output from acceptance testing: