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]>
298 lines
9.0 KiB
Go
298 lines
9.0 KiB
Go
package session
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"crypto/rsa"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/oauth2-proxy/mockoidc"
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hanzoai/deploy/test/e2e/fixture"
|
|
"github.com/hanzoai/deploy/util/localconfig"
|
|
)
|
|
|
|
var (
|
|
// mockServer is a package-level singleton mock OIDC server shared across all tests.
|
|
mockServer *mockoidc.MockOIDC
|
|
mockServerOnce sync.Once
|
|
)
|
|
|
|
// Actions implements the "when" part of given/when/then for session/logout tests.
|
|
type Actions struct {
|
|
context *Context
|
|
|
|
// configPaths maps token names to per-token CLI config file paths
|
|
configPaths map[string]string
|
|
|
|
// tokenStore tracks named tokens read from CLI config files
|
|
tokenStore map[string]string
|
|
|
|
// lastOutput holds the stdout from the most recent CLI action
|
|
lastOutput string
|
|
|
|
// lastError holds the error from the most recent action
|
|
lastError error
|
|
}
|
|
|
|
// getTokenStore initializes the token store
|
|
func (a *Actions) getTokenStore() map[string]string {
|
|
if a.tokenStore == nil {
|
|
a.tokenStore = make(map[string]string)
|
|
}
|
|
return a.tokenStore
|
|
}
|
|
|
|
// getConfigPaths initializes the config paths map
|
|
func (a *Actions) getConfigPaths() map[string]string {
|
|
if a.configPaths == nil {
|
|
a.configPaths = make(map[string]string)
|
|
}
|
|
return a.configPaths
|
|
}
|
|
|
|
// configPathFor returns (or creates) a per-token temp config file path.
|
|
func (a *Actions) configPathFor(tokenName string) string {
|
|
a.context.T().Helper()
|
|
paths := a.getConfigPaths()
|
|
if p, ok := paths[tokenName]; ok {
|
|
return p
|
|
}
|
|
p := filepath.Join(a.context.T().TempDir(), tokenName+"-config")
|
|
paths[tokenName] = p
|
|
return p
|
|
}
|
|
|
|
func (a *Actions) getSharedMockOIDCServer() *mockoidc.MockOIDC {
|
|
mockServerOnce.Do(func() {
|
|
t := a.context.T()
|
|
// Create a fresh RSA Private Key for token signing
|
|
rsaKey, err := rsa.GenerateKey(rand.Reader, 2048)
|
|
require.NoError(t, err)
|
|
oidcPort := os.Getenv("ARGOCD_E2E_OIDC_PORT")
|
|
if oidcPort == "" {
|
|
oidcPort = "5556"
|
|
}
|
|
lc := net.ListenConfig{}
|
|
ctx, cancelFunc := context.WithTimeout(context.Background(), 60*time.Second)
|
|
defer cancelFunc()
|
|
ln, err := lc.Listen(ctx, "tcp", "localhost:"+oidcPort)
|
|
require.NoError(t, err)
|
|
mockServer, err = mockoidc.NewServer(rsaKey)
|
|
require.NoError(t, err)
|
|
err = mockServer.Start(ln, nil)
|
|
require.NoError(t, err)
|
|
t.Logf("OIDC server listening on %s", ln.Addr())
|
|
t.Cleanup(func() {
|
|
err := mockServer.Shutdown()
|
|
require.NoError(t, err, "error shutting down mock oidc server")
|
|
})
|
|
})
|
|
return mockServer
|
|
}
|
|
|
|
// WithDirectOIDC configures ArgoCD with oidc.config pointing directly to
|
|
// a shared mock OIDC server (bypassing Dex). Tests using this setup should
|
|
// use LoginWithSSO to mint OIDC tokens programmatically. This exercises the IDP
|
|
// token verification and revocation code path in SessionManager.VerifyToken.
|
|
func (a *Actions) WithDirectOIDC() *Actions {
|
|
a.context.T().Helper()
|
|
|
|
m := a.getSharedMockOIDCServer()
|
|
|
|
// Do NOT shut down the mock server in t.Cleanup. The API server's
|
|
// SessionManager caches the OIDC provider (mgr.prov) with this server's
|
|
// issuer URL. If we shut it down, subsequent tests would start a new
|
|
// server on a different port, causing issuer mismatch errors.
|
|
|
|
// Configure oidc.config in argocd-cm pointing to the mock OIDC server
|
|
oidcConfig := fmt.Sprintf("name: Mock OIDC\nissuer: %s\nclientID: %s\nclientSecret: %s\n",
|
|
m.Issuer(), m.Config().ClientID, m.Config().ClientSecret)
|
|
|
|
err := fixture.SetOIDCConfig(oidcConfig)
|
|
require.NoError(a.context.T(), err)
|
|
|
|
// Grant all users admin access so OIDC-authenticated users can call APIs
|
|
err = fixture.SetParamInRBACConfigMap("policy.default", "role:admin")
|
|
require.NoError(a.context.T(), err)
|
|
|
|
a.context.T().Logf("Direct OIDC Issuer: %s, ClientID: %s", m.Issuer(), m.Config().ClientID)
|
|
|
|
fixture.RestartAPIServer(a.context.T())
|
|
return a
|
|
}
|
|
|
|
// Login creates a new session as admin using the argocd CLI login command.
|
|
// Each token name gets its own isolated config file so multiple sessions
|
|
// can coexist without interfering with each other.
|
|
func (a *Actions) Login(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
|
|
cfgPath := a.configPathFor(tokenName)
|
|
|
|
output, err := fixture.RunCliWithConfigFile(cfgPath,
|
|
"login",
|
|
fixture.GetApiServerAddress(),
|
|
"--username", "admin",
|
|
"--password", fixture.AdminPassword,
|
|
"--skip-test-tls",
|
|
)
|
|
require.NoError(a.context.T(), err, "CLI login failed: %s", output)
|
|
|
|
// Read the token back from the config file
|
|
localCfg, err := localconfig.ReadLocalConfig(cfgPath)
|
|
require.NoError(a.context.T(), err)
|
|
require.NotNil(a.context.T(), localCfg)
|
|
|
|
token := localCfg.GetToken(localCfg.CurrentContext)
|
|
require.NotEmpty(a.context.T(), token, "no token found in config file after login")
|
|
|
|
a.getTokenStore()[tokenName] = token
|
|
return a
|
|
}
|
|
|
|
// Logout revokes the named token using the argocd CLI logout command.
|
|
// This triggers the full CLI logout flow including server-side token revocation.
|
|
func (a *Actions) Logout(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
|
|
cfgPath := a.getConfigPaths()[tokenName]
|
|
require.NotEmpty(a.context.T(), cfgPath, "config path for %q not found; call Login first", tokenName)
|
|
|
|
output, err := fixture.RunCliWithConfigFile(cfgPath,
|
|
"logout",
|
|
fixture.GetApiServerAddress(),
|
|
)
|
|
require.NoError(a.context.T(), err, "CLI logout failed: %s", output)
|
|
|
|
return a
|
|
}
|
|
|
|
// LoginWithSSO mints an OIDC token directly from the shared mock OIDC server,
|
|
// bypassing the normal browser-based SSO flow. Each call creates a unique user
|
|
// identity based on tokenName so multiple SSO sessions produce different tokens.
|
|
// This exercises the IDP token verification and revocation code path in
|
|
// SessionManager.VerifyToken.
|
|
func (a *Actions) LoginWithSSO(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
|
|
require.NotNil(a.context.T(), mockServer, "LoginWithSSO requires WithDirectOIDC (mockServer is nil)")
|
|
|
|
m := mockServer
|
|
|
|
// Create a unique user for each token name
|
|
user := &mockoidc.MockUser{
|
|
Subject: "sso-" + tokenName,
|
|
Email: tokenName + "@example.com",
|
|
EmailVerified: true,
|
|
PreferredUsername: tokenName,
|
|
Groups: []string{"admins"},
|
|
}
|
|
|
|
// Create a session on the mock OIDC server
|
|
session, err := m.SessionStore.NewSession(
|
|
"openid email profile groups",
|
|
"", // nonce
|
|
user,
|
|
"", // codeChallenge
|
|
"", // codeChallengeMethod
|
|
)
|
|
require.NoError(a.context.T(), err)
|
|
|
|
// Mint a signed ID token using the mock server's keypair
|
|
idToken, err := session.IDToken(
|
|
m.Config(),
|
|
m.Keypair,
|
|
m.Now(),
|
|
)
|
|
require.NoError(a.context.T(), err)
|
|
|
|
a.getTokenStore()[tokenName] = idToken
|
|
|
|
// Write a local config file so CLI logout can find and revoke this token
|
|
serverAddr := fixture.GetApiServerAddress()
|
|
cfgPath := a.configPathFor(tokenName)
|
|
localCfg := localconfig.LocalConfig{
|
|
CurrentContext: serverAddr,
|
|
Contexts: []localconfig.ContextRef{
|
|
{Name: serverAddr, Server: serverAddr, User: serverAddr},
|
|
},
|
|
Servers: []localconfig.Server{
|
|
{Server: serverAddr, PlainText: true, Insecure: true},
|
|
},
|
|
Users: []localconfig.User{
|
|
{Name: serverAddr, AuthToken: idToken},
|
|
},
|
|
}
|
|
err = localconfig.WriteLocalConfig(localCfg, cfgPath)
|
|
require.NoError(a.context.T(), err)
|
|
|
|
return a
|
|
}
|
|
|
|
// runCli executes an argocd CLI command using the named token and records
|
|
// the output and error for assertion in Then().
|
|
func (a *Actions) runCli(tokenName string, args ...string) {
|
|
a.context.T().Helper()
|
|
|
|
token := a.getTokenStore()[tokenName]
|
|
require.NotEmpty(a.context.T(), token, "token %q not found; call Login first", tokenName)
|
|
|
|
a.lastOutput, a.lastError = fixture.RunCliWithToken(token, args...)
|
|
}
|
|
|
|
// GetUserInfo calls "argocd account get-user-info" using the named token.
|
|
func (a *Actions) GetUserInfo(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
a.runCli(tokenName, "account", "get-user-info", "--grpc-web")
|
|
return a
|
|
}
|
|
|
|
// ListProjects calls "argocd proj list" using the named token.
|
|
func (a *Actions) ListProjects(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
a.runCli(tokenName, "proj", "list", "--grpc-web")
|
|
return a
|
|
}
|
|
|
|
// ListApplications calls "argocd app list" using the named token.
|
|
func (a *Actions) ListApplications(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
a.runCli(tokenName, "app", "list", "--grpc-web")
|
|
log.Debugf("[token: %s, output: %s, err: %s]", tokenName, a.lastOutput, a.lastError)
|
|
return a
|
|
}
|
|
|
|
// ListRepositories calls "argocd repo list" using the named token.
|
|
func (a *Actions) ListRepositories(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
a.runCli(tokenName, "repo", "list", "--grpc-web")
|
|
return a
|
|
}
|
|
|
|
// ListAccounts calls "argocd account list" using the named token.
|
|
func (a *Actions) ListAccounts(tokenName string) *Actions {
|
|
a.context.T().Helper()
|
|
a.runCli(tokenName, "account", "list")
|
|
return a
|
|
}
|
|
|
|
// Sleep pauses execution for the given duration.
|
|
func (a *Actions) Sleep(d time.Duration) *Actions {
|
|
time.Sleep(d)
|
|
return a
|
|
}
|
|
|
|
func (a *Actions) Then() *Consequences {
|
|
a.context.T().Helper()
|
|
time.Sleep(fixture.WhenThenSleepInterval)
|
|
return &Consequences{context: a.context, actions: a}
|
|
}
|