Use .gitmodules for determining what hosts to keyscan #876
Conversation
Currently we use a git submodule foreach to try and get the url of all our submodules so that we can figure out if any need ssh keyscanning. This is unfortunately completely flawed as none of them exist until after we call git submodule update. This uses the git config command to parse the .gitmodule file instead.
lox
force-pushed
the
use-gitmodules-for-keyscan
branch
from
c2c4d53 to
495969c
Compare
|
Nice! (out of interest, do those calls change our minimum git version by any chance?) |
|
(i.e. get-regexp sounds neat, and I’m wondering if it’s a later feature or something) |
|
What actually is our minimum git version? |
|
Looks like it's been in there for ages, I can see it in 1.7 |
|
Do we need to consider nested submodules? Looks like the previous command attempted to handle them with I wonder whether we could we feature-detect whether |
|
Neat, I haven't seen |
|
Given the current implementation just flat out doesn't work, I'd be inclined to go with this vs trying to solve recursive @matthewd. Perhaps we can add |
bootstrap/git.go
Outdated
| output, err := sh.RunAndCapture( | ||
| "git", "submodule", "foreach", "--recursive", "git", "ls-remote", "--get-url") | ||
| "git", "config", "--file", ".gitmodules", "--null", "--get-regexp", "url") |
There was a problem hiding this comment.
Neat! url seems like a very broad regexp, maybe ^submodule\..+\.url$?
| // every third element to get the [email protected]:blah bit | ||
| if idx%3 == 2 { | ||
| urls = append(urls, val) | ||
| // splits lines on null-bytes to gracefully handle line endings and repositories with newlines |
There was a problem hiding this comment.
repositories with newlines
is this possible?? wow, git
There was a problem hiding this comment.
Yeah, I think using null-byte delimiters ends up being better practice anyway.
bootstrap/git.go
Outdated
| for _, line := range lines { | ||
| tokens := strings.SplitN(line, "\n", 2) | ||
| if len(tokens) != 2 { | ||
| return nil, fmt.Errorf("Failed to parse .gitmodule line %q", line) |
|
Yeah, totally non-functional! |
|
Trying to integration test the submodules stuff is a bit awkward, so we missed it entirely. |
|
|
|
(kewl even) |
Currently we use a git submodule foreach to try and get the url of all our submodules so that we can figure out if any need ssh keyscanning. This is unfortunately completely flawed as none of them exist until after we call git submodule update.
This uses the git config command to parse the .gitmodule file instead.
Closes #825.