mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
* feat(api): hard-fork CRD API group argoproj.io -> deploy.hanzo.ai
Hanzo CD hard-fork, phase 1.1. Single source of truth is
pkg/apis/application/register.go's Group constant (Application/AppProject/
ApplicationSet all derive their FullName from it); every other Go call-site
that hardcoded the literal group string is updated to match: the 3 generated
informer GVRs, the app-of-apps nested-Application detector in types.go, the
resource-tree Application-kind cache populator, the 3 NotFound error
constructors in server/application, and the applicationset-controller's
leader-election Lease name/ID (kept in lockstep across Go source + RBAC
resourceNames, or leader election would get RBAC-denied on startup).
CRD YAMLs (application/appproject/applicationset) and every RBAC apiGroups
rule that actually governs our 3 CRDs are repointed to deploy.hanzo.ai, across
both manifests/base/* (namespaced Roles) and manifests/cluster-rbac/* (cluster
scope). Two adjacent things that share the "argoproj.io" string but are NOT
ours are deliberately left untouched: gitops-engine's health-check dispatch
for Argo Workflows' `Workflow` kind, and argocd-server-clusterrole's second
apiGroups block granting read on Argo Workflows' `workflows` resource — both
belong to a separate, unrelated Argoproj-family project we are not forking.
Also untouched, per explicit scope: annotation/label keys (argocd.argoproj.io/*)
and finalizers (*.argoproj.io) that track already-applied live resources, and
argocd-cm.yaml's resource.customizations.ignoreResourceUpdates keys (a narrow
app-of-apps diffing nicety, not build- or RBAC-relevant).
CGO_ENABLED=0 go build ./... verified green.
* ci: wire canonical hanzo.yml + cicd.yml (Hanzo CD image build)
Phase 1.3. Follows the same one-way pattern every hanzo/lux/zoo repo uses:
hanzo.yml declares the image (root Dockerfile -> ghcr.io/hanzoai/deploy) and a
fast go-build sanity test (the multi-stage Dockerfile build is the slow, real
gate); cicd.yml is the ~10-line trigger shim importing hanzoai/ci's reusable
build workflow on the arc pool, secrets from KMS only.
No `deploy:` block yet, matching the hanzoai/cms build-only-first-cutover
pattern: this repo's own live hanzo-cd namespace runs the whole Hanzo fleet's
GitOps, so the prod image/CRD swap is a deliberate separate action (see the
[HELD] universe PR), never an automatic rollout on merge. Every PR/push still
builds and pushes an immutable ghcr.io/hanzoai/deploy:sha-<7>-amd64 image.
* feat(ui): rebrand Argo CD -> Hanzo CD (title, favicon, logo, sidebar)
Phase 1.2. User-facing "Argo CD"/"ArgoCD" text replaced with "Hanzo CD"
across the login page, help modal, settings screens, version-info panel,
sync-options warning, fullscreen-logs title, app.tsx page titles, and
index.html's <title>/noscript text (dropped the now-wrong upstream CLI
doc link rather than invent a hanzo.ai URL that doesn't exist).
Logo/favicon assets replaced with the canonical Hanzo mark (never
hand-drawn, copied from ~/work/hanzo/logo/dist): the two real usages of
Argo's logo collapse onto one Hanzo glyph (mono + white variants) at the
same 5 call sites (login icon + footer, login.scss $logoPath/
$logoNegativePath, sidebar text-logo), preserving the existing CSS
invert() filters so both the light login panel and dark sidebar still
render correctly. Old argologo.svg/argo_o.svg/argo.png deleted (no
longer referenced). favicon-{16x16,32x32}.png added at
ui/src/assets/favicon/ (index.html's links to that path were previously
dead - the directory didn't exist in this checkout). package.json name
argo-cd-ui -> hanzo-cd-ui.
Left alone, deliberately: the two Kubernetes resource-kind icon sets
under ui/src/assets/images/resources/ (unrelated to branding), and
upstream doc/project links (argoproj.io, argo-cd.readthedocs.io) since
we have no equivalent hanzo.ai docs to point to yet - except the login
footer logo's outbound link, which now points to hanzo.ai instead of
argoproj.io (a Hanzo-branded mark linking to the upstream project it
was forked from read as an obvious leftover).
* feat(module): rename Go module github.com/argoproj/argo-cd/v3 -> github.com/hanzoai/deploy
Phase 2. No version suffix on the new path (org policy: never publish our
own Go modules above v1.x.x / with a v2+ suffix) — this fork starts a fresh
v0/v1 module identity rather than carrying the v3 the upstream fork point
had reached.
Mechanical, symmetric rewrite: 704 .go files (import statements only; two
disjoint substitutions applied specific-first so the nested gitops-engine
module path never double-matches), plus go.mod (module line, the
gitops-engine require+replace pair, version reset to v0.0.0-... since a
suffix-less path can't carry a v3 semver), gitops-engine/go.mod, Makefile
(ldflags PACKAGE + 2 TEST_MODULE filters), .golangci.yaml, .goreleaser.yaml,
.mockery.yaml (+ gitops-engine's), Procfile, the codegen/proto generation
scripts (hack/generate-proto.sh, update-codegen.sh, update-openapi.sh), and
20 .proto files' go_package options. Also one OpenTelemetry tracer name
string in gitops-engine/pkg/sync/sync_context.go (a cosmestic label, not an
import, but worth keeping consistent).
CGO_ENABLED=0 go build ./... verified green for both the root module and
the nested gitops-engine module; go vet clean on both; go mod tidy run
(network available) to reconcile go.sum, dependency set unchanged.
Left alone, deliberately: doc-only mentions (docs/snyk/*.html scan reports,
gitops-engine/README.md), a comment-only reference in
.github/workflows/release.yaml, and one Renovate bot config line — none are
build- or codegen-load-bearing. Also left alone: comments citing upstream
GitHub issue URLs (github.com/argoproj/argo-cd/issues/NNNNN) and a handful
of test fixtures using "https://github.com/argoproj/argo-cd.git" as a
representative example repo URL — both are accurate historical/test-data
references, not stale self-references.
---------
Co-authored-by: Hanzo Dev <[email protected]>
330 lines
13 KiB
Go
330 lines
13 KiB
Go
package generators
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"slices"
|
|
"strings"
|
|
"time"
|
|
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"github.com/hanzoai/deploy/util/proxy"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/services"
|
|
"github.com/hanzoai/deploy/applicationset/services/github_app_auth"
|
|
"github.com/hanzoai/deploy/applicationset/services/scm_provider"
|
|
"github.com/hanzoai/deploy/applicationset/utils"
|
|
"github.com/hanzoai/deploy/common"
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
var _ Generator = (*SCMProviderGenerator)(nil)
|
|
|
|
const (
|
|
DefaultSCMProviderRequeueAfter = 30 * time.Minute
|
|
)
|
|
|
|
type SCMProviderGenerator struct {
|
|
client client.Client
|
|
// Testing hooks.
|
|
overrideProvider scm_provider.SCMProviderService
|
|
SCMConfig
|
|
}
|
|
type SCMConfig struct {
|
|
scmRootCAPath string
|
|
allowedSCMProviders []string
|
|
enableSCMProviders bool
|
|
enableGitHubAPIMetrics bool
|
|
GitHubApps github_app_auth.Credentials
|
|
tokenRefStrictMode bool
|
|
scmProxyURL string
|
|
scmNoProxy string
|
|
}
|
|
|
|
func NewSCMConfig(scmRootCAPath string, allowedSCMProviders []string, enableSCMProviders bool, enableGitHubAPIMetrics bool, gitHubApps github_app_auth.Credentials, tokenRefStrictMode bool, opts ...SCMConfigOpts) SCMConfig {
|
|
c := SCMConfig{
|
|
scmRootCAPath: scmRootCAPath,
|
|
allowedSCMProviders: allowedSCMProviders,
|
|
enableSCMProviders: enableSCMProviders,
|
|
enableGitHubAPIMetrics: enableGitHubAPIMetrics,
|
|
GitHubApps: gitHubApps,
|
|
tokenRefStrictMode: tokenRefStrictMode,
|
|
}
|
|
|
|
for _, opt := range opts {
|
|
opt(&c)
|
|
}
|
|
return c
|
|
}
|
|
|
|
type SCMConfigOpts func(c *SCMConfig)
|
|
|
|
func WithNoProxyList(noProxyList string) SCMConfigOpts {
|
|
return func(config *SCMConfig) {
|
|
config.scmNoProxy = noProxyList
|
|
}
|
|
}
|
|
|
|
func WithProxyURL(scmProxyURL string) SCMConfigOpts {
|
|
return func(config *SCMConfig) {
|
|
config.scmProxyURL = scmProxyURL
|
|
}
|
|
}
|
|
|
|
func NewSCMProviderGenerator(client client.Client, scmConfig SCMConfig) Generator {
|
|
return &SCMProviderGenerator{
|
|
client: client,
|
|
SCMConfig: scmConfig,
|
|
}
|
|
}
|
|
|
|
// Testing generator
|
|
func NewTestSCMProviderGenerator(overrideProvider scm_provider.SCMProviderService) Generator {
|
|
return &SCMProviderGenerator{overrideProvider: overrideProvider, SCMConfig: SCMConfig{
|
|
enableSCMProviders: true,
|
|
}}
|
|
}
|
|
|
|
func (g *SCMProviderGenerator) GetRequeueAfter(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) time.Duration {
|
|
// Return a requeue default of 30 minutes, if no default is specified.
|
|
|
|
if appSetGenerator.SCMProvider.RequeueAfterSeconds != nil {
|
|
return time.Duration(*appSetGenerator.SCMProvider.RequeueAfterSeconds) * time.Second
|
|
}
|
|
|
|
return DefaultSCMProviderRequeueAfter
|
|
}
|
|
|
|
func (g *SCMProviderGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) *argoprojiov1alpha1.ApplicationSetTemplate {
|
|
return &appSetGenerator.SCMProvider.Template
|
|
}
|
|
|
|
var ErrSCMProvidersDisabled = errors.New("scm providers are disabled")
|
|
|
|
type ErrDisallowedSCMProvider struct {
|
|
Provider string
|
|
Allowed []string
|
|
}
|
|
|
|
func NewErrDisallowedSCMProvider(provider string, allowed []string) ErrDisallowedSCMProvider {
|
|
return ErrDisallowedSCMProvider{
|
|
Provider: provider,
|
|
Allowed: allowed,
|
|
}
|
|
}
|
|
|
|
func (e ErrDisallowedSCMProvider) Error() string {
|
|
return fmt.Sprintf("scm provider %q not allowed, must use one of the following: %s", e.Provider, strings.Join(e.Allowed, ", "))
|
|
}
|
|
|
|
func ScmProviderAllowed(applicationSetInfo *argoprojiov1alpha1.ApplicationSet, generator SCMGeneratorWithCustomApiUrl, allowedScmProviders []string) error {
|
|
url := generator.CustomApiUrl()
|
|
|
|
if url == "" || len(allowedScmProviders) == 0 {
|
|
return nil
|
|
}
|
|
|
|
if slices.Contains(allowedScmProviders, url) {
|
|
return nil
|
|
}
|
|
|
|
log.WithFields(log.Fields{
|
|
common.SecurityField: common.SecurityMedium,
|
|
"applicationset": applicationSetInfo.Name,
|
|
"appSetNamespace": applicationSetInfo.Namespace,
|
|
}).Debugf("attempted to use disallowed SCM %q, must use one of the following: %s", url, strings.Join(allowedScmProviders, ", "))
|
|
|
|
return NewErrDisallowedSCMProvider(url, allowedScmProviders)
|
|
}
|
|
|
|
func (g *SCMProviderGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]any, error) {
|
|
if appSetGenerator == nil {
|
|
return nil, ErrEmptyAppSetGenerator
|
|
}
|
|
|
|
if appSetGenerator.SCMProvider == nil {
|
|
return nil, ErrEmptyAppSetGenerator
|
|
}
|
|
|
|
if !g.enableSCMProviders {
|
|
return nil, ErrSCMProvidersDisabled
|
|
}
|
|
|
|
// Create the SCM provider helper.
|
|
providerConfig := appSetGenerator.SCMProvider
|
|
|
|
if err := ScmProviderAllowed(applicationSetInfo, providerConfig, g.allowedSCMProviders); err != nil {
|
|
return nil, fmt.Errorf("scm provider not allowed: %w", err)
|
|
}
|
|
|
|
ctx := context.Background()
|
|
scmHTTPClient := g.newSCMHTTPClient()
|
|
var provider scm_provider.SCMProviderService
|
|
switch {
|
|
case g.overrideProvider != nil:
|
|
provider = g.overrideProvider
|
|
case providerConfig.Github != nil:
|
|
var err error
|
|
provider, err = g.githubProvider(ctx, providerConfig.Github, applicationSetInfo, scmHTTPClient)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("scm provider: %w", err)
|
|
}
|
|
case providerConfig.Gitlab != nil:
|
|
providerConfig := providerConfig.Gitlab
|
|
var caCerts []byte
|
|
var scmError error
|
|
if providerConfig.CARef != nil {
|
|
caCerts, scmError = utils.GetConfigMapData(ctx, g.client, providerConfig.CARef, applicationSetInfo.Namespace)
|
|
if scmError != nil {
|
|
return nil, fmt.Errorf("error fetching CA certificates from ConfigMap: %w", scmError)
|
|
}
|
|
}
|
|
token, err := utils.GetSecretRef(ctx, g.client, providerConfig.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Gitlab token: %w", err)
|
|
}
|
|
provider, err = scm_provider.NewGitlabProvider(providerConfig.Group, token, providerConfig.API, providerConfig.AllBranches, providerConfig.IncludeSubgroups, providerConfig.WillIncludeSharedProjects(), providerConfig.IncludeArchivedRepos, providerConfig.Insecure, g.scmRootCAPath, providerConfig.Topic, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error initializing Gitlab service: %w", err)
|
|
}
|
|
case providerConfig.Gitea != nil:
|
|
token, err := utils.GetSecretRef(ctx, g.client, providerConfig.Gitea.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Gitea token: %w", err)
|
|
}
|
|
provider, err = scm_provider.NewGiteaProvider(providerConfig.Gitea.Owner, token, providerConfig.Gitea.API, providerConfig.Gitea.AllBranches, providerConfig.Gitea.Insecure, providerConfig.Gitea.ExcludeArchivedRepos, g.scmProxyURL, g.scmNoProxy)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error initializing Gitea service: %w", err)
|
|
}
|
|
case providerConfig.BitbucketServer != nil:
|
|
providerConfig := providerConfig.BitbucketServer
|
|
var caCerts []byte
|
|
var scmError error
|
|
if providerConfig.CARef != nil {
|
|
caCerts, scmError = utils.GetConfigMapData(ctx, g.client, providerConfig.CARef, applicationSetInfo.Namespace)
|
|
if scmError != nil {
|
|
return nil, fmt.Errorf("error fetching CA certificates from ConfigMap: %w", scmError)
|
|
}
|
|
}
|
|
switch {
|
|
case providerConfig.BearerToken != nil:
|
|
appToken, err := utils.GetSecretRef(ctx, g.client, providerConfig.BearerToken.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret Bearer token: %w", err)
|
|
}
|
|
provider, scmError = scm_provider.NewBitbucketServerProviderBearerToken(ctx, appToken, providerConfig.API, providerConfig.Project, providerConfig.AllBranches, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
case providerConfig.BasicAuth != nil:
|
|
password, err := utils.GetSecretRef(ctx, g.client, providerConfig.BasicAuth.PasswordRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
provider, scmError = scm_provider.NewBitbucketServerProviderBasicAuth(ctx, providerConfig.BasicAuth.Username, password, providerConfig.API, providerConfig.Project, providerConfig.AllBranches, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
default:
|
|
provider, scmError = scm_provider.NewBitbucketServerProviderNoAuth(ctx, providerConfig.API, providerConfig.Project, providerConfig.AllBranches, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
}
|
|
if scmError != nil {
|
|
return nil, fmt.Errorf("error initializing Bitbucket Server service: %w", scmError)
|
|
}
|
|
case providerConfig.AzureDevOps != nil:
|
|
token, err := utils.GetSecretRef(ctx, g.client, providerConfig.AzureDevOps.AccessTokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Azure Devops access token: %w", err)
|
|
}
|
|
provider, err = scm_provider.NewAzureDevOpsProvider(token, providerConfig.AzureDevOps.Organization, providerConfig.AzureDevOps.API, providerConfig.AzureDevOps.TeamProject, providerConfig.AzureDevOps.AllBranches)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error initializing Azure Devops service: %w", err)
|
|
}
|
|
case providerConfig.Bitbucket != nil:
|
|
appPassword, err := utils.GetSecretRef(ctx, g.client, providerConfig.Bitbucket.AppPasswordRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Bitbucket cloud appPassword: %w", err)
|
|
}
|
|
provider, err = scm_provider.NewBitBucketCloudProvider(providerConfig.Bitbucket.Owner, providerConfig.Bitbucket.User, appPassword, providerConfig.Bitbucket.AllBranches)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error initializing Bitbucket cloud service: %w", err)
|
|
}
|
|
case providerConfig.AWSCodeCommit != nil:
|
|
var awsErr error
|
|
provider, awsErr = scm_provider.NewAWSCodeCommitProvider(ctx, providerConfig.AWSCodeCommit.TagFilters, providerConfig.AWSCodeCommit.Role, providerConfig.AWSCodeCommit.Region, providerConfig.AWSCodeCommit.AllBranches)
|
|
if awsErr != nil {
|
|
return nil, fmt.Errorf("error initializing AWS codecommit service: %w", awsErr)
|
|
}
|
|
default:
|
|
return nil, errors.New("no SCM provider implementation configured")
|
|
}
|
|
|
|
// Find all the available repos.
|
|
repos, err := scm_provider.ListRepos(ctx, provider, providerConfig.Filters, providerConfig.CloneProtocol)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error listing repos: %w", err)
|
|
}
|
|
paramsArray := make([]map[string]any, 0, len(repos))
|
|
var shortSHALength int
|
|
var shortSHALength7 int
|
|
for _, repo := range repos {
|
|
shortSHALength = min(len(repo.SHA), 8)
|
|
|
|
shortSHALength7 = min(len(repo.SHA), 7)
|
|
|
|
params := map[string]any{
|
|
"organization": repo.Organization,
|
|
"repository": repo.Repository,
|
|
"repository_id": repo.RepositoryId,
|
|
"url": repo.URL,
|
|
"branch": repo.Branch,
|
|
"sha": repo.SHA,
|
|
"short_sha": repo.SHA[:shortSHALength],
|
|
"short_sha_7": repo.SHA[:shortSHALength7],
|
|
"labels": strings.Join(repo.Labels, ","),
|
|
"branchNormalized": utils.SanitizeName(repo.Branch),
|
|
}
|
|
|
|
err := appendTemplatedValues(appSetGenerator.SCMProvider.Values, params, applicationSetInfo.Spec.GoTemplate, applicationSetInfo.Spec.GoTemplateOptions)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to append templated values: %w", err)
|
|
}
|
|
|
|
paramsArray = append(paramsArray, params)
|
|
}
|
|
return paramsArray, nil
|
|
}
|
|
|
|
func (g *SCMProviderGenerator) githubProvider(ctx context.Context, github *argoprojiov1alpha1.SCMProviderGeneratorGithub, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, baseHTTPClient *http.Client) (scm_provider.SCMProviderService, error) {
|
|
httpClient := baseHTTPClient
|
|
if g.enableGitHubAPIMetrics {
|
|
metricsCtx := &services.MetricsContext{
|
|
AppSetNamespace: applicationSetInfo.Namespace,
|
|
AppSetName: applicationSetInfo.Name,
|
|
}
|
|
httpClient = services.NewGitHubMetricsClientFrom(httpClient, metricsCtx)
|
|
}
|
|
|
|
if github.AppSecretName != "" {
|
|
auth, err := g.GitHubApps.GetAuthSecret(ctx, github.AppSecretName)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Github app secret: %w", err)
|
|
}
|
|
return scm_provider.NewGithubAppProviderFor(ctx, *auth, github.Organization, github.API, github.AllBranches, github.ExcludeArchivedRepos, httpClient)
|
|
}
|
|
|
|
token, err := utils.GetSecretRef(ctx, g.client, github.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Github token: %w", err)
|
|
}
|
|
return scm_provider.NewGithubProvider(github.Organization, token, github.API, github.AllBranches, github.ExcludeArchivedRepos, httpClient)
|
|
}
|
|
|
|
func (g *SCMConfig) newSCMHTTPClient() *http.Client {
|
|
if g.scmProxyURL == "" {
|
|
return &http.Client{}
|
|
}
|
|
tr := http.DefaultTransport.(*http.Transport).Clone()
|
|
tr.Proxy = proxy.GetCallback(g.scmProxyURL, g.scmNoProxy)
|
|
return &http.Client{Transport: tr}
|
|
}
|