feat: keys include host-port-suffix #1071
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Open
matt2e
commented
Mar 12, 2024
matt2e
commented
Mar 12, 2024
matt2e
commented
Mar 12, 2024
matt2e
commented
Mar 12, 2024
alecthomas
reviewed
Mar 12, 2024
| {key: NewRunnerKey("r-hostwithprefixandfakeport-80", "80"), strPrefix: "r-r-hostwithprefixandfakeport-80-80-", valuePrefix: "r-hostwithprefixandfakeport-80-80-"}, | ||
|
|
||
| // Local Keys | ||
| {key: NewLocalRunnerKey(0), str: "r-0000", value: "0000"}, |
matt2e
force-pushed
the
matt2e/controller-runner-id-generation
branch
from
8cc2153
to
84cf1cf
Compare
matt2e
force-pushed
the
matt2e/controller-runner-id-generation
branch
from
86d1201
to
72a150e
Compare
alecthomas
requested changes
Mar 13, 2024
internal/model/keys.go
Outdated
| if d.Hostname == "" { | ||
| return fmt.Sprintf("%s%04d", prefix, d.Suffix) | ||
| } | ||
| return fmt.Sprintf("%s%s-%s-%04d", prefix, d.Hostname, d.Port, d.Suffix) |
There was a problem hiding this comment.
Let's hex encode the suffix with %08x so it's consistent with DeploymentName.
internal/model/keys.go
Outdated
| func NewControllerKey() ControllerKey { return ControllerKey(ulid.Make()) } | ||
| func ParseControllerKey(key string) (ControllerKey, error) { return parseKey[ControllerKey](key) } | ||
| func NewControllerKey(hostname string, port string) ControllerKey { | ||
| suffix, err := rand.Int(rand.Reader, big.NewInt(10000)) |
There was a problem hiding this comment.
Let's use 4 bytes (4294967296) of randomness so it's more consistent with DeploymentName.
internal/model/keys.go
Outdated
| case len(components) == 1: | ||
| //style: [<kind>-]<suffix> | ||
|
|
||
| suffix, err := strconv.Atoi(components[len(components)-1]) |
There was a problem hiding this comment.
When you switch to hex encoding you can use strconv.ParseInt() with a base of 16 here.
|
@alecthomas i switched to 4 bytes of randomness in production keys, moved Suffix to being a string so it can hold hex or incremental ints, and now we can have 0 based indexes again. |
alecthomas
approved these changes
Mar 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1047
Fixes #1045
Changes
ControllerKeyandRunnerKeyto have the format:<r/c>-<hostname>-<port>-<4bytehex>for passing around<hostname>-<port>-<4bytehex>in the dbr-<incrementing-digits>and<incrementing digits>in db