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]>
220 lines
5.8 KiB
Go
220 lines
5.8 KiB
Go
package application
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/kubernetes/fake"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/util/assets"
|
|
"github.com/hanzoai/deploy/util/rbac"
|
|
|
|
"github.com/golang-jwt/jwt/v5"
|
|
"github.com/gorilla/websocket"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func newTestTerminalSession(w http.ResponseWriter, r *http.Request) terminalSession {
|
|
upgrader := websocket.Upgrader{}
|
|
c, err := upgrader.Upgrade(w, r, nil)
|
|
if err != nil {
|
|
return terminalSession{}
|
|
}
|
|
|
|
return terminalSession{wsConn: c}
|
|
}
|
|
|
|
func newEnforcer() *rbac.Enforcer {
|
|
additionalConfig := make(map[string]string, 0)
|
|
kubeclientset := fake.NewClientset(&corev1.ConfigMap{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "argocd-cm",
|
|
Labels: map[string]string{
|
|
"app.kubernetes.io/part-of": "argocd",
|
|
},
|
|
},
|
|
Data: additionalConfig,
|
|
}, &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "argocd-secret",
|
|
Namespace: testNamespace,
|
|
},
|
|
Data: map[string][]byte{
|
|
"admin.password": []byte("test"),
|
|
"server.secretkey": []byte("test"),
|
|
},
|
|
})
|
|
|
|
enforcer := rbac.NewEnforcer(kubeclientset, testNamespace, common.ArgoCDRBACConfigMapName, nil)
|
|
return enforcer
|
|
}
|
|
|
|
func reconnect(w http.ResponseWriter, r *http.Request) {
|
|
ts := newTestTerminalSession(w, r)
|
|
_, _ = ts.reconnect()
|
|
}
|
|
|
|
func TestReconnect(t *testing.T) {
|
|
t.Parallel()
|
|
s := httptest.NewServer(http.HandlerFunc(reconnect))
|
|
defer s.Close()
|
|
|
|
u := "ws" + strings.TrimPrefix(s.URL, "http")
|
|
|
|
// Connect to the server
|
|
ws, _, err := websocket.DefaultDialer.Dial(u, nil)
|
|
require.NoError(t, err)
|
|
|
|
defer ws.Close()
|
|
|
|
_, p, _ := ws.ReadMessage()
|
|
|
|
var message TerminalMessage
|
|
|
|
err = json.Unmarshal(p, &message)
|
|
|
|
require.NoError(t, err)
|
|
assert.Equal(t, ReconnectMessage, message.Data)
|
|
}
|
|
|
|
func testServerConnection(t *testing.T, testFunc func(w http.ResponseWriter, r *http.Request), expectPermissionDenied bool) {
|
|
t.Helper()
|
|
s := httptest.NewServer(http.HandlerFunc(testFunc))
|
|
defer s.Close()
|
|
|
|
u := "ws" + strings.TrimPrefix(s.URL, "http")
|
|
|
|
// Connect to the server
|
|
ws, _, err := websocket.DefaultDialer.Dial(u, nil)
|
|
require.NoError(t, err)
|
|
|
|
defer ws.Close()
|
|
if expectPermissionDenied {
|
|
_, p, _ := ws.ReadMessage()
|
|
|
|
var message TerminalMessage
|
|
|
|
err = json.Unmarshal(p, &message)
|
|
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "Permission denied", message.Data)
|
|
}
|
|
}
|
|
|
|
func TestVerifyAndReconnectDisableAuthTrue(t *testing.T) {
|
|
t.Parallel()
|
|
validate := func(w http.ResponseWriter, r *http.Request) {
|
|
ts := newTestTerminalSession(w, r)
|
|
// Currently testing only the usecase of disableAuth: true since the disableAuth: false case
|
|
// requires a valid token to be passed in the request.
|
|
// Note that running with disableAuth: false will surprisingly succeed as well, because
|
|
// the underlying token nil pointer dereference is swallowed in a location I didn't find,
|
|
// or even swallowed by the test framework.
|
|
ts.terminalOpts = &TerminalOptions{DisableAuth: true}
|
|
code, err := ts.performValidationsAndReconnect([]byte{})
|
|
assert.Equal(t, 0, code)
|
|
require.NoError(t, err)
|
|
}
|
|
testServerConnection(t, validate, false)
|
|
}
|
|
|
|
func TestValidateWithAdminPermissions(t *testing.T) {
|
|
t.Parallel()
|
|
validate := func(w http.ResponseWriter, r *http.Request) {
|
|
enf := newEnforcer()
|
|
_ = enf.SetBuiltinPolicy(assets.BuiltinPolicyCSV)
|
|
enf.SetDefaultRole("role:admin")
|
|
enf.SetClaimsEnforcerFunc(func(_ jwt.Claims, _ ...any) bool {
|
|
return true
|
|
})
|
|
ts := newTestTerminalSession(w, r)
|
|
ts.terminalOpts = &TerminalOptions{Enf: enf}
|
|
ts.appRBACName = "test"
|
|
//nolint:staticcheck
|
|
ts.ctx = context.WithValue(t.Context(), "claims", &jwt.MapClaims{"groups": []string{"admin"}})
|
|
_, err := ts.validatePermissions([]byte{})
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
testServerConnection(t, validate, false)
|
|
}
|
|
|
|
func TestValidateWithoutPermissions(t *testing.T) {
|
|
t.Parallel()
|
|
validate := func(w http.ResponseWriter, r *http.Request) {
|
|
enf := newEnforcer()
|
|
_ = enf.SetBuiltinPolicy(assets.BuiltinPolicyCSV)
|
|
enf.SetDefaultRole("role:test")
|
|
enf.SetClaimsEnforcerFunc(func(_ jwt.Claims, _ ...any) bool {
|
|
return false
|
|
})
|
|
ts := newTestTerminalSession(w, r)
|
|
ts.terminalOpts = &TerminalOptions{Enf: enf}
|
|
ts.appRBACName = "test"
|
|
//nolint:staticcheck
|
|
ts.ctx = context.WithValue(t.Context(), "claims", &jwt.MapClaims{"groups": []string{"test"}})
|
|
_, err := ts.validatePermissions([]byte{})
|
|
require.Error(t, err)
|
|
assert.EqualError(t, err, common.PermissionDeniedAPIError.Error())
|
|
}
|
|
|
|
testServerConnection(t, validate, true)
|
|
}
|
|
|
|
func TestTerminalSession_Write(t *testing.T) {
|
|
t.Parallel()
|
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
upgrader := websocket.Upgrader{}
|
|
conn, err := upgrader.Upgrade(w, r, nil)
|
|
require.NoError(t, err)
|
|
defer conn.Close()
|
|
|
|
for {
|
|
// Read the message from the WebSocket connection
|
|
messageType, message, err := conn.ReadMessage()
|
|
if err != nil {
|
|
return
|
|
}
|
|
// Respond back the same message
|
|
err = conn.WriteMessage(messageType, message)
|
|
require.NoError(t, err)
|
|
}
|
|
}))
|
|
defer server.Close()
|
|
|
|
u := "ws" + strings.TrimPrefix(server.URL, "http")
|
|
wsConn, _, err := websocket.DefaultDialer.Dial(u, nil)
|
|
require.NoError(t, err)
|
|
defer wsConn.Close()
|
|
|
|
ts := terminalSession{
|
|
wsConn: wsConn,
|
|
}
|
|
|
|
testData := []byte("hello world")
|
|
expectedMessage, err := json.Marshal(TerminalMessage{
|
|
Operation: "stdout",
|
|
Data: string(testData),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
n, err := ts.Write(testData)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, len(testData), n)
|
|
|
|
_, receivedMessage, err := wsConn.ReadMessage()
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, expectedMessage, receivedMessage)
|
|
}
|