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]>
256 lines
8.0 KiB
Go
256 lines
8.0 KiB
Go
package settings
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
)
|
|
|
|
func TestGetAccounts_NoAccountsConfigured(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), nil)
|
|
accounts, err := settingsManager.GetAccounts()
|
|
require.NoError(t, err)
|
|
|
|
adminAccount, ok := accounts[common.ArgoCDAdminUsername]
|
|
assert.True(t, ok)
|
|
assert.Equal(t, []AccountCapability{AccountCapabilityLogin}, adminAccount.Capabilities)
|
|
}
|
|
|
|
func TestGetAccounts_HasConfiguredAccounts(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), map[string]string{"accounts.test": "apiKey"}, func(secret *corev1.Secret) {
|
|
secret.Data["accounts.test.tokens"] = []byte(`[{"id":"123","iat":1583789194,"exp":1583789194}]`)
|
|
})
|
|
accounts, err := settingsManager.GetAccounts()
|
|
require.NoError(t, err)
|
|
|
|
acc, ok := accounts["test"]
|
|
assert.True(t, ok)
|
|
assert.ElementsMatch(t, []AccountCapability{AccountCapabilityApiKey}, acc.Capabilities)
|
|
assert.ElementsMatch(t, []Token{{ID: "123", IssuedAt: 1583789194, ExpiresAt: 1583789194}}, acc.Tokens)
|
|
assert.True(t, acc.Enabled)
|
|
}
|
|
|
|
func TestGetAccounts_DisableAccount(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), map[string]string{
|
|
"accounts.test": "apiKey",
|
|
"accounts.test.enabled": "false",
|
|
})
|
|
accounts, err := settingsManager.GetAccounts()
|
|
require.NoError(t, err)
|
|
|
|
acc, ok := accounts["test"]
|
|
assert.True(t, ok)
|
|
assert.False(t, acc.Enabled)
|
|
}
|
|
|
|
func TestGetAccount(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), map[string]string{
|
|
"accounts.test": "apiKey",
|
|
})
|
|
|
|
t.Run("ExistingUserName", func(t *testing.T) {
|
|
t.Parallel()
|
|
_, err := settingsManager.GetAccount("test")
|
|
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
t.Run("IncorrectName", func(t *testing.T) {
|
|
t.Parallel()
|
|
_, err := settingsManager.GetAccount("incorrect-name")
|
|
|
|
require.Error(t, err)
|
|
assert.Equal(t, codes.NotFound, status.Code(err))
|
|
})
|
|
}
|
|
|
|
func TestGetAccount_WithInvalidToken(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), map[string]string{
|
|
"accounts.user1": "apiKey",
|
|
"accounts.invaliduser": "apiKey",
|
|
"accounts.user2": "apiKey",
|
|
},
|
|
func(secret *corev1.Secret) {
|
|
secret.Data["accounts.user1.tokens"] = []byte(`[{"id":"1","iat":158378932,"exp":1583789194}]`)
|
|
},
|
|
func(secret *corev1.Secret) {
|
|
secret.Data["accounts.invaliduser.tokens"] = []byte("Invalid token")
|
|
},
|
|
func(secret *corev1.Secret) {
|
|
secret.Data["accounts.user2.tokens"] = []byte(`[{"id":"2","iat":1583789194,"exp":1583784545}]`)
|
|
},
|
|
)
|
|
|
|
_, err := settingsManager.GetAccounts()
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
func TestGetAdminAccount(t *testing.T) {
|
|
t.Parallel()
|
|
mTime := time.Now().Format(time.RFC3339)
|
|
_, settingsManager := fixtures(t.Context(), nil, func(secret *corev1.Secret) {
|
|
secret.Data["admin.password"] = []byte("admin-password")
|
|
secret.Data["admin.passwordMtime"] = []byte(mTime)
|
|
})
|
|
|
|
acc, err := settingsManager.GetAccount(common.ArgoCDAdminUsername)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "admin-password", acc.PasswordHash)
|
|
assert.Equal(t, mTime, acc.FormatPasswordMtime())
|
|
}
|
|
|
|
func TestFormatPasswordMtime_SuccessfullyFormatted(t *testing.T) {
|
|
t.Parallel()
|
|
mTime := time.Now()
|
|
acc := Account{PasswordMtime: &mTime}
|
|
assert.Equal(t, mTime.Format(time.RFC3339), acc.FormatPasswordMtime())
|
|
}
|
|
|
|
func TestFormatPasswordMtime_NoMtime(t *testing.T) {
|
|
t.Parallel()
|
|
acc := Account{}
|
|
assert.Empty(t, acc.FormatPasswordMtime())
|
|
}
|
|
|
|
func TestHasCapability(t *testing.T) {
|
|
t.Parallel()
|
|
acc := Account{Capabilities: []AccountCapability{AccountCapabilityApiKey}}
|
|
assert.True(t, acc.HasCapability(AccountCapabilityApiKey))
|
|
assert.False(t, acc.HasCapability(AccountCapabilityLogin))
|
|
}
|
|
|
|
func TestFormatCapabilities(t *testing.T) {
|
|
t.Parallel()
|
|
acc := Account{Capabilities: []AccountCapability{AccountCapabilityLogin, AccountCapabilityApiKey}}
|
|
assert.Equal(t, "login,apiKey", acc.FormatCapabilities())
|
|
}
|
|
|
|
func TestTokenIndex_TokenExists(t *testing.T) {
|
|
t.Parallel()
|
|
acc := Account{Tokens: []Token{{ID: "123"}, {ID: "456"}}}
|
|
index := acc.TokenIndex("456")
|
|
assert.Equal(t, 1, index)
|
|
}
|
|
|
|
func TestTokenIndex_TokenDoesNotExist(t *testing.T) {
|
|
t.Parallel()
|
|
acc := Account{Tokens: []Token{{ID: "123"}}}
|
|
index := acc.TokenIndex("456")
|
|
assert.Equal(t, -1, index)
|
|
}
|
|
|
|
func TestAddAccount_AccountAdded(t *testing.T) {
|
|
t.Parallel()
|
|
clientset, settingsManager := fixtures(t.Context(), nil)
|
|
mTime := time.Now()
|
|
addedAccount := Account{
|
|
Tokens: []Token{{ID: "123"}},
|
|
Capabilities: []AccountCapability{AccountCapabilityLogin},
|
|
Enabled: false,
|
|
PasswordHash: "hash",
|
|
PasswordMtime: &mTime,
|
|
}
|
|
err := settingsManager.AddAccount("test", addedAccount)
|
|
require.NoError(t, err)
|
|
|
|
cm, err := clientset.CoreV1().ConfigMaps("default").Get(t.Context(), common.ArgoCDConfigMapName, metav1.GetOptions{})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "login", cm.Data["accounts.test"])
|
|
assert.Equal(t, "false", cm.Data["accounts.test.enabled"])
|
|
|
|
secret, err := clientset.CoreV1().Secrets("default").Get(t.Context(), common.ArgoCDSecretName, metav1.GetOptions{})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "hash", string(secret.Data["accounts.test.password"]))
|
|
assert.Equal(t, mTime.Format(time.RFC3339), string(secret.Data["accounts.test.passwordMtime"]))
|
|
assert.JSONEq(t, `[{"id":"123","iat":0}]`, string(secret.Data["accounts.test.tokens"]))
|
|
}
|
|
|
|
func TestAddAccount_AlreadyExists(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), map[string]string{"accounts.test": "login"})
|
|
err := settingsManager.AddAccount("test", Account{})
|
|
require.Error(t, err)
|
|
}
|
|
|
|
func TestAddAccount_CannotAddAdmin(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), nil)
|
|
err := settingsManager.AddAccount("admin", Account{})
|
|
require.Error(t, err)
|
|
}
|
|
|
|
func TestUpdateAccount_SuccessfullyUpdated(t *testing.T) {
|
|
t.Parallel()
|
|
clientset, settingsManager := fixtures(t.Context(), map[string]string{"accounts.test": "login"})
|
|
mTime := time.Now()
|
|
|
|
err := settingsManager.UpdateAccount("test", func(account *Account) error {
|
|
account.Tokens = []Token{{ID: "123"}}
|
|
account.Capabilities = []AccountCapability{AccountCapabilityLogin}
|
|
account.Enabled = false
|
|
account.PasswordHash = "hash"
|
|
account.PasswordMtime = &mTime
|
|
return nil
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
cm, err := clientset.CoreV1().ConfigMaps("default").Get(t.Context(), common.ArgoCDConfigMapName, metav1.GetOptions{})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "login", cm.Data["accounts.test"])
|
|
assert.Equal(t, "false", cm.Data["accounts.test.enabled"])
|
|
|
|
secret, err := clientset.CoreV1().Secrets("default").Get(t.Context(), common.ArgoCDSecretName, metav1.GetOptions{})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "hash", string(secret.Data["accounts.test.password"]))
|
|
assert.Equal(t, mTime.Format(time.RFC3339), string(secret.Data["accounts.test.passwordMtime"]))
|
|
assert.JSONEq(t, `[{"id":"123","iat":0}]`, string(secret.Data["accounts.test.tokens"]))
|
|
}
|
|
|
|
func TestUpdateAccount_UpdateAdminPassword(t *testing.T) {
|
|
t.Parallel()
|
|
clientset, settingsManager := fixtures(t.Context(), nil)
|
|
mTime := time.Now()
|
|
|
|
err := settingsManager.UpdateAccount("admin", func(account *Account) error {
|
|
account.PasswordHash = "newPassword"
|
|
account.PasswordMtime = &mTime
|
|
return nil
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
secret, err := clientset.CoreV1().Secrets("default").Get(t.Context(), common.ArgoCDSecretName, metav1.GetOptions{})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "newPassword", string(secret.Data["admin.password"]))
|
|
assert.Equal(t, mTime.Format(time.RFC3339), string(secret.Data["admin.passwordMtime"]))
|
|
}
|
|
|
|
func TestUpdateAccount_AccountDoesNotExist(t *testing.T) {
|
|
t.Parallel()
|
|
_, settingsManager := fixtures(t.Context(), map[string]string{"accounts.test": "login"})
|
|
|
|
err := settingsManager.UpdateAccount("test1", func(account *Account) error {
|
|
account.Enabled = false
|
|
return nil
|
|
})
|
|
require.Error(t, err)
|
|
}
|