Skip to content

Logging for git handling #1976

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.

Sign up for GitHub

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

Draft
eddymoulton wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Logging for git handling #1976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions source/Calamari/ArgoCD/Git/LibGit2SharpCredentialsHandlerExtensionMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ namespace Calamari.ArgoCD.Git;

public static class LibGit2SharpCredentialsHandlerExtensionMethods
{
public static CredentialsHandler ToLibGit2SharpCredentialHandler(this IGitConnection? connection)
public static CredentialsHandler ToLibGit2SharpCredentialHandler(this IGitConnection? connection, ILog log)
{
return connection switch
{
HttpsGitConnection { Username: null, Password: null } => Anonymous(),
HttpsGitConnection https => UsernamePassword(https),
SshKeyGitConnection sshKey => SshKey(sshKey),
SshKeyGitConnection sshKey => SshKey(sshKey, log),
null => Anonymous(),
_ => throw new NotSupportedException(),
};
Expand All @@ -34,10 +34,11 @@ static CredentialsHandler Anonymous()
return null!; // A null CredentialsHandler is valid for LibGit2Sharp
}

static CredentialsHandler SshKey(SshKeyGitConnection connection)
static CredentialsHandler SshKey(SshKeyGitConnection connection, ILog log)
{
return (_, userFromUrl, types) =>
{
log.Verbose($"Handling SSH key credentials for {connection.Username}");
if (!types.HasFlag(SupportedCredentialTypes.SshMemory))
{
throw new InvalidOperationException("SSH key credentials provided but are not supported by this endpoint.");
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari/ArgoCD/Git/RepositoryFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RepositoryWrapper CheckoutGitRepository(IGitConnection gitConnection, string che
BranchName = (gitConnection.GitReference as GitBranchName)?.ToFriendlyName()
};

options.FetchOptions.CredentialsProvider = gitConnection.ToLibGit2SharpCredentialHandler();
options.FetchOptions.CredentialsProvider = gitConnection.ToLibGit2SharpCredentialHandler(log);
options.FetchOptions.CertificateCheck = gitConnection.ToLibGit2SharpCertificateCheckHandler(log);

string repoPath;
Expand Down
4 changes: 2 additions & 2 deletions source/Calamari/ArgoCD/Git/RepositoryWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public void PushChanges(GitBranchName branchName)
PushStatusError? errorsDetected = null;
var pushOptions = new PushOptions
{
CredentialsProvider = connection.ToLibGit2SharpCredentialHandler(),
CredentialsProvider = connection.ToLibGit2SharpCredentialHandler(log),
OnPushStatusError = errors => errorsDetected = errors,
CertificateCheck = connection.ToLibGit2SharpCertificateCheckHandler(log)
};
Expand All @@ -209,7 +209,7 @@ void FetchAndRebase(GitBranchName branchName)
var refSpecs = remote.FetchRefSpecs.Select(x => x.Specification).ToList();
var fetchOptions = new FetchOptions
{
CredentialsProvider = connection.ToLibGit2SharpCredentialHandler(),
CredentialsProvider = connection.ToLibGit2SharpCredentialHandler(log),
CertificateCheck = connection.ToLibGit2SharpCertificateCheckHandler(log)
};

Expand Down