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]>
394 lines
11 KiB
Go
394 lines
11 KiB
Go
package argo
|
|
|
|
import (
|
|
"bytes"
|
|
"sync"
|
|
"testing"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/kubernetes/fake"
|
|
|
|
argoappv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
const (
|
|
_somecomponent = "somecomponent"
|
|
_test = "test"
|
|
_argocdNs = "argocd"
|
|
_targetNs = "target-namespace"
|
|
)
|
|
|
|
var testEnableEventLog = []string{_somecomponent, _test}
|
|
|
|
// logCaptureMutex ensures that only one captureLogEntries call can run at a time
|
|
// to prevent log entries from parallel test runs from ending up in wrong buffers
|
|
var logCaptureMutex sync.Mutex
|
|
|
|
// ThreadSafeBuffer wraps bytes.Buffer with a mutex to make it thread-safe
|
|
type ThreadSafeBuffer struct {
|
|
buf bytes.Buffer
|
|
mu sync.RWMutex
|
|
}
|
|
|
|
func (tsb *ThreadSafeBuffer) Write(p []byte) (n int, err error) {
|
|
tsb.mu.Lock()
|
|
defer tsb.mu.Unlock()
|
|
return tsb.buf.Write(p)
|
|
}
|
|
|
|
func (tsb *ThreadSafeBuffer) String() string {
|
|
tsb.mu.RLock()
|
|
defer tsb.mu.RUnlock()
|
|
return tsb.buf.String()
|
|
}
|
|
|
|
// Helper to capture log entries generated by the logger and return it as string
|
|
func captureLogEntries(run func()) string {
|
|
logCaptureMutex.Lock()
|
|
defer logCaptureMutex.Unlock()
|
|
|
|
f := log.StandardLogger().Formatter
|
|
log.SetFormatter(&log.TextFormatter{DisableColors: true})
|
|
defer log.SetFormatter(f)
|
|
|
|
output := &ThreadSafeBuffer{}
|
|
original := log.StandardLogger().Out
|
|
log.SetOutput(output)
|
|
defer log.SetOutput(original)
|
|
|
|
run()
|
|
|
|
return output.String()
|
|
}
|
|
|
|
func TestNewAuditLogger(t *testing.T) {
|
|
t.Parallel()
|
|
logger := NewAuditLogger(fake.NewClientset(), _argocdNs, _somecomponent, testEnableEventLog)
|
|
assert.NotNil(t, logger)
|
|
assert.Equal(t, _argocdNs, logger.namespace)
|
|
assert.Equal(t, _somecomponent, logger.component)
|
|
}
|
|
|
|
func TestLogAppProjEvent(t *testing.T) {
|
|
t.Parallel()
|
|
fakeClient := fake.NewClientset()
|
|
logger := NewAuditLogger(fakeClient, _argocdNs, _somecomponent, testEnableEventLog)
|
|
assert.NotNil(t, logger)
|
|
|
|
proj := argoappv1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "default",
|
|
Namespace: _argocdNs,
|
|
ResourceVersion: "1",
|
|
UID: "a-b-c-d-e",
|
|
},
|
|
Spec: argoappv1.AppProjectSpec{
|
|
Description: "Test project",
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: _test,
|
|
Type: "info",
|
|
}
|
|
|
|
captureLogEntries(func() {
|
|
logger.LogAppProjEvent(&proj, ei, "This is a test message", "admin")
|
|
})
|
|
|
|
// Verify event was created in the AppProject's namespace (argocd)
|
|
events, err := fakeClient.CoreV1().Events(_argocdNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
require.Len(t, events.Items, 1)
|
|
|
|
event := events.Items[0]
|
|
assert.Equal(t, "default", event.InvolvedObject.Name)
|
|
assert.Equal(t, _argocdNs, event.InvolvedObject.Namespace)
|
|
assert.Equal(t, _argocdNs, event.Namespace) // Event created in argocd namespace
|
|
assert.Equal(t, "This is a test message", event.Message)
|
|
assert.Equal(t, "test", event.Reason)
|
|
assert.Equal(t, "info", event.Type)
|
|
}
|
|
|
|
func TestLogAppEvent(t *testing.T) {
|
|
t.Parallel()
|
|
fakeClient := fake.NewClientset()
|
|
logger := NewAuditLogger(fakeClient, _argocdNs, _somecomponent, testEnableEventLog)
|
|
assert.NotNil(t, logger)
|
|
|
|
app := argoappv1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "testapp",
|
|
Namespace: _argocdNs,
|
|
ResourceVersion: "1",
|
|
UID: "a-b-c-d-e",
|
|
},
|
|
Spec: argoappv1.ApplicationSpec{
|
|
Destination: argoappv1.ApplicationDestination{
|
|
Server: "https://127.0.0.1:6443",
|
|
Namespace: "testns",
|
|
},
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: _test,
|
|
Type: "info",
|
|
}
|
|
captureLogEntries(func() {
|
|
logger.LogAppEvent(&app, ei, "This is a test message", "admin", nil)
|
|
})
|
|
|
|
// Verify event was created in the Application's namespace (argocd)
|
|
events, err := fakeClient.CoreV1().Events(_argocdNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
require.Len(t, events.Items, 1)
|
|
|
|
event := events.Items[0]
|
|
assert.Equal(t, "testapp", event.InvolvedObject.Name)
|
|
assert.Equal(t, _argocdNs, event.InvolvedObject.Namespace)
|
|
assert.Equal(t, _argocdNs, event.Namespace) // Event created in argocd namespace
|
|
assert.Equal(t, "This is a test message", event.Message)
|
|
assert.Equal(t, "test", event.Reason)
|
|
assert.Equal(t, "info", event.Type)
|
|
assert.Equal(t, "admin", event.Annotations["user"])
|
|
assert.Equal(t, "https://127.0.0.1:6443", event.Annotations["dest-server"])
|
|
assert.Equal(t, "testns", event.Annotations["dest-namespace"])
|
|
|
|
// If K8s Event Disable Log
|
|
ei.Reason = "Unknown"
|
|
output := captureLogEntries(func() {
|
|
logger.LogAppEvent(&app, ei, "This is a test message", "", nil)
|
|
})
|
|
|
|
assert.Empty(t, output)
|
|
}
|
|
|
|
func TestLogResourceEvent(t *testing.T) {
|
|
t.Parallel()
|
|
logger := NewAuditLogger(fake.NewClientset(), _argocdNs, _somecomponent, testEnableEventLog)
|
|
assert.NotNil(t, logger)
|
|
|
|
res := argoappv1.ResourceNode{
|
|
ResourceRef: argoappv1.ResourceRef{
|
|
Group: "argocd.argoproj.io",
|
|
Version: "v1alpha1",
|
|
Kind: "SignatureKey",
|
|
Name: "testapp",
|
|
Namespace: _argocdNs,
|
|
UID: "a-b-c-d-e",
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: _test,
|
|
Type: "info",
|
|
}
|
|
|
|
output := captureLogEntries(func() {
|
|
logger.LogResourceEvent(&res, ei, "This is a test message", "")
|
|
})
|
|
|
|
assert.Contains(t, output, "level=info")
|
|
assert.Contains(t, output, "name=testapp")
|
|
assert.Contains(t, output, "reason=test")
|
|
assert.Contains(t, output, "type=info")
|
|
assert.Contains(t, output, "msg=\"This is a test message\"")
|
|
|
|
ei.Reason = "Unknown"
|
|
|
|
// If K8s Event Disable Log
|
|
output = captureLogEntries(func() {
|
|
logger.LogResourceEvent(&res, ei, "This is a test message", "")
|
|
})
|
|
|
|
assert.Empty(t, output)
|
|
}
|
|
|
|
func TestLogResourceEvent_MultiCluster_CreatesEventInArgocdNamespace(t *testing.T) {
|
|
t.Parallel()
|
|
fakeClient := fake.NewClientset()
|
|
logger := NewAuditLogger(fakeClient, _argocdNs, _somecomponent, []string{EventReasonResourceActionRan})
|
|
|
|
res := argoappv1.ResourceNode{
|
|
ResourceRef: argoappv1.ResourceRef{
|
|
Group: "apps",
|
|
Version: "v1",
|
|
Kind: "Deployment",
|
|
Name: "my-deployment",
|
|
Namespace: _targetNs, // Resource is in a different namespace/cluster
|
|
UID: "deploy-uid-123",
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: EventReasonResourceActionRan,
|
|
Type: corev1.EventTypeNormal,
|
|
}
|
|
captureLogEntries(func() {
|
|
logger.LogResourceEvent(&res, ei, "Resource action executed", "admin")
|
|
})
|
|
|
|
events, err := fakeClient.CoreV1().Events(_targetNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
assert.Empty(t, events.Items, "No event should be created in target namespace")
|
|
|
|
events, err = fakeClient.CoreV1().Events(_argocdNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
require.Len(t, events.Items, 1, "Event should be created in ArgoCD namespace")
|
|
|
|
event := events.Items[0]
|
|
assert.Equal(t, "my-deployment", event.InvolvedObject.Name)
|
|
assert.Equal(t, _targetNs, event.InvolvedObject.Namespace, "InvolvedObject should preserve original namespace")
|
|
assert.Equal(t, _argocdNs, event.Namespace, "Event itself should be in ArgoCD namespace")
|
|
assert.Equal(t, "Resource action executed", event.Message)
|
|
|
|
assert.Equal(t, _targetNs, event.Annotations["resource-namespace"])
|
|
}
|
|
|
|
func TestLogAppSetEvent_CreatesEventInAppSetNamespace(t *testing.T) {
|
|
t.Parallel()
|
|
fakeClient := fake.NewClientset()
|
|
logger := NewAuditLogger(fakeClient, _argocdNs, _somecomponent, testEnableEventLog)
|
|
|
|
appset := argoappv1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "my-appset",
|
|
Namespace: _argocdNs,
|
|
ResourceVersion: "1",
|
|
UID: "appset-uid-123",
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: _test,
|
|
Type: corev1.EventTypeNormal,
|
|
}
|
|
captureLogEntries(func() {
|
|
logger.LogAppSetEvent(&appset, ei, "ApplicationSet event test", "admin")
|
|
})
|
|
|
|
// Verify event was created in the ApplicationSet's namespace (argocd)
|
|
events, err := fakeClient.CoreV1().Events(_argocdNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
require.Len(t, events.Items, 1)
|
|
|
|
event := events.Items[0]
|
|
assert.Equal(t, "my-appset", event.InvolvedObject.Name)
|
|
assert.Equal(t, _argocdNs, event.InvolvedObject.Namespace)
|
|
assert.Equal(t, _argocdNs, event.Namespace) // Event created in argocd namespace
|
|
assert.Equal(t, "ApplicationSet event test", event.Message)
|
|
}
|
|
|
|
func TestLogResourceEvent_DifferentKinds_AllInArgocdNamespace(t *testing.T) {
|
|
t.Parallel()
|
|
testCases := []struct {
|
|
name string
|
|
resourceKind string
|
|
resourceGroup string
|
|
resourceNs string
|
|
}{
|
|
{
|
|
name: "Pod in remote namespace",
|
|
resourceKind: "Pod",
|
|
resourceGroup: "",
|
|
resourceNs: "production",
|
|
},
|
|
{
|
|
name: "Service in remote namespace",
|
|
resourceKind: "Service",
|
|
resourceGroup: "",
|
|
resourceNs: "staging",
|
|
},
|
|
{
|
|
name: "Deployment in remote namespace",
|
|
resourceKind: "Deployment",
|
|
resourceGroup: "apps",
|
|
resourceNs: "default",
|
|
},
|
|
{
|
|
name: "ConfigMap in remote namespace",
|
|
resourceKind: "ConfigMap",
|
|
resourceGroup: "",
|
|
resourceNs: "kube-system",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
fakeClient := fake.NewClientset()
|
|
logger := NewAuditLogger(fakeClient, _argocdNs, _somecomponent, []string{EventReasonResourceActionRan})
|
|
|
|
res := argoappv1.ResourceNode{
|
|
ResourceRef: argoappv1.ResourceRef{
|
|
Group: tc.resourceGroup,
|
|
Version: "v1",
|
|
Kind: tc.resourceKind,
|
|
Name: "test-resource",
|
|
Namespace: tc.resourceNs,
|
|
UID: "test-uid",
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: EventReasonResourceActionRan,
|
|
Type: corev1.EventTypeNormal,
|
|
}
|
|
captureLogEntries(func() {
|
|
logger.LogResourceEvent(&res, ei, "Action ran", "admin")
|
|
})
|
|
|
|
events, err := fakeClient.CoreV1().Events(_argocdNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
require.Len(t, events.Items, 1)
|
|
|
|
event := events.Items[0]
|
|
assert.Equal(t, _argocdNs, event.Namespace, "Event should be in ArgoCD namespace for %s", tc.resourceKind)
|
|
assert.Equal(t, tc.resourceNs, event.InvolvedObject.Namespace, "InvolvedObject should preserve original namespace")
|
|
assert.Equal(t, tc.resourceNs, event.Annotations["resource-namespace"])
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestLogResourceEvent_EmptyNamespace(t *testing.T) {
|
|
t.Parallel()
|
|
fakeClient := fake.NewClientset()
|
|
logger := NewAuditLogger(fakeClient, _argocdNs, _somecomponent, []string{EventReasonResourceActionRan})
|
|
|
|
// Cluster-scoped resource (no namespace)
|
|
res := argoappv1.ResourceNode{
|
|
ResourceRef: argoappv1.ResourceRef{
|
|
Group: "rbac.authorization.k8s.io",
|
|
Version: "v1",
|
|
Kind: "ClusterRole",
|
|
Name: "cluster-admin",
|
|
Namespace: "", // Cluster-scoped resource
|
|
UID: "clusterrole-uid",
|
|
},
|
|
}
|
|
|
|
ei := EventInfo{
|
|
Reason: EventReasonResourceActionRan,
|
|
Type: corev1.EventTypeNormal,
|
|
}
|
|
captureLogEntries(func() {
|
|
logger.LogResourceEvent(&res, ei, "Cluster role action", "admin")
|
|
})
|
|
|
|
// Event should be created in ArgoCD namespace (not empty namespace)
|
|
events, err := fakeClient.CoreV1().Events(_argocdNs).List(t.Context(), metav1.ListOptions{})
|
|
require.NoError(t, err)
|
|
require.Len(t, events.Items, 1)
|
|
|
|
event := events.Items[0]
|
|
assert.Equal(t, _argocdNs, event.Namespace)
|
|
assert.Empty(t, event.InvolvedObject.Namespace) // ClusterRole has no namespace
|
|
assert.Empty(t, event.Annotations["resource-namespace"])
|
|
}
|