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]>
245 lines
7.9 KiB
Go
245 lines
7.9 KiB
Go
package cache
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/alicebob/miniredis/v2"
|
|
"github.com/redis/go-redis/v9"
|
|
"github.com/spf13/cobra"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
)
|
|
|
|
func TestAddCacheFlagsToCmd(t *testing.T) {
|
|
cache, err := AddCacheFlagsToCmd(&cobra.Command{})()
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 24*time.Hour, cache.client.(*redisCache).expiration)
|
|
}
|
|
|
|
func TestAddCacheFlagsToCmd_SentinelEnvDefaults(t *testing.T) {
|
|
t.Setenv("REDIS_SENTINEL_HOSTS", "redis1:26379,redis2:26379")
|
|
t.Setenv("REDIS_SENTINEL_MASTER", "mymaster")
|
|
|
|
cmd := &cobra.Command{}
|
|
AddCacheFlagsToCmd(cmd)
|
|
|
|
sentinel, err := cmd.Flags().GetStringArray("sentinel")
|
|
require.NoError(t, err)
|
|
|
|
master, err := cmd.Flags().GetString("sentinelmaster")
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t,
|
|
[]string{"redis1:26379", "redis2:26379"},
|
|
sentinel,
|
|
)
|
|
assert.Equal(t, "mymaster", master)
|
|
}
|
|
|
|
func TestAddCacheFlagsToCmd_SentinelFlagOverridesEnv(t *testing.T) {
|
|
t.Setenv("REDIS_SENTINEL_MASTER", "env-master")
|
|
t.Setenv("REDIS_SENTINEL_HOSTS", "env1:26379")
|
|
|
|
cmd := &cobra.Command{}
|
|
AddCacheFlagsToCmd(cmd)
|
|
|
|
err := cmd.Flags().Set("sentinelmaster", "flag-master")
|
|
require.NoError(t, err)
|
|
|
|
err = cmd.Flags().Set("sentinel", "flag1:26379")
|
|
require.NoError(t, err)
|
|
|
|
master, err := cmd.Flags().GetString("sentinelmaster")
|
|
require.NoError(t, err)
|
|
|
|
sentinel, err := cmd.Flags().GetStringArray("sentinel")
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "flag-master", master)
|
|
assert.Equal(t, []string{"flag1:26379"}, sentinel)
|
|
}
|
|
|
|
func TestAddCacheFlagsToCmd_SentinelDefaultValues(t *testing.T) {
|
|
cmd := &cobra.Command{}
|
|
AddCacheFlagsToCmd(cmd)
|
|
|
|
master, err := cmd.Flags().GetString("sentinelmaster")
|
|
require.NoError(t, err)
|
|
|
|
sentinel, err := cmd.Flags().GetStringArray("sentinel")
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "master", master)
|
|
assert.Equal(t, []string{}, sentinel)
|
|
}
|
|
|
|
func NewInMemoryRedis() (*redis.Client, func()) {
|
|
mr, err := miniredis.Run()
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return redis.NewClient(&redis.Options{Addr: mr.Addr()}), mr.Close
|
|
}
|
|
|
|
func TestCacheClient(t *testing.T) {
|
|
clientRedis, stopRedis := NewInMemoryRedis()
|
|
t.Cleanup(stopRedis)
|
|
redisCache := NewRedisCache(clientRedis, 5*time.Second, RedisCompressionNone)
|
|
clientMemCache := NewInMemoryCache(60 * time.Second)
|
|
twoLevelClient := NewTwoLevelClient(redisCache, 5*time.Second)
|
|
// Run tests for both Redis and InMemoryCache
|
|
for _, client := range []CacheClient{clientMemCache, redisCache, twoLevelClient} {
|
|
cache := NewCache(client)
|
|
t.Run("SetItem", func(t *testing.T) {
|
|
err := cache.SetItem("foo", "bar", &CacheActionOpts{Expiration: 60 * time.Second, DisableOverwrite: true, Delete: false})
|
|
require.NoError(t, err)
|
|
var output string
|
|
err = cache.GetItem("foo", &output)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "bar", output)
|
|
})
|
|
t.Run("SetCacheItem W/Disable Overwrite", func(t *testing.T) {
|
|
err := cache.SetItem("foo", "bar", &CacheActionOpts{Expiration: 60 * time.Second, DisableOverwrite: true, Delete: false})
|
|
require.NoError(t, err)
|
|
var output string
|
|
err = cache.GetItem("foo", &output)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "bar", output)
|
|
err = cache.SetItem("foo", "bar", &CacheActionOpts{Expiration: 60 * time.Second, DisableOverwrite: true, Delete: false})
|
|
require.NoError(t, err)
|
|
err = cache.GetItem("foo", &output)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "bar", output, "output should not have changed with DisableOverwrite set to true")
|
|
})
|
|
t.Run("GetItem", func(t *testing.T) {
|
|
var val string
|
|
err := cache.GetItem("foo", &val)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "bar", val)
|
|
})
|
|
t.Run("DeleteItem", func(t *testing.T) {
|
|
err := cache.SetItem("foo", "bar", &CacheActionOpts{Expiration: 0, Delete: true})
|
|
require.NoError(t, err)
|
|
var val string
|
|
err = cache.GetItem("foo", &val)
|
|
require.Error(t, err)
|
|
assert.Empty(t, val)
|
|
})
|
|
t.Run("Check for nil items", func(t *testing.T) {
|
|
err := cache.SetItem("foo", nil, &CacheActionOpts{Expiration: 0, Delete: true})
|
|
require.ErrorContains(t, err, "cannot set nil item")
|
|
err = cache.GetItem("foo", nil)
|
|
assert.ErrorContains(t, err, "cannot get item")
|
|
})
|
|
}
|
|
}
|
|
|
|
// Smoke test to ensure key changes aren't done accidentally
|
|
func TestGenerateCacheKey(t *testing.T) {
|
|
client := NewInMemoryCache(60 * time.Second)
|
|
cache := NewCache(client)
|
|
testKey := cache.generateFullKey("testkey")
|
|
assert.Equal(t, "testkey|"+common.CacheVersion, testKey)
|
|
}
|
|
|
|
// Test loading Redis credentials from a file
|
|
func TestLoadRedisCreds(t *testing.T) {
|
|
dir := t.TempDir()
|
|
// Helper to write a file
|
|
writeFile := func(name, content string) {
|
|
require.NoError(t, os.WriteFile(filepath.Join(dir, name), []byte(content), 0o400))
|
|
}
|
|
// Write all files
|
|
writeFile("auth", "mypassword\n")
|
|
writeFile("auth_username", "myuser")
|
|
writeFile("sentinel_username", "sentineluser")
|
|
writeFile("sentinel_auth", "sentinelpass")
|
|
|
|
username, password, sentinelUsername, sentinelPassword, err := loadRedisCreds(dir, Options{})
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "mypassword", password)
|
|
assert.Equal(t, "myuser", username)
|
|
assert.Equal(t, "sentineluser", sentinelUsername)
|
|
assert.Equal(t, "sentinelpass", sentinelPassword)
|
|
}
|
|
|
|
// Test loading Redis credentials from environment variables
|
|
func TestLoadRedisCredsFromEnv(t *testing.T) {
|
|
// Set environment variables
|
|
t.Setenv(envRedisPassword, "mypassword")
|
|
t.Setenv(envRedisUsername, "myuser")
|
|
t.Setenv(envRedisSentinelUsername, "sentineluser")
|
|
t.Setenv(envRedisSentinelPassword, "sentinelpass")
|
|
|
|
username, password, sentinelUsername, sentinelPassword, err := loadRedisCreds("", Options{})
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "mypassword", password)
|
|
assert.Equal(t, "myuser", username)
|
|
assert.Equal(t, "sentineluser", sentinelUsername)
|
|
assert.Equal(t, "sentinelpass", sentinelPassword)
|
|
}
|
|
|
|
// Test loading Redis credentials from both environment variables and a file
|
|
func TestLoadRedisCredsFromBothEnvAndFile(t *testing.T) {
|
|
// Set environment variables
|
|
t.Setenv(envRedisPassword, "mypassword")
|
|
t.Setenv(envRedisUsername, "myuser")
|
|
t.Setenv(envRedisSentinelUsername, "sentineluser")
|
|
t.Setenv(envRedisSentinelPassword, "sentinelpass")
|
|
|
|
dir := t.TempDir()
|
|
// Helper to write a file
|
|
writeFile := func(name, content string) {
|
|
require.NoError(t, os.WriteFile(filepath.Join(dir, name), []byte(content), 0o400))
|
|
}
|
|
// Write all files
|
|
writeFile("auth", "filepassword")
|
|
writeFile("auth_username", "fileuser")
|
|
writeFile("sentinel_username", "filesentineluser")
|
|
writeFile("sentinel_auth", "filesentinelpass")
|
|
|
|
username, password, sentinelUsername, sentinelPassword, err := loadRedisCreds(dir, Options{})
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "filepassword", password)
|
|
assert.Equal(t, "fileuser", username)
|
|
assert.Equal(t, "filesentineluser", sentinelUsername)
|
|
assert.Equal(t, "filesentinelpass", sentinelPassword)
|
|
}
|
|
|
|
func TestLoadRedisCreds_MountPathMissing(t *testing.T) {
|
|
_, _, _, _, err := loadRedisCreds("not_existing_path", Options{})
|
|
require.Error(t, err)
|
|
require.ErrorContains(t, err, "failed to access Redis credentials")
|
|
}
|
|
|
|
func TestCredentialFileHandling(t *testing.T) {
|
|
t.Run("ReadAuthDetailsFromFile_Missing", func(t *testing.T) {
|
|
dir := t.TempDir()
|
|
val, err := readAuthDetailsFromFile(dir, "not_existing_path")
|
|
require.NoError(t, err)
|
|
assert.Empty(t, val)
|
|
})
|
|
|
|
t.Run("ReadAuthDetailsFromFile_Unreadable", func(t *testing.T) {
|
|
dir := t.TempDir()
|
|
file := filepath.Join(dir, "auth")
|
|
require.NoError(t, os.WriteFile(file, []byte("value"), 0o000))
|
|
_, err := readAuthDetailsFromFile(dir, "auth")
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("ReadAuthDetailsFromFile_Normal", func(t *testing.T) {
|
|
dir := t.TempDir()
|
|
file := filepath.Join(dir, "auth")
|
|
require.NoError(t, os.WriteFile(file, []byte("value"), 0o400))
|
|
val, err := readAuthDetailsFromFile(dir, "auth")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "value", val)
|
|
})
|
|
}
|