Skip to content

SSH auth for Git #1848

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 7 commits into
base: main
Choose a base branch
from
Draft

SSH auth for Git #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d31995
WIP
eddymoulton Mar 24, 2026
99a11d1
Claude self review and fix
eddymoulton Mar 24, 2026
3da4f79
Merge branch 'main' into em/ssh-git
eddymoulton Mar 29, 2026
4fa3ac7
Update libgit2sharp v
eddymoulton Mar 29, 2026
9f715ca
Fix test
eddymoulton Mar 29, 2026
8022fde
Stub cert check
eddymoulton Mar 30, 2026
a8ac269
Merge branch 'main' into em/ssh-git
eddymoulton Mar 30, 2026
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
3 changes: 3 additions & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<add key="feedz.io" value="https://f.feedz.io/octopus-deploy/dependencies/nuget/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="local">
<package pattern="Octopus.LibGit2Sharp" />
</packageSource>
<packageSource key="feedz.io">
<package pattern="AlphaFS" />
<package pattern="NuGet.Common" />
Expand Down
3 changes: 3 additions & 0 deletions build/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="local">
<package pattern="Octopus.LibGit2Sharp" />
</packageSource>
<packageSource key="NuGet.org v3">
<package pattern="NuGet.Common" />
<package pattern="NuGet.Configuration" />
Expand Down
8 changes: 4 additions & 4 deletions source/Calamari.Tests/ArgoCD/ArgoCdApplicationManifestParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void SingleSource_SourceDeserialized()
{
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/fake/octopus-test.git",
RepoUrl = "https://github.com/fake/octopus-test.git",
TargetRevision = "test-branch",
Path = "octopus-app"
}
Expand Down Expand Up @@ -109,13 +109,13 @@ public void TwoSources_SourcesDeserialized()
{
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/fake/octopus-test.git",
RepoUrl = "https://github.com/fake/octopus-test.git",
TargetRevision = "test-branch",
Path = "octopus-app"
},
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/fake/octopus-test2.git",
RepoUrl = "https://github.com/fake/octopus-test2.git",
TargetRevision = "test-branch2",
Path = "octopus-app2"
}
Expand Down Expand Up @@ -166,7 +166,7 @@ public void NoSourceType_SourceTypesIsEmpty()
{
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/fake/octopus-test.git",
RepoUrl = "https://github.com/fake/octopus-test.git",
TargetRevision = "test-branch",
Path = "octopus-app"
}
Expand Down
48 changes: 24 additions & 24 deletions ...mari.Tests/ArgoCD/Commands/Conventions/UpdateArgoCDAppImagesInstallConventionHelmTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void Init()
{
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "files",
TargetRevision = argoCDBranchName.Value,
Helm = new HelmConfig()
Expand Down Expand Up @@ -182,7 +182,7 @@ public void HelmSource_NoPath_DontUpdate()
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
TargetRevision = ArgoCDBranchFriendlyName
},
SourceTypeConstants.Helm)
Expand Down Expand Up @@ -345,7 +345,7 @@ public void SingleSourceWithWrongScoping_DontUpdate()
{
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "files",
TargetRevision = argoCDBranchName.Value,
Name = "wrong-scoping",
Expand Down Expand Up @@ -416,7 +416,7 @@ public void RefSourceWithWrongScoping_DontUpdate()
{
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/doesnt/exist.git",
RepoUrl = "https://github.com/doesnt/exist.git",
Path = "files",
Helm = new HelmConfig()
{
Expand All @@ -429,7 +429,7 @@ public void RefSourceWithWrongScoping_DontUpdate()
},
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
TargetRevision = argoCDBranchName.Value,
Ref = "values",
}
Expand Down Expand Up @@ -498,7 +498,7 @@ public void HelmSourceWithExplicitValuesFile_MissingImagePath_WarnAndDontUpdate(
{
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
TargetRevision = argoCDBranchName.Value,
Path = "files",
Helm = new HelmConfig()
Expand Down Expand Up @@ -577,7 +577,7 @@ public void HelmSourceWithImplicitValuesFile_MissingImagePath_WarnAndDontUpdate(
{
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
TargetRevision = argoCDBranchName.Value,
Path = "files",
Name = "helm-source",
Expand Down Expand Up @@ -649,7 +649,7 @@ public void RefSourceWithMissingImagePath_WarnAndDontUpdate()
{
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/doesnt/exist.git",
RepoUrl = "https://github.com/doesnt/exist.git",
Path = "files",
Helm = new HelmConfig()
{
Expand All @@ -661,7 +661,7 @@ public void RefSourceWithMissingImagePath_WarnAndDontUpdate()
},
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
TargetRevision = argoCDBranchName.Value,
Ref = "values",
Name = "ref-source",
Expand Down Expand Up @@ -733,7 +733,7 @@ public void RefSourceWithMissingImagePathIfRefSourceNotInScope_DontWarnAndDontUp
{
new ApplicationSource()
{
OriginalRepoUrl = "https://github.com/doesnt/exist.git",
RepoUrl = "https://github.com/doesnt/exist.git",
Path = "files",
Helm = new HelmConfig()
{
Expand All @@ -745,7 +745,7 @@ public void RefSourceWithMissingImagePathIfRefSourceNotInScope_DontWarnAndDontUp
},
new ApplicationSource()
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
TargetRevision = argoCDBranchName.Value,
Ref = "values",
}
Expand Down Expand Up @@ -836,7 +836,7 @@ public void HelmSourceWithHelmConfigurationAndImplicitValuesFile_IncludeValuesFi
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "",
TargetRevision = ArgoCDBranchFriendlyName,
Helm = new HelmConfig()
Expand Down Expand Up @@ -919,7 +919,7 @@ public void HelmSourceWithHelmConfigurationAndNoImplicitValuesFile_ExcludeValues
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "",
TargetRevision = ArgoCDBranchFriendlyName,
Helm = new HelmConfig()
Expand Down Expand Up @@ -1003,7 +1003,7 @@ public void HelmSourceWithHelmConfigurationIncludesImplicitValuesFile_IncludeVal
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "",
TargetRevision = ArgoCDBranchFriendlyName,
Helm = new HelmConfig()
Expand Down Expand Up @@ -1089,7 +1089,7 @@ public void HelmSourceWithImplicitValuesFile_Update()
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "",
TargetRevision = ArgoCDBranchFriendlyName
},
Expand Down Expand Up @@ -1170,7 +1170,7 @@ public void RefSourceWithHelmImageMatches_Update()
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = "https://github.com/org/repo",
RepoUrl = "https://github.com/org/repo",
Path = "",
TargetRevision = ArgoCDBranchFriendlyName,
Helm = new HelmConfig
Expand All @@ -1189,7 +1189,7 @@ public void RefSourceWithHelmImageMatches_Update()
Name = "ref-source",
Ref = "values",
TargetRevision = ArgoCDBranchFriendlyName,
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
},
SourceTypeConstants.Directory)
.Build();
Expand Down Expand Up @@ -1267,9 +1267,9 @@ public void RefSourceWithHelmImageMatchesAndPath_IgnoresFilesUnderPath()
spec:
containers:
- name: nginx
image: nginx:1.19
image: nginx:1.19
- name: alpine
image: alpine:3.21
image: alpine:3.21
";
var filesInRepo = new[]
{
Expand Down Expand Up @@ -1301,7 +1301,7 @@ public void RefSourceWithHelmImageMatchesAndPath_IgnoresFilesUnderPath()
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = "https://github.com/org/repo",
RepoUrl = "https://github.com/org/repo",
Path = "",
TargetRevision = ArgoCDBranchFriendlyName,
Helm = new HelmConfig
Expand All @@ -1320,7 +1320,7 @@ public void RefSourceWithHelmImageMatchesAndPath_IgnoresFilesUnderPath()
Ref = "values",
Path = "include/",
TargetRevision = ArgoCDBranchFriendlyName,
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
},
SourceTypeConstants.Directory)
.Build();
Expand Down Expand Up @@ -1455,7 +1455,7 @@ public void CanUpdateRefSourceUsingStepBasedVariables()
})
.WithSource(new ApplicationSource
{
OriginalRepoUrl = "https://github.com/org/repo",
RepoUrl = "https://github.com/org/repo",
Path = "",
TargetRevision = ArgoCDBranchFriendlyName,
Helm = new HelmConfig
Expand All @@ -1473,7 +1473,7 @@ public void CanUpdateRefSourceUsingStepBasedVariables()
Name = "ref-source",
Ref = "values",
TargetRevision = ArgoCDBranchFriendlyName,
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
},
SourceTypeConstants.Directory)
.Build();
Expand Down Expand Up @@ -1543,7 +1543,7 @@ public void CanUpdateHelmSourceUsingStepBasedVariables()
.WithSource(new ApplicationSource
{
TargetRevision = ArgoCDBranchFriendlyName,
OriginalRepoUrl = OriginPath,
RepoUrl = OriginPath,
Path = "",
Helm = new HelmConfig
{
Expand Down
Loading