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]>
269 lines
7.9 KiB
Go
269 lines
7.9 KiB
Go
package e2e
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/health"
|
|
. "github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
. "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture/app"
|
|
)
|
|
|
|
// createTestPlugin creates a temporary Argo CD CLI plugin script for testing purposes.
|
|
// The script is written to a temporary directory with executable permissions.
|
|
func createTestPlugin(t *testing.T, name, content string) string {
|
|
t.Helper()
|
|
|
|
tmpDir := t.TempDir()
|
|
pluginPath := filepath.Join(tmpDir, "argocd-"+name)
|
|
|
|
require.NoError(t, os.WriteFile(pluginPath, []byte(content), 0o755))
|
|
|
|
// Ensure the plugin is cleaned up properly
|
|
t.Cleanup(func() {
|
|
_ = os.Remove(pluginPath)
|
|
})
|
|
|
|
return pluginPath
|
|
}
|
|
|
|
// TestCliAppCommand verifies the basic Argo CD CLI commands for app synchronization and listing.
|
|
func TestCliAppCommand(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("hook").
|
|
When().
|
|
CreateApp().
|
|
And(func() {
|
|
output, err := RunCli("app", "sync", ctx.AppName(), "--timeout", "90")
|
|
require.NoError(t, err)
|
|
vars := map[string]any{"Name": ctx.AppName(), "Namespace": ctx.DeploymentNamespace()}
|
|
assert.Contains(t, NormalizeOutput(output), Tmpl(t, `Pod {{.Namespace}} pod Synced Progressing pod/pod created`, vars))
|
|
assert.Contains(t, NormalizeOutput(output), Tmpl(t, `Pod {{.Namespace}} hook Succeeded Synced Sync pod/hook created`, vars))
|
|
}).
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
And(func(a *Application) {
|
|
output, err := RunCli("app", "list")
|
|
require.NoError(t, err)
|
|
expected := Tmpl(
|
|
t,
|
|
`{{.Name}} https://kubernetes.default.svc {{.Namespace}} default Synced Healthy Manual <none>`,
|
|
map[string]any{"Name": a.GetName(), "Namespace": ctx.DeploymentNamespace()})
|
|
assert.Contains(t, NormalizeOutput(output), expected)
|
|
})
|
|
}
|
|
|
|
// TestNormalArgoCDCommandsExecuteOverPluginsWithSameName verifies that normal Argo CD CLI commands
|
|
// take precedence over plugins with the same name when both exist in the path.
|
|
func TestNormalArgoCDCommandsExecuteOverPluginsWithSameName(t *testing.T) {
|
|
pluginScript := `#!/bin/bash
|
|
echo "I am a plugin, not Argo CD!"
|
|
exit 0`
|
|
|
|
pluginPath := createTestPlugin(t, "app", pluginScript)
|
|
|
|
origPath := os.Getenv("PATH")
|
|
t.Cleanup(func() {
|
|
t.Setenv("PATH", origPath)
|
|
})
|
|
t.Setenv("PATH", filepath.Dir(pluginPath)+":"+origPath)
|
|
|
|
ctx := Given(t)
|
|
ctx.Path("hook").
|
|
Path("hook").
|
|
When().
|
|
CreateApp().
|
|
And(func() {
|
|
output, err := RunCli("app", "sync", ctx.AppName(), "--timeout", "90")
|
|
require.NoError(t, err)
|
|
|
|
assert.NotContains(t, NormalizeOutput(output), "I am a plugin, not Argo CD!")
|
|
|
|
vars := map[string]any{"Name": ctx.AppName(), "Namespace": ctx.DeploymentNamespace()}
|
|
assert.Contains(t, NormalizeOutput(output), Tmpl(t, `Pod {{.Namespace}} pod Synced Progressing pod/pod created`, vars))
|
|
assert.Contains(t, NormalizeOutput(output), Tmpl(t, `Pod {{.Namespace}} hook Succeeded Synced Sync pod/hook created`, vars))
|
|
}).
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
And(func(_ *Application) {
|
|
output, err := RunCli("app", "list")
|
|
require.NoError(t, err)
|
|
|
|
assert.NotContains(t, NormalizeOutput(output), "I am a plugin, not Argo CD!")
|
|
|
|
expected := Tmpl(
|
|
t,
|
|
`{{.Name}} https://kubernetes.default.svc {{.Namespace}} default Synced Healthy Manual <none>`,
|
|
map[string]any{"Name": ctx.AppName(), "Namespace": ctx.DeploymentNamespace()})
|
|
assert.Contains(t, NormalizeOutput(output), expected)
|
|
})
|
|
}
|
|
|
|
// TestCliPluginExecution tests the execution of a valid Argo CD CLI plugin.
|
|
func TestCliPluginExecution(t *testing.T) {
|
|
pluginScript := `#!/bin/bash
|
|
echo "Hello from myplugin"
|
|
exit 0`
|
|
pluginPath := createTestPlugin(t, "myplugin", pluginScript)
|
|
|
|
origPath := os.Getenv("PATH")
|
|
t.Cleanup(func() {
|
|
t.Setenv("PATH", origPath)
|
|
})
|
|
t.Setenv("PATH", filepath.Dir(pluginPath)+":"+origPath)
|
|
|
|
output, err := RunPluginCli("", "myplugin")
|
|
require.NoError(t, err)
|
|
assert.Contains(t, NormalizeOutput(output), "Hello from myplugin")
|
|
}
|
|
|
|
// TestCliPluginExecutionConditions tests for plugin execution conditions
|
|
func TestCliPluginExecutionConditions(t *testing.T) {
|
|
createValidPlugin := func(t *testing.T, name string, executable bool) string {
|
|
t.Helper()
|
|
|
|
script := `#!/bin/bash
|
|
echo "Hello from $0"
|
|
exit 0
|
|
`
|
|
|
|
pluginPath := createTestPlugin(t, name, script)
|
|
|
|
if executable {
|
|
require.NoError(t, os.Chmod(pluginPath, 0o755))
|
|
} else {
|
|
require.NoError(t, os.Chmod(pluginPath, 0o644))
|
|
}
|
|
|
|
return pluginPath
|
|
}
|
|
|
|
createInvalidPlugin := func(t *testing.T, name string) string {
|
|
t.Helper()
|
|
|
|
script := `#!/bin/bash
|
|
echo "Hello from $0"
|
|
exit 0
|
|
`
|
|
|
|
tmpDir := t.TempDir()
|
|
pluginPath := filepath.Join(tmpDir, "argocd_"+name) // this is an invalid plugin name format
|
|
require.NoError(t, os.WriteFile(pluginPath, []byte(script), 0o755))
|
|
|
|
return pluginPath
|
|
}
|
|
|
|
// 'argocd-valid-plugin' is a valid plugin name
|
|
validPlugin := createValidPlugin(t, "valid-plugin", true)
|
|
// 'argocd_invalid-plugin' is an invalid plugin name
|
|
invalidPlugin := createInvalidPlugin(t, "invalid-plugin")
|
|
// 'argocd-nonexec-plugin' is a valid plugin name but lacks executable permissions
|
|
noExecPlugin := createValidPlugin(t, "noexec-plugin", false)
|
|
|
|
origPath := os.Getenv("PATH")
|
|
defer func() {
|
|
t.Setenv("PATH", origPath)
|
|
}()
|
|
t.Setenv("PATH", filepath.Dir(validPlugin)+":"+filepath.Dir(invalidPlugin)+":"+filepath.Dir(noExecPlugin)+":"+origPath)
|
|
|
|
output, err := RunPluginCli("", "valid-plugin")
|
|
require.NoError(t, err)
|
|
assert.Contains(t, NormalizeOutput(output), "Hello from")
|
|
|
|
_, err = RunPluginCli("", "invalid-plugin")
|
|
require.Error(t, err)
|
|
|
|
_, err = RunPluginCli("", "noexec-plugin")
|
|
// expects error since plugin lacks executable permissions
|
|
require.Error(t, err)
|
|
}
|
|
|
|
// TestCliPluginStatusCodes verifies that a plugin returns the correct exit codes based on its execution.
|
|
func TestCliPluginStatusCodes(t *testing.T) {
|
|
pluginScript := `#!/bin/bash
|
|
case "$1" in
|
|
"success") exit 0 ;;
|
|
"error1") exit 1 ;;
|
|
"error2") exit 2 ;;
|
|
*) echo "Unknown argument: $1"; exit 3 ;;
|
|
esac`
|
|
|
|
pluginPath := createTestPlugin(t, "error-plugin", pluginScript)
|
|
|
|
origPath := os.Getenv("PATH")
|
|
t.Cleanup(func() {
|
|
t.Setenv("PATH", origPath)
|
|
})
|
|
t.Setenv("PATH", filepath.Dir(pluginPath)+":"+origPath)
|
|
|
|
output, err := RunPluginCli("", "error-plugin", "success")
|
|
require.NoError(t, err)
|
|
assert.Contains(t, NormalizeOutput(output), "")
|
|
|
|
_, err = RunPluginCli("", "error-plugin", "error1")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "exit status 1")
|
|
|
|
_, err = RunPluginCli("", "error-plugin", "error2")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "exit status 2")
|
|
|
|
_, err = RunPluginCli("", "error-plugin", "unknown")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "exit status 3")
|
|
}
|
|
|
|
// TestCliPluginStdinHandling verifies that a CLI plugin correctly handles input from stdin.
|
|
func TestCliPluginStdinHandling(t *testing.T) {
|
|
pluginScript := `#!/bin/bash
|
|
input=$(cat)
|
|
echo "Received: $input"
|
|
exit 0`
|
|
|
|
pluginPath := createTestPlugin(t, "stdin-plugin", pluginScript)
|
|
|
|
origPath := os.Getenv("PATH")
|
|
t.Cleanup(func() {
|
|
t.Setenv("PATH", origPath)
|
|
})
|
|
t.Setenv("PATH", filepath.Dir(pluginPath)+":"+origPath)
|
|
|
|
testCases := []struct {
|
|
name string
|
|
stdin string
|
|
expected string
|
|
}{
|
|
{
|
|
"Single line input",
|
|
"Hello, ArgoCD!",
|
|
"Received: Hello, ArgoCD!",
|
|
},
|
|
{
|
|
"Multiline input",
|
|
"Line1\nLine2\nLine3",
|
|
"Received: Line1\nLine2\nLine3",
|
|
},
|
|
{
|
|
"Empty input",
|
|
"",
|
|
"Received:",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
output, err := RunPluginCli(tc.stdin, "stdin-plugin")
|
|
require.NoError(t, err)
|
|
assert.Contains(t, NormalizeOutput(output), tc.expected)
|
|
})
|
|
}
|
|
}
|