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]>
210 lines
5.4 KiB
Go
210 lines
5.4 KiB
Go
package e2e
|
|
|
|
import (
|
|
"encoding/json"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
|
|
"github.com/hanzoai/deploy/cmd/argocd/commands/headless"
|
|
"github.com/hanzoai/deploy/pkg/apiclient/account"
|
|
"github.com/hanzoai/deploy/pkg/apiclient/session"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture"
|
|
accountFixture "github.com/hanzoai/deploy/test/e2e/fixture/account"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
jwtutil "github.com/hanzoai/deploy/util/jwt"
|
|
)
|
|
|
|
func TestCreateAndUseAccount(t *testing.T) {
|
|
ctx := accountFixture.Given(t)
|
|
ctx.
|
|
Name("test").
|
|
When().
|
|
Create().
|
|
Then().
|
|
And(func(account *account.Account, _ error) {
|
|
assert.Equal(t, account.Name, ctx.GetName())
|
|
assert.Equal(t, []string{"login"}, account.Capabilities)
|
|
}).
|
|
When().
|
|
Login().
|
|
Then().
|
|
CurrentUser(func(user *session.GetUserInfoResponse, _ error) {
|
|
assert.True(t, user.LoggedIn)
|
|
assert.Equal(t, user.Username, ctx.GetName())
|
|
})
|
|
}
|
|
|
|
func TestCanIGetLogsAllow(t *testing.T) {
|
|
ctx := accountFixture.Given(t)
|
|
ctx.
|
|
Name("test").
|
|
Project(ProjectName).
|
|
When().
|
|
Create().
|
|
Login().
|
|
SetPermissions([]ACL{
|
|
{
|
|
Resource: "logs",
|
|
Action: "get",
|
|
Scope: ProjectName + "/*",
|
|
},
|
|
{
|
|
Resource: "apps",
|
|
Action: "get",
|
|
Scope: ProjectName + "/*",
|
|
},
|
|
}, "log-viewer").
|
|
CanIGetLogs().
|
|
Then().
|
|
AndCLIOutput(func(output string, _ error) {
|
|
assert.Contains(t, output, "yes")
|
|
})
|
|
}
|
|
|
|
func TestCanIGetLogsDeny(t *testing.T) {
|
|
ctx := accountFixture.Given(t)
|
|
ctx.
|
|
Name("test").
|
|
When().
|
|
Create().
|
|
Login().
|
|
CanIGetLogs().
|
|
Then().
|
|
AndCLIOutput(func(output string, _ error) {
|
|
assert.Contains(t, output, "no")
|
|
})
|
|
}
|
|
|
|
func TestCreateAndUseAccountCLI(t *testing.T) {
|
|
EnsureCleanState(t)
|
|
|
|
output, err := RunCli("account", "list")
|
|
errors.CheckError(err)
|
|
|
|
assert.Equal(t, `NAME ENABLED CAPABILITIES
|
|
admin true login`, output)
|
|
|
|
errors.CheckError(SetAccounts(map[string][]string{
|
|
"test": {"login", "apiKey"},
|
|
}))
|
|
|
|
output, err = RunCli("account", "list")
|
|
errors.CheckError(err)
|
|
|
|
assert.Equal(t, `NAME ENABLED CAPABILITIES
|
|
admin true login
|
|
test true login, apiKey`, output)
|
|
|
|
token, err := RunCli("account", "generate-token", "--account", "test")
|
|
errors.CheckError(err)
|
|
|
|
clientOpts := ArgoCDClientset.ClientOptions()
|
|
clientOpts.AuthToken = token
|
|
testAccountClientset := headless.NewClientOrDie(&clientOpts, &cobra.Command{})
|
|
|
|
closer, client := testAccountClientset.NewSessionClientOrDie()
|
|
defer utilio.Close(closer)
|
|
|
|
info, err := client.GetUserInfo(t.Context(), &session.GetUserInfoRequest{})
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "test", info.Username)
|
|
}
|
|
|
|
func TestLoginBadCredentials(t *testing.T) {
|
|
EnsureCleanState(t)
|
|
|
|
closer, sessionClient := ArgoCDClientset.NewSessionClientOrDie()
|
|
defer utilio.Close(closer)
|
|
|
|
requests := []session.SessionCreateRequest{{
|
|
Username: "user-does-not-exist", Password: "some-password",
|
|
}, {
|
|
Username: "admin", Password: "bad-password",
|
|
}}
|
|
|
|
for _, r := range requests {
|
|
_, err := sessionClient.Create(t.Context(), &r)
|
|
require.Error(t, err)
|
|
errStatus, ok := status.FromError(err)
|
|
if !assert.True(t, ok) {
|
|
return
|
|
}
|
|
assert.Equal(t, codes.Unauthenticated, errStatus.Code())
|
|
assert.Equal(t, "Invalid username or password", errStatus.Message())
|
|
}
|
|
}
|
|
|
|
func TestAccountSessionToken(t *testing.T) {
|
|
// Create a unique temporary config directory for this test to support parallel execution
|
|
tmpDir := t.TempDir()
|
|
configPath := filepath.Join(tmpDir, "config")
|
|
|
|
ctx := accountFixture.Given(t)
|
|
ctx.
|
|
Name("test").
|
|
ConfigPath(configPath).
|
|
When().
|
|
Create().
|
|
CLILogin().
|
|
SessionToken().
|
|
Then().
|
|
AndCLIOutput(func(output string, err error) {
|
|
require.NoError(t, err, "session-token command should succeed")
|
|
|
|
// Verify token is not empty and is a valid JWT format
|
|
token := strings.TrimSpace(output)
|
|
assert.NotEmpty(t, token)
|
|
assert.True(t, jwtutil.IsValid(token), "Token should be a valid JWT format")
|
|
|
|
// Verify the token can be used for authentication
|
|
clientOpts := ArgoCDClientset.ClientOptions()
|
|
clientOpts.AuthToken = token
|
|
testAccountClientset := headless.NewClientOrDie(&clientOpts, &cobra.Command{})
|
|
|
|
closer, client := testAccountClientset.NewSessionClientOrDie()
|
|
defer utilio.Close(closer)
|
|
|
|
info, err := client.GetUserInfo(t.Context(), &session.GetUserInfoRequest{})
|
|
require.NoError(t, err)
|
|
|
|
// Verify the token belongs to the test user
|
|
assert.Equal(t, ctx.GetName(), info.Username)
|
|
assert.True(t, info.LoggedIn)
|
|
}).
|
|
When().
|
|
SessionTokenJSON().
|
|
Then().
|
|
AndCLIOutput(func(output string, err error) {
|
|
require.NoError(t, err, "session-token with JSON output should succeed")
|
|
|
|
// Parse JSON output
|
|
var tokenInfo map[string]any
|
|
err = json.Unmarshal([]byte(output), &tokenInfo)
|
|
require.NoError(t, err, "JSON output should be valid")
|
|
|
|
// Verify JSON fields exist
|
|
assert.Contains(t, tokenInfo, "token")
|
|
assert.Contains(t, tokenInfo, "type")
|
|
assert.Contains(t, tokenInfo, "issuer")
|
|
assert.Contains(t, tokenInfo, "username")
|
|
assert.Contains(t, tokenInfo, "has_refresh_token")
|
|
|
|
// Verify token type is local
|
|
assert.Equal(t, "local", tokenInfo["type"])
|
|
|
|
// Verify username
|
|
username, ok := tokenInfo["username"].(string)
|
|
require.True(t, ok, "username should be a string")
|
|
assert.Equal(t, ctx.GetName(), username)
|
|
})
|
|
}
|