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]>
271 lines
9.6 KiB
Go
271 lines
9.6 KiB
Go
package commands
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/ecdsa"
|
|
"crypto/elliptic"
|
|
"crypto/rand"
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
"fmt"
|
|
"math/big"
|
|
"net"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/grpc"
|
|
grpccreds "google.golang.org/grpc/credentials"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
argocdclient "github.com/hanzoai/deploy/pkg/apiclient"
|
|
"github.com/hanzoai/deploy/util/localconfig"
|
|
)
|
|
|
|
func TestLogout(t *testing.T) {
|
|
// Write the test config file
|
|
err := os.WriteFile(testConfigFilePath, []byte(testConfig), os.ModePerm)
|
|
require.NoError(t, err)
|
|
defer os.Remove(testConfigFilePath)
|
|
|
|
err = os.Chmod(testConfigFilePath, 0o600)
|
|
require.NoError(t, err)
|
|
|
|
localConfig, err := localconfig.ReadLocalConfig(testConfigFilePath)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "localhost:8080", localConfig.CurrentContext)
|
|
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "localhost:8080", Server: "localhost:8080", User: "localhost:8080"})
|
|
|
|
command := NewLogoutCommand(&argocdclient.ClientOptions{ConfigPath: testConfigFilePath})
|
|
command.Run(nil, []string{"localhost:8080"})
|
|
|
|
localConfig, err = localconfig.ReadLocalConfig(testConfigFilePath)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "localhost:8080", localConfig.CurrentContext)
|
|
assert.NotContains(t, localConfig.Users, localconfig.User{AuthToken: "vErrYS3c3tReFRe$hToken", Name: "localhost:8080"})
|
|
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "argocd1.example.com:443", Server: "argocd1.example.com:443", User: "argocd1.example.com:443"})
|
|
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "argocd2.example.com:443", Server: "argocd2.example.com:443", User: "argocd2.example.com:443"})
|
|
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "localhost:8080", Server: "localhost:8080", User: "localhost:8080"})
|
|
}
|
|
|
|
func TestRevokeServerToken_EmptyToken(t *testing.T) {
|
|
res, err := revokeServerToken("http", "localhost:8080", "", false)
|
|
require.EqualError(t, err, "error getting token from local context file")
|
|
assert.Nil(t, res)
|
|
}
|
|
|
|
func TestRevokeServerToken_SuccessfulRequest(t *testing.T) {
|
|
var receivedCookie string
|
|
var receivedMethod string
|
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
receivedMethod = r.Method
|
|
cookie, err := r.Cookie(common.AuthCookieName)
|
|
if err == nil {
|
|
receivedCookie = cookie.Value
|
|
}
|
|
w.WriteHeader(http.StatusOK)
|
|
}))
|
|
defer server.Close()
|
|
|
|
// Strip the "http://" prefix to get the hostName
|
|
hostName := server.Listener.Addr().String()
|
|
|
|
res, err := revokeServerToken("http", hostName, "test-token", false)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, http.StatusOK, res.StatusCode)
|
|
assert.Equal(t, http.MethodPost, receivedMethod)
|
|
assert.Equal(t, "test-token", receivedCookie)
|
|
}
|
|
|
|
func TestRevokeServerToken_ServerReturnsBadRequest(t *testing.T) {
|
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
|
|
w.WriteHeader(http.StatusBadRequest)
|
|
}))
|
|
defer server.Close()
|
|
|
|
hostName := server.Listener.Addr().String()
|
|
|
|
res, err := revokeServerToken("http", hostName, "test-token", false)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, http.StatusBadRequest, res.StatusCode)
|
|
}
|
|
|
|
func TestRevokeServerToken_InvalidURL(t *testing.T) {
|
|
// A hostname containing a control character produces an invalid URL,
|
|
// causing http.NewRequestWithContext to fail.
|
|
res, err := revokeServerToken("http", "invalid\x00host", "test-token", false)
|
|
require.Error(t, err)
|
|
assert.Nil(t, res)
|
|
assert.Contains(t, err.Error(), "invalid control character in URL")
|
|
}
|
|
|
|
func TestRevokeServerToken_InsecureTLS(t *testing.T) {
|
|
server := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
|
|
w.WriteHeader(http.StatusOK)
|
|
}))
|
|
defer server.Close()
|
|
|
|
hostName := server.Listener.Addr().String()
|
|
|
|
// Without insecure, the self-signed cert should cause a failure
|
|
res, err := revokeServerToken("https", hostName, "test-token", false)
|
|
require.Error(t, err)
|
|
assert.Nil(t, res)
|
|
|
|
// With insecure=true, should succeed despite self-signed cert
|
|
res, err = revokeServerToken("https", hostName, "test-token", true)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, http.StatusOK, res.StatusCode)
|
|
}
|
|
|
|
// createTestLocalConfig creates a temporary local config file with a single context
|
|
// pointing to the given address and returns the config file path.
|
|
func createTestLocalConfig(t *testing.T, addr string) string {
|
|
t.Helper()
|
|
configFile := filepath.Join(t.TempDir(), "config")
|
|
cfg := localconfig.LocalConfig{
|
|
CurrentContext: addr,
|
|
Contexts: []localconfig.ContextRef{{Name: addr, Server: addr, User: addr}},
|
|
Servers: []localconfig.Server{{Server: addr}},
|
|
Users: []localconfig.User{{Name: addr, AuthToken: "test-token"}},
|
|
}
|
|
err := localconfig.WriteLocalConfig(cfg, configFile)
|
|
require.NoError(t, err)
|
|
return configFile
|
|
}
|
|
|
|
// generateSelfSignedCert creates a self-signed TLS certificate for 127.0.0.1.
|
|
func generateSelfSignedCert(t *testing.T) tls.Certificate {
|
|
t.Helper()
|
|
key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
template := &x509.Certificate{
|
|
SerialNumber: big.NewInt(1),
|
|
NotBefore: time.Now(),
|
|
NotAfter: time.Now().Add(time.Hour),
|
|
IPAddresses: []net.IP{net.ParseIP("127.0.0.1")},
|
|
}
|
|
|
|
certDER, err := x509.CreateCertificate(rand.Reader, template, template, &key.PublicKey, key)
|
|
require.NoError(t, err)
|
|
|
|
return tls.Certificate{
|
|
Certificate: [][]byte{certDER},
|
|
PrivateKey: key,
|
|
}
|
|
}
|
|
|
|
// TestLogout_TLSCheckFails_AutoSetsPlainText verifies that when grpc_util.TestTLS
|
|
// returns an error (e.g., nothing listening), the logout command automatically
|
|
// switches to plain text and still completes the logout successfully.
|
|
func TestLogout_TLSCheckFails_AutoSetsPlainText(t *testing.T) {
|
|
// Listen on a random port, then close it immediately so nothing is listening.
|
|
// This causes grpc_util.TestTLS to fail, triggering the PlainText auto-set path.
|
|
lc := net.ListenConfig{}
|
|
lis, err := lc.Listen(t.Context(), "tcp", "127.0.0.1:0")
|
|
require.NoError(t, err, "Unable to start server")
|
|
addr := lis.Addr().String()
|
|
lis.Close()
|
|
|
|
configFile := createTestLocalConfig(t, addr)
|
|
|
|
// Verify token exists before logout
|
|
localCfg, err := localconfig.ReadLocalConfig(configFile)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "test-token", localCfg.GetToken(addr))
|
|
|
|
command := NewLogoutCommand(&argocdclient.ClientOptions{ConfigPath: configFile})
|
|
command.Run(nil, []string{addr})
|
|
|
|
// Verify token was removed despite TLS check failure
|
|
localCfg, err = localconfig.ReadLocalConfig(configFile)
|
|
require.NoError(t, err)
|
|
assert.Empty(t, localCfg.GetToken(addr))
|
|
}
|
|
|
|
// TestLogout_InsecureTLS_SetsInsecureFlag verifies that when the server has an
|
|
// insecure (self-signed) TLS certificate, the logout command detects it via
|
|
// grpc_util.TestTLS (which sets InsecureErr), prompts the user, and sets the
|
|
// Insecure flag to true before proceeding with logout.
|
|
func TestLogout_InsecureTLS_SetsInsecureFlag(t *testing.T) {
|
|
// Start a gRPC server with TLS credentials using a self-signed certificate.
|
|
// grpc_util.TestTLS will:
|
|
// 1. Connect with InsecureSkipVerify=true → succeeds (TLS=true)
|
|
// 2. Connect with InsecureSkipVerify=false → fails (InsecureErr set)
|
|
cert := generateSelfSignedCert(t)
|
|
|
|
lc := net.ListenConfig{}
|
|
lis, err := lc.Listen(t.Context(), "tcp", "127.0.0.1:0")
|
|
require.NoError(t, err, "Unable to start server")
|
|
|
|
serverCreds := grpccreds.NewServerTLSFromCert(&cert)
|
|
grpcServer := grpc.NewServer(grpc.Creds(serverCreds))
|
|
go func() {
|
|
err := grpcServer.Serve(lis)
|
|
require.NoError(t, err, "Unable to start the grpc server")
|
|
}()
|
|
defer grpcServer.Stop()
|
|
|
|
addr := lis.Addr().String()
|
|
|
|
// Mock os.Stdin to provide "y\n" for cli.AskToProceed (insecure cert warning).
|
|
oldStdin := os.Stdin
|
|
r, w, err := os.Pipe()
|
|
require.NoError(t, err)
|
|
_, err = w.WriteString("y\n")
|
|
require.NoError(t, err)
|
|
w.Close()
|
|
os.Stdin = r
|
|
defer func() { os.Stdin = oldStdin }()
|
|
|
|
configFile := createTestLocalConfig(t, addr)
|
|
|
|
// Verify token exists before logout
|
|
localCfg, err := localconfig.ReadLocalConfig(configFile)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "test-token", localCfg.GetToken(addr))
|
|
|
|
command := NewLogoutCommand(&argocdclient.ClientOptions{ConfigPath: configFile})
|
|
command.Run(nil, []string{addr})
|
|
|
|
// Verify token was removed after accepting the insecure cert warning
|
|
localCfg, err = localconfig.ReadLocalConfig(configFile)
|
|
require.NoError(t, err)
|
|
assert.Empty(t, localCfg.GetToken(addr))
|
|
}
|
|
|
|
// TestLogout_ConfigFileNotFound verifies that when the local config file does not
|
|
// exist, the logout command reports "Nothing to logout from" via log.Fatalf.
|
|
func TestLogout_ConfigFileNotFound(t *testing.T) {
|
|
// Point to a config path that does not exist.
|
|
configFile := filepath.Join(t.TempDir(), "nonexistent", "config")
|
|
|
|
// Override logrus ExitFunc so log.Fatalf panics instead of calling os.Exit,
|
|
// allowing us to verify the fatal message in the test.
|
|
origExitFunc := logrus.StandardLogger().ExitFunc
|
|
logrus.StandardLogger().ExitFunc = func(code int) {
|
|
panic(fmt.Sprintf("os.Exit(%d)", code))
|
|
}
|
|
defer func() { logrus.StandardLogger().ExitFunc = origExitFunc }()
|
|
|
|
// Capture log output to verify the error message.
|
|
var buf bytes.Buffer
|
|
origOutput := logrus.StandardLogger().Out
|
|
logrus.SetOutput(&buf)
|
|
defer logrus.SetOutput(origOutput)
|
|
|
|
assert.Panics(t, func() {
|
|
command := NewLogoutCommand(&argocdclient.ClientOptions{ConfigPath: configFile})
|
|
command.Run(nil, []string{"some-context"})
|
|
})
|
|
|
|
assert.Contains(t, buf.String(), "Nothing to logout from")
|
|
}
|