Support sockaddr templates in start/retry join #4102
Conversation
| // the result list will contain the input string as a single element with no | ||
| // error set. In contrast to expandAddrs, expandOptionalAddrs does not validate | ||
| // if the result contains valid addresses and returns a list of strings. | ||
| // However, if the expansion of the go-sockaddr template fails an error is set. |
There was a problem hiding this comment.
Can you explain why you don't want to validate? for example if the resolved template returns a unix socket address we should throw an error because that's not going to work for retry-join/retry-join-wan.
There was a problem hiding this comment.
This was from @dominik-lekse's original PR but I think the rationale is that in this case the RuntimeConfig members we are outputting to are []string not []net.Addr.
We could add the parsing here just to catch errors but on the basis that before this PR passing an invalid IP to these config params is not validated here in the builder it seems reasonable not to jump through that extra hoop.
Presumably the agent itself will error if the expanded (or just non-template) value provided was invalid just like it does before this PR.
There was a problem hiding this comment.
Did a quick test on master and looks like an invalid address in retry join gets all the way upto the join call in memberlist before it errors out. We can do better with this validation in the future though, agree with you on the rationale to leave it as is for this PR.
|
Thanks everyone involved for picking this feature up and including it in the next release. |
|
@dominik-lekse thanks for writing it! Sorry it ended up being a PR with my name on :( |
This supersedes #3865 from @dominik-lekse.
See the original for rationale and discussion. I had to rebase a lot of stuff from the original fork the PR was based on and ended up in a mess so I choose to start a new branch from fresh master and cherry-pick @dominik-lekse's commit into it.
In the process of adding tests, I found a couple of issues which are fixed here:
start_joinbut not instart_join_wan.make([]string, len(...))and then appending instead ofmake([]string, 0, len(...))