Test git over SSH too, and correct hard-wired implementation causing SSH/libgit2 problems #109
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
The "auth strategy", which depends on the GitImplementation, was hard-wired to the "gogit" constant, but it should come from the GitRepository spec. When the implementation is "libgit2" and the git URL entails SSH, the result would normally include a callback for checking the host key against known_hosts; but since it was hard-wired, it was missing that callback. This explains at least some instances of the error `user cancelled hostkey check` from #106. The error, or a close relative, might also arise if the callback rejects the host key because the host as it appears in the known_hosts doesn't match that host as passed to the callback -- see fluxcd/source-controller#287. Signed-off-by: Michael Bridgen <michael@weave.works>
This commit rearranges update tests so that those that check that updates are made can be run against a git server using SSH as well as HTTP. The local clone, used to provoke automated updates and to check results, still uses HTTP. Those operations are not under test. libgit2 wants to be asked for authentication when using SSH, and will balk if it's not requested by the server. To avoid that, auth must be switched on for the git test server. This also switches auth on for HTTP, so it's necessary to use a git URL that includes credentials for setting things up with a local clone. I have also used that URL for the git-over-HTTP tests -- it's arguable whether it's necessary to test that works, here. Signed-off-by: Michael Bridgen <michael@weave.works>
Signed-off-by: Hidde Beydals <hello@hidde.co>
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.
This extends the tests so that the main battery is run with
{libgit2,go-git} x {HTTP,SSH}. Fixes #106.This was provoked by SSH-over-libgit2 failing for people (e.g., in #106). It turns out the culprit is a remnant, hard-wired value that meant libgit2 didn't get the authentication (and host key check) callbacks needed for SSH. (So the bulk of the work, here, in fluxcd/pkg, and in fluxcd/source-controller was in getting SSH tests to work at all!)
(This won't build and pass tests until there's a source-controller module version with fluxcd/source-controller#288 merged)