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]>
254 lines
7.3 KiB
Go
254 lines
7.3 KiB
Go
package commands
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/rest"
|
|
"k8s.io/client-go/tools/clientcmd"
|
|
|
|
cmdutil "github.com/hanzoai/deploy/cmd/util"
|
|
argocdclient "github.com/hanzoai/deploy/pkg/apiclient"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
func Test_getQueryBySelector(t *testing.T) {
|
|
query := getQueryBySelector("my-cluster")
|
|
assert.Equal(t, "my-cluster", query.Name)
|
|
assert.Empty(t, query.Server)
|
|
|
|
query = getQueryBySelector("http://my-server")
|
|
assert.Empty(t, query.Name)
|
|
assert.Equal(t, "http://my-server", query.Server)
|
|
|
|
query = getQueryBySelector("https://my-server")
|
|
assert.Empty(t, query.Name)
|
|
assert.Equal(t, "https://my-server", query.Server)
|
|
}
|
|
|
|
func Test_printClusterTable(_ *testing.T) {
|
|
printClusterTable([]v1alpha1.Cluster{
|
|
{
|
|
Server: "my-server",
|
|
Name: "my-name",
|
|
Config: v1alpha1.ClusterConfig{
|
|
Username: "my-username",
|
|
Password: "my-password",
|
|
BearerToken: "my-bearer-token",
|
|
TLSClientConfig: v1alpha1.TLSClientConfig{},
|
|
AWSAuthConfig: nil,
|
|
DisableCompression: false,
|
|
},
|
|
Info: v1alpha1.ClusterInfo{
|
|
ConnectionState: v1alpha1.ConnectionState{
|
|
Status: "my-status",
|
|
Message: "my-message",
|
|
ModifiedAt: &metav1.Time{},
|
|
},
|
|
ServerVersion: "my-version",
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func Test_getRestConfig(t *testing.T) {
|
|
type args struct {
|
|
pathOpts *clientcmd.PathOptions
|
|
ctxName string
|
|
}
|
|
pathOpts := &clientcmd.PathOptions{
|
|
GlobalFile: "./testdata/config",
|
|
LoadingRules: clientcmd.NewDefaultClientConfigLoadingRules(),
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
expected *rest.Config
|
|
wantErr bool
|
|
expectedErr string
|
|
}{
|
|
{
|
|
"Load config for context successfully",
|
|
args{
|
|
pathOpts,
|
|
"argocd2.example.com:443",
|
|
},
|
|
&rest.Config{Host: "argocd2.example.com:443"},
|
|
false,
|
|
"",
|
|
},
|
|
{
|
|
"Load config for current-context successfully",
|
|
args{
|
|
pathOpts,
|
|
"localhost:8080",
|
|
},
|
|
&rest.Config{Host: "localhost:8080"},
|
|
false,
|
|
"",
|
|
},
|
|
{
|
|
"Context not found",
|
|
args{
|
|
pathOpts,
|
|
"not-exist",
|
|
},
|
|
nil,
|
|
true,
|
|
"context not-exist does not exist in kubeconfig",
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := getRestConfig(tt.args.pathOpts, tt.args.ctxName)
|
|
if tt.wantErr {
|
|
require.EqualError(t, err, tt.expectedErr)
|
|
} else {
|
|
require.NoErrorf(t, err, "An unexpected error occurred during test %s", tt.name)
|
|
require.Equal(t, tt.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNewClusterAddCommand_ServerProxyUrlFlagRegistered(t *testing.T) {
|
|
pathOpts := clientcmd.NewDefaultPathOptions()
|
|
cmd := NewClusterAddCommand(&argocdclient.ClientOptions{}, pathOpts)
|
|
|
|
flag := cmd.Flags().Lookup("server-proxy-url")
|
|
require.NotNil(t, flag, "--server-proxy-url flag should be registered")
|
|
assert.Empty(t, flag.DefValue, "default value should be empty string")
|
|
assert.Contains(t, flag.Usage, "proxy", "usage should mention proxy")
|
|
}
|
|
|
|
func TestServerProxyUrlFlagChanged_EmptyStringIsExplicit(t *testing.T) {
|
|
pathOpts := clientcmd.NewDefaultPathOptions()
|
|
|
|
t.Run("flag not provided: Changed() returns false", func(t *testing.T) {
|
|
cmd := NewClusterAddCommand(&argocdclient.ClientOptions{}, pathOpts)
|
|
assert.False(t, cmd.Flags().Changed("server-proxy-url"))
|
|
})
|
|
|
|
t.Run("flag set to empty string: Changed() returns true", func(t *testing.T) {
|
|
cmd := NewClusterAddCommand(&argocdclient.ClientOptions{}, pathOpts)
|
|
err := cmd.Flags().Set("server-proxy-url", "")
|
|
require.NoError(t, err)
|
|
assert.True(t, cmd.Flags().Changed("server-proxy-url"), "Changed() must return true even for an explicit empty string")
|
|
})
|
|
|
|
t.Run("flag set to a URL: Changed() returns true", func(t *testing.T) {
|
|
cmd := NewClusterAddCommand(&argocdclient.ClientOptions{}, pathOpts)
|
|
err := cmd.Flags().Set("server-proxy-url", "https://proxy.example.com:3128")
|
|
require.NoError(t, err)
|
|
assert.True(t, cmd.Flags().Changed("server-proxy-url"))
|
|
})
|
|
}
|
|
|
|
func TestApplyServerProxyUrl_OverridesProxyFromKubeconfig(t *testing.T) {
|
|
initialProxy := "socks5://localhost:1234"
|
|
|
|
tests := []struct {
|
|
name string
|
|
serverProxyUrl string
|
|
flagChanged bool
|
|
expectedProxyUrl string
|
|
}{
|
|
{
|
|
name: "flag not provided: inherits kubeconfig proxy",
|
|
serverProxyUrl: "",
|
|
flagChanged: false,
|
|
expectedProxyUrl: initialProxy,
|
|
},
|
|
{
|
|
name: "flag set to empty string: clears proxy for server",
|
|
serverProxyUrl: "",
|
|
flagChanged: true,
|
|
expectedProxyUrl: "",
|
|
},
|
|
{
|
|
name: "flag set to different proxy URL: uses new proxy",
|
|
serverProxyUrl: "http://internal-proxy.corp:3128",
|
|
flagChanged: true,
|
|
expectedProxyUrl: "http://internal-proxy.corp:3128",
|
|
},
|
|
{
|
|
name: "flag set to same proxy: explicit override preserved",
|
|
serverProxyUrl: "socks5://localhost:1234",
|
|
flagChanged: true,
|
|
expectedProxyUrl: "socks5://localhost:1234",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
clst := &v1alpha1.Cluster{}
|
|
clst.Config.ProxyUrl = initialProxy
|
|
|
|
err := applyServerProxyOverride(tt.flagChanged, tt.serverProxyUrl, clst)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, tt.expectedProxyUrl, clst.Config.ProxyUrl)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestApplyServerProxyUrl_WhenKubeconfigHasNoProxy(t *testing.T) {
|
|
conf := &rest.Config{
|
|
Host: "https://192.0.2.1:6443",
|
|
Proxy: nil,
|
|
}
|
|
clst := cmdutil.NewCluster("test", nil, false, conf, "token", nil, nil, nil, nil)
|
|
|
|
assert.Empty(t, clst.Config.ProxyUrl, "no proxy should be set when kubeconfig has none and flag is absent")
|
|
}
|
|
|
|
func TestApplyServerProxyUrl_SetProxyWhenKubeconfigHasNone(t *testing.T) {
|
|
conf := &rest.Config{
|
|
Host: "https://192.0.2.1:6443",
|
|
Proxy: nil,
|
|
}
|
|
clst := cmdutil.NewCluster("test", nil, false, conf, "token", nil, nil, nil, nil)
|
|
|
|
proxyURL := "http://proxy:3128"
|
|
err := applyServerProxyOverride(true, proxyURL, clst)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, proxyURL, clst.Config.ProxyUrl)
|
|
}
|
|
|
|
func TestApplyServerProxyOverride_NoChange(t *testing.T) {
|
|
clst := &v1alpha1.Cluster{}
|
|
clst.Config.ProxyUrl = "keep"
|
|
|
|
err := applyServerProxyOverride(false, "ignored", clst)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "keep", clst.Config.ProxyUrl, "ProxyUrl should not change when flag not provided")
|
|
}
|
|
|
|
func TestApplyServerProxyOverride_ClearValue(t *testing.T) {
|
|
clst := &v1alpha1.Cluster{}
|
|
clst.Config.ProxyUrl = "old"
|
|
|
|
err := applyServerProxyOverride(true, "", clst)
|
|
require.NoError(t, err)
|
|
assert.Empty(t, clst.Config.ProxyUrl, "ProxyUrl should be cleared when empty string explicitly provided")
|
|
}
|
|
|
|
func TestApplyServerProxyOverride_SetValid(t *testing.T) {
|
|
clst := &v1alpha1.Cluster{}
|
|
|
|
err := applyServerProxyOverride(true, "http://proxy.example:8080", clst)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "http://proxy.example:8080", clst.Config.ProxyUrl, "ProxyUrl should be set to provided value")
|
|
}
|
|
|
|
func TestApplyServerProxyOverride_InvalidURL(t *testing.T) {
|
|
clst := &v1alpha1.Cluster{}
|
|
clst.Config.ProxyUrl = "old"
|
|
|
|
err := applyServerProxyOverride(true, "http//missing-colon", clst)
|
|
require.Error(t, err, "expected error for invalid proxy URL")
|
|
assert.Equal(t, "old", clst.Config.ProxyUrl, "ProxyUrl should not change on error")
|
|
}
|