Files
41536738c8 refactor(cd): hard-fork - rename CRD API group argoproj.io -> deploy.hanzo.ai (#1)
* 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]>
2026-07-29 18:27:58 -07:00

448 lines
11 KiB
Go

package sourceintegrity
import (
"fmt"
"io"
"os"
"os/exec"
"path"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/deploy/common"
"github.com/hanzoai/deploy/test"
)
const (
longKeyID = "5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23"
shortKeyID = "4AEE18F83AFDEB23"
)
var syncTestSources = map[string]string{
"F7842A5CEAA9C0B1": "testdata/janedoe.asc",
"FDC79815400D88A9": "testdata/johndoe.asc",
"4AEE18F83AFDEB23": "testdata/github.asc",
}
// Helper function to create temporary GNUPGHOME
func initTempDir(t *testing.T) string {
t.Helper()
// Intentionally avoid using t.TempDir. That function creates really long paths, which can exceed the socket file
// path length on some OSes. The GPG tests rely on sockets.
p, err := os.MkdirTemp(os.TempDir(), "")
if err != nil {
panic(err)
}
fmt.Printf("-> Using %s as GNUPGHOME\n", p)
t.Setenv(common.EnvGnuPGHome, p)
t.Cleanup(func() {
err := os.RemoveAll(p)
if err != nil {
panic(err)
}
})
return p
}
func Test_GPG_InitializeGnuPG(t *testing.T) {
p := initTempDir(t)
// First run should initialize fine
err := InitializeGnuPG()
require.NoError(t, err)
// We should have exactly one public key with ultimate trust (our own) in the keyring
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, "ultimate", keys[0].Trust)
// During unit-tests, we need to also kill gpg-agent so we can create a new key.
// In real world scenario -- i.e. container crash -- gpg-agent is not running yet.
cmd := exec.CommandContext(t.Context(), "gpgconf", "--kill", "gpg-agent")
cmd.Env = []string{"GNUPGHOME=" + p}
err = cmd.Run()
require.NoError(t, err)
// Second run should not return error
err = InitializeGnuPG()
require.NoError(t, err)
keys, err = GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, "ultimate", keys[0].Trust)
t.Run("GNUPGHOME is a file", func(t *testing.T) {
f, err := os.CreateTemp(t.TempDir(), "gpg-test")
require.NoError(t, err)
defer os.Remove(f.Name())
// we need to error out
t.Setenv(common.EnvGnuPGHome, f.Name())
err = InitializeGnuPG()
assert.ErrorContains(t, err, "does not point to a directory")
})
t.Run("Unaccessible GNUPGHOME", func(t *testing.T) {
p := initTempDir(t)
fp := p + "/gpg"
err = os.Mkdir(fp, 0o000)
if err != nil {
panic(err.Error())
}
if err != nil {
panic(err.Error())
}
t.Setenv(common.EnvGnuPGHome, fp)
err := InitializeGnuPG()
require.Error(t, err)
// Restore permissions so path can be deleted
err = os.Chmod(fp, 0o700)
if err != nil {
panic(err.Error())
}
})
t.Run("GNUPGHOME with too wide permissions", func(t *testing.T) {
// We do not expect an error here, because of openshift's random UIDs that
// forced us to use an emptyDir mount (#4127)
p := initTempDir(t)
err := os.Chmod(p, 0o777)
if err != nil {
panic(err.Error())
}
t.Setenv(common.EnvGnuPGHome, p)
err = InitializeGnuPG()
require.NoError(t, err)
})
}
func Test_GPG_KeyManagement(t *testing.T) {
initTempDir(t)
err := InitializeGnuPG()
require.NoError(t, err)
// Import a single good key
keys, err := ImportPGPKeys("testdata/github.asc")
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, "4AEE18F83AFDEB23", keys[0].KeyID)
assert.Contains(t, keys[0].Owner, "[email protected]")
assert.Equal(t, "unknown", keys[0].Trust)
assert.Equal(t, "unknown", keys[0].SubType)
kids := make([]string, 0)
importedKeyId := keys[0].KeyID
// We should have a total of 2 keys in the keyring now
{
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 2)
}
// We should now have that key in our keyring with unknown trust (trustdb not updated)
{
keys, err := GetInstalledPGPKeys([]string{importedKeyId})
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, "4AEE18F83AFDEB23", keys[0].KeyID)
assert.Contains(t, keys[0].Owner, "[email protected]")
assert.Equal(t, "unknown", keys[0].Trust)
assert.Equal(t, "rsa2048", keys[0].SubType)
kids = append(kids, keys[0].Fingerprint)
}
assert.Len(t, kids, 1)
// Set trust level for our key and check the result
{
err := SetPGPTrustLevelById(kids, "ultimate")
require.NoError(t, err)
keys, err := GetInstalledPGPKeys(kids)
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, kids[0], keys[0].Fingerprint)
assert.Equal(t, "ultimate", keys[0].Trust)
}
// Import garbage - error expected
keys, err = ImportPGPKeys("testdata/garbage.asc")
require.Error(t, err)
assert.Empty(t, keys)
// We should still have a total of 2 keys in the keyring now
{
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 2)
}
// Delete previously imported public key
{
err := DeletePGPKey(importedKeyId)
require.NoError(t, err)
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 1)
}
// Delete non-existing key
{
err := DeletePGPKey(importedKeyId)
require.Error(t, err)
}
// Import multiple keys
{
keys, err := ImportPGPKeys("testdata/multi.asc")
require.NoError(t, err)
assert.Len(t, keys, 2)
assert.Contains(t, keys[0].Owner, "[email protected]")
assert.Contains(t, keys[1].Owner, "[email protected]")
}
// Check if they were really imported
{
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 3)
}
}
func Test_ImportPGPKeysFromString(t *testing.T) {
initTempDir(t)
err := InitializeGnuPG()
require.NoError(t, err)
// Import a single good key
keys, err := ImportPGPKeysFromString(test.MustLoadFileToString("testdata/github.asc"))
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, "4AEE18F83AFDEB23", keys[0].KeyID)
assert.Contains(t, keys[0].Owner, "[email protected]")
assert.Equal(t, "unknown", keys[0].Trust)
assert.Equal(t, "unknown", keys[0].SubType)
}
func Test_ValidateGPGKeysFromString(t *testing.T) {
initTempDir(t)
err := InitializeGnuPG()
require.NoError(t, err)
{
keyData := test.MustLoadFileToString("testdata/github.asc")
keys, err := ValidatePGPKeysFromString(keyData)
require.NoError(t, err)
assert.Len(t, keys, 1)
}
{
keyData := test.MustLoadFileToString("testdata/multi.asc")
keys, err := ValidatePGPKeysFromString(keyData)
require.NoError(t, err)
assert.Len(t, keys, 2)
}
{
keyData := test.MustLoadFileToString("testdata/unicode.asc")
keys, err := ValidatePGPKeysFromString(keyData)
require.NoError(t, err)
require.Len(t, keys, 1)
assert.Equal(t, "Zoë Müller-Назаров 测试 🔑 (UTF-8 charset demo) <[email protected]>", keys["EC0FA32DE8FEECFA"].Owner)
}
}
func Test_ValidateGPGKeys(t *testing.T) {
initTempDir(t)
err := InitializeGnuPG()
require.NoError(t, err)
// Validation good case - 1 key
{
keys, err := ValidatePGPKeys("testdata/github.asc")
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Contains(t, keys, "4AEE18F83AFDEB23")
}
// Validation bad case
{
keys, err := ValidatePGPKeys("testdata/garbage.asc")
require.Error(t, err)
assert.Empty(t, keys)
}
// We should still have a total of 1 keys in the keyring now
{
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 1)
}
}
func Test_GetGnuPGHomePath(t *testing.T) {
t.Run("empty", func(t *testing.T) {
t.Setenv(common.EnvGnuPGHome, "")
p := common.GetGnuPGHomePath()
assert.Equal(t, common.DefaultGnuPgHomePath, p)
})
t.Run("tempdir", func(t *testing.T) {
t.Setenv(common.EnvGnuPGHome, "/tmp/gpghome")
p := common.GetGnuPGHomePath()
assert.Equal(t, "/tmp/gpghome", p)
})
}
func Test_KeyID(t *testing.T) {
// Good case - long key ID (aka fingerprint) to short key ID
{
res, err := KeyID(longKeyID)
require.NoError(t, err)
assert.Equal(t, shortKeyID, res)
}
// Good case - short key ID remains same
{
res, err := KeyID(shortKeyID)
require.NoError(t, err)
assert.Equal(t, shortKeyID, res)
}
// Bad case - key ID too short
{
keyID := "AEE18F83AFDEB23"
res, err := KeyID(keyID)
require.Error(t, err)
assert.Empty(t, res)
}
// Bad case - key ID too long
{
keyID := "5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB2323"
res, err := KeyID(keyID)
require.Error(t, err)
assert.Empty(t, res)
}
// Bad case - right length, but not hex string
{
keyID := "abcdefghijklmn"
res, err := KeyID(keyID)
require.Error(t, err)
assert.Empty(t, res)
}
}
func Test_IsShortKeyID(t *testing.T) {
assert.True(t, IsShortKeyID(shortKeyID))
assert.False(t, IsShortKeyID(longKeyID))
assert.False(t, IsShortKeyID("ab"))
}
func Test_IsLongKeyID(t *testing.T) {
assert.True(t, IsLongKeyID(longKeyID))
assert.False(t, IsLongKeyID(shortKeyID))
assert.False(t, IsLongKeyID(longKeyID+"a"))
}
func Test_isHexString(t *testing.T) {
assert.True(t, isHexString("ab0099"))
assert.True(t, isHexString("AB0099"))
assert.False(t, isHexString("foobar"))
}
func Test_IsSecretKey(t *testing.T) {
initTempDir(t)
// First run should initialize fine
err := InitializeGnuPG()
require.NoError(t, err)
// We should have exactly one public key with ultimate trust (our own) in the keyring
keys, err := GetInstalledPGPKeys(nil)
require.NoError(t, err)
assert.Len(t, keys, 1)
assert.Equal(t, "ultimate", keys[0].Trust)
{
secret, err := IsSecretKey(keys[0].KeyID)
require.NoError(t, err)
assert.True(t, secret)
}
{
secret, err := IsSecretKey("invalid")
require.NoError(t, err)
assert.False(t, secret)
}
}
func Test_SyncKeyRingFromDirectory(t *testing.T) {
initTempDir(t)
// First run should initialize fine
err := InitializeGnuPG()
require.NoError(t, err)
tempDir := t.TempDir()
{
newKeys, removed, err := SyncKeyRingFromDirectory(tempDir)
require.NoError(t, err)
assert.Empty(t, newKeys)
assert.Empty(t, removed)
}
{
for k, v := range syncTestSources {
src, err := os.Open(v)
if err != nil {
panic(err.Error())
}
defer src.Close()
dst, err := os.Create(path.Join(tempDir, k))
if err != nil {
panic(err.Error())
}
defer dst.Close()
_, err = io.Copy(dst, src)
if err != nil {
panic(err.Error())
}
dst.Close()
}
newKeys, removed, err := SyncKeyRingFromDirectory(tempDir)
require.NoError(t, err)
assert.Len(t, newKeys, 3)
assert.Empty(t, removed)
installed, err := GetInstalledPGPKeys(newKeys)
require.NoError(t, err)
for _, k := range installed {
assert.Contains(t, newKeys, k.KeyID)
}
}
{
err := os.Remove(path.Join(tempDir, "4AEE18F83AFDEB23"))
if err != nil {
panic(err.Error())
}
newKeys, removed, err := SyncKeyRingFromDirectory(tempDir)
require.NoError(t, err)
assert.Empty(t, newKeys)
assert.Len(t, removed, 1)
installed, err := GetInstalledPGPKeys(newKeys)
require.NoError(t, err)
for _, k := range installed {
assert.NotEqual(t, k.KeyID, removed[0])
}
}
}