marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(repo): add support for github app authentication without installationid (#25339) (#25374)

Browse Source 
Signed-off-by: pbhatnagar-oss <pbhatifiwork@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
This commit is contained in:
pbhatnagar-oss
2025-12-14 16:11:49 -05:00
committed by GitHub
parent 63927d1e1e
commit bbc3e99aa4
22 changed files with 493 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/apis/application/v1alpha1/repository_types.go
View File

@@ -1,9 +1,11 @@
package v1alpha1
import (
"context"
"fmt"
"net/url"
"strings"
"time"
"github.com/argoproj/argo-cd/v3/util/oci"
@@ -239,8 +241,33 @@ func (repo *Repository) GetGitCreds(store git.CredsStore) git.Creds {
if repo.SSHPrivateKey != "" {
return git.NewSSHCreds(repo.SSHPrivateKey, getCAPath(repo.Repo), repo.IsInsecure(), repo.Proxy)
}
if repo.GithubAppPrivateKey != "" && repo.GithubAppId != 0 && repo.GithubAppInstallationId != 0 {
return git.NewGitHubAppCreds(repo.GithubAppId, repo.GithubAppInstallationId, repo.GithubAppPrivateKey, repo.GitHubAppEnterpriseBaseURL, repo.TLSClientCertData, repo.TLSClientCertKey, repo.IsInsecure(), repo.Proxy, repo.NoProxy, store)
if repo.GithubAppPrivateKey != "" && repo.GithubAppId != 0 { // Promoter MVP: remove github-app-installation-id check since it is no longer a required field
installationId := repo.GithubAppInstallationId
// Auto-discover installation ID if not provided
if installationId == 0 {
org, err := git.ExtractOrgFromRepoURL(repo.Repo)
if err != nil {
log.Warnf("Failed to extract organization from repository URL %s for GitHub App auto-discovery: %v", repo.Repo, err)
return git.NopCreds{}
}
if org != "" {
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()
discoveredId, err := git.DiscoverGitHubAppInstallationID(ctx, repo.GithubAppId, repo.GithubAppPrivateKey, repo.GitHubAppEnterpriseBaseURL, org)
if err != nil {
log.Warnf("Failed to auto-discover GitHub App installation ID for org %s: %v. Proceeding with installation ID 0.", org, err)
} else {
log.Infof("Auto-discovered GitHub App installation ID %d for org %s", discoveredId, org)
installationId = discoveredId
}
} else {
log.Warnf("Could not extract organization from repository URL %s for GitHub App auto-discovery", repo.Repo)
}
}
return git.NewGitHubAppCreds(repo.GithubAppId, installationId, repo.GithubAppPrivateKey, repo.GitHubAppEnterpriseBaseURL, repo.TLSClientCertData, repo.TLSClientCertKey, repo.IsInsecure(), repo.Proxy, repo.NoProxy, store)
}
if repo.GCPServiceAccountKey != "" {
return git.NewGoogleCloudCreds(repo.GCPServiceAccountKey, store)