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]>
194 lines
6.4 KiB
Go
194 lines
6.4 KiB
Go
package reposerver_test
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hanzoai/deploy/reposerver"
|
|
reposervercache "github.com/hanzoai/deploy/reposerver/cache"
|
|
"github.com/hanzoai/deploy/reposerver/metrics"
|
|
"github.com/hanzoai/deploy/reposerver/repository"
|
|
"github.com/hanzoai/deploy/util/askpass"
|
|
cacheutil "github.com/hanzoai/deploy/util/cache"
|
|
utilstls "github.com/hanzoai/deploy/util/tls"
|
|
)
|
|
|
|
func TestNewServer_DisableTLS(t *testing.T) {
|
|
srv, err := newTestServer(t, "", true)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, srv)
|
|
|
|
assert.Nil(t, srv.GetTLSConfig(), "TLS config must be nil when --disable-tls is set")
|
|
assert.Nil(t, srv.GetHealthCheckClientCert(), "health-check client cert must be nil when TLS is disabled")
|
|
}
|
|
|
|
func TestNewServer_TLSOnly_NoMTLS(t *testing.T) {
|
|
srv, err := newTestServer(t, "", false)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, srv)
|
|
|
|
tlsCfg := srv.GetTLSConfig()
|
|
require.NotNil(t, tlsCfg, "TLS config must be non-nil when TLS is enabled")
|
|
|
|
assert.Nil(t, srv.GetHealthCheckClientCert(), "health-check client cert must be nil when clientCAPath is not set")
|
|
assert.NotEqual(t, tls.RequireAndVerifyClientCert, tlsCfg.ClientAuth, "ClientAuth must not be RequireAndVerifyClientCert when mTLS is not configured")
|
|
assert.Nil(t, tlsCfg.ClientCAs, "ClientCAs pool must be nil when no client CA path is provided")
|
|
}
|
|
|
|
func TestNewServer_MTLS_HealthCheckCertGenerated(t *testing.T) {
|
|
caPath := writeTempCACert(t)
|
|
|
|
srv, err := newTestServer(t, caPath, false)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, srv)
|
|
|
|
hcCert := srv.GetHealthCheckClientCert()
|
|
require.NotNil(t, hcCert, "an ephemeral health-check client cert must be generated when mTLS is enabled")
|
|
require.NotEmpty(t, hcCert.Certificate, "the health-check cert must contain at least one DER-encoded certificate")
|
|
}
|
|
|
|
func TestNewServer_MTLS_ServerRequiresClientCert(t *testing.T) {
|
|
caPath := writeTempCACert(t)
|
|
|
|
srv, err := newTestServer(t, caPath, false)
|
|
require.NoError(t, err)
|
|
|
|
tlsCfg := srv.GetTLSConfig()
|
|
require.NotNil(t, tlsCfg)
|
|
|
|
assert.Equal(t, tls.RequireAndVerifyClientCert, tlsCfg.ClientAuth, "server must enforce RequireAndVerifyClientCert when a client CA path is set")
|
|
assert.NotNil(t, tlsCfg.ClientCAs, "ClientCAs pool must be populated from the provided client CA path")
|
|
}
|
|
|
|
func TestNewServer_MTLS_HealthCheckCertRegisteredInClientCAs(t *testing.T) {
|
|
caPath := writeTempCACert(t)
|
|
|
|
srv, err := newTestServer(t, caPath, false)
|
|
require.NoError(t, err)
|
|
|
|
hcCert := srv.GetHealthCheckClientCert()
|
|
require.NotNil(t, hcCert)
|
|
|
|
tlsCfg := srv.GetTLSConfig()
|
|
require.NotNil(t, tlsCfg)
|
|
require.NotNil(t, tlsCfg.ClientCAs)
|
|
|
|
parsedHCCert, err := x509.ParseCertificate(hcCert.Certificate[0])
|
|
require.NoError(t, err)
|
|
|
|
_, err = parsedHCCert.Verify(x509.VerifyOptions{
|
|
Roots: tlsCfg.ClientCAs,
|
|
KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
|
|
})
|
|
require.NoError(t, err, "the health-check cert must be verifiable against the server's ClientCAs pool: "+
|
|
"if this fails, the liveness probe will be rejected by its own server")
|
|
}
|
|
|
|
func TestNewServer_MTLS_HealthCheckCertProperties(t *testing.T) {
|
|
caPath := writeTempCACert(t)
|
|
|
|
srv, err := newTestServer(t, caPath, false)
|
|
require.NoError(t, err)
|
|
|
|
hcCert := srv.GetHealthCheckClientCert()
|
|
require.NotNil(t, hcCert)
|
|
|
|
parsed, err := x509.ParseCertificate(hcCert.Certificate[0])
|
|
require.NoError(t, err)
|
|
|
|
assert.True(t, parsed.IsCA, "health-check cert must be a CA cert so it can be added to the ClientCAs pool")
|
|
assert.Equal(t, parsed.Subject.String(), parsed.Issuer.String(), "health-check cert must be self-signed")
|
|
require.Len(t, parsed.ExtKeyUsage, 1, "health-check cert must carry exactly one extended key usage")
|
|
assert.Equal(t, x509.ExtKeyUsageClientAuth, parsed.ExtKeyUsage[0], "health-check cert must carry ExtKeyUsageClientAuth, not ExtKeyUsageServerAuth")
|
|
}
|
|
|
|
func TestNewServer_MTLS_EachStartupGeneratesDistinctCert(t *testing.T) {
|
|
caPath1 := writeTempCACert(t)
|
|
caPath2 := writeTempCACert(t)
|
|
|
|
srv1, err := newTestServer(t, caPath1, false)
|
|
require.NoError(t, err)
|
|
|
|
srv2, err := newTestServer(t, caPath2, false)
|
|
require.NoError(t, err)
|
|
|
|
cert1 := srv1.GetHealthCheckClientCert()
|
|
cert2 := srv2.GetHealthCheckClientCert()
|
|
|
|
require.NotNil(t, cert1)
|
|
require.NotNil(t, cert2)
|
|
|
|
assert.NotEqual(t, cert1.Certificate[0], cert2.Certificate[0], "each server instance must generate its own unique ephemeral health-check cert")
|
|
}
|
|
|
|
func TestNewServer_MTLS_InvalidCAPath(t *testing.T) {
|
|
srv, err := newTestServer(t, "/nonexistent/path/ca.crt", false)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, srv)
|
|
|
|
tlsCfg := srv.GetTLSConfig()
|
|
require.NotNil(t, tlsCfg, "TLS config must still be non-nil (server TLS is active, just no mTLS)")
|
|
assert.Nil(t, tlsCfg.ClientCAs, "ClientCAs must be nil when the CA file does not exist")
|
|
assert.NotEqual(t, tls.RequireAndVerifyClientCert, tlsCfg.ClientAuth, "ClientAuth must not require client certs when CA file is absent")
|
|
assert.Nil(t, srv.GetHealthCheckClientCert(), "no health-check cert should be generated when mTLS is skipped")
|
|
}
|
|
|
|
func TestNewServer_MTLS_InvalidCACertContent(t *testing.T) {
|
|
invalidCAPath := filepath.Join(t.TempDir(), "bad-ca.crt")
|
|
require.NoError(t, os.WriteFile(invalidCAPath, []byte("not a valid certificate"), 0o600))
|
|
|
|
_, err := newTestServer(t, invalidCAPath, false)
|
|
assert.ErrorContains(t, err, "invalid cert data")
|
|
}
|
|
|
|
func newTestServer(t *testing.T, clientCAPath string, disableTLS bool) (*reposerver.ArgoCDRepoServer, error) {
|
|
t.Helper()
|
|
|
|
metricsServer := metrics.NewMetricsServer()
|
|
|
|
cache := reposervercache.NewCache(
|
|
cacheutil.NewCache(cacheutil.NewInMemoryCache(1*time.Hour)),
|
|
1*time.Minute,
|
|
1*time.Minute,
|
|
10*time.Second,
|
|
)
|
|
|
|
askPassServer := askpass.NewServer(filepath.Join(t.TempDir(), "argocd-askpass.sock"))
|
|
|
|
return reposerver.NewServer(
|
|
metricsServer,
|
|
cache,
|
|
nil,
|
|
repository.RepoServerInitConstants{},
|
|
askPassServer,
|
|
clientCAPath,
|
|
disableTLS,
|
|
)
|
|
}
|
|
|
|
func writeTempCACert(t *testing.T) string {
|
|
t.Helper()
|
|
|
|
cert, err := utilstls.GenerateX509KeyPair(utilstls.CertOptions{
|
|
Hosts: []string{"localhost"},
|
|
Organization: "Argo CD Test CA",
|
|
IsCA: true,
|
|
ECDSACurve: "P256",
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
certPEM, _ := utilstls.EncodeX509KeyPair(*cert)
|
|
|
|
path := filepath.Join(t.TempDir(), "ca.crt")
|
|
require.NoError(t, os.WriteFile(path, certPEM, 0o600))
|
|
|
|
return path
|
|
}
|