mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
41536738c8
* 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]>
424 lines
13 KiB
Go
424 lines
13 KiB
Go
package db
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
appsv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/settings"
|
|
)
|
|
|
|
var repoArgoCD = &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-repo-secret",
|
|
Annotations: map[string]string{
|
|
common.AnnotationKeyManagedBy: common.AnnotationValueManagedByArgoCD,
|
|
},
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepository,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"name": []byte("SomeRepo"),
|
|
"url": []byte("[email protected]:argoproj/argo-cd.git"),
|
|
"username": []byte("someUsername"),
|
|
"password": []byte("somePassword"),
|
|
"type": []byte("git"),
|
|
},
|
|
}
|
|
|
|
var repoArgoProj = &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-other-repo-secret",
|
|
Annotations: map[string]string{
|
|
common.AnnotationKeyManagedBy: common.AnnotationValueManagedByArgoCD,
|
|
},
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepository,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"name": []byte("OtherRepo"),
|
|
"url": []byte("[email protected]:argoproj/argoproj.git"),
|
|
"username": []byte("someUsername"),
|
|
"password": []byte("somePassword"),
|
|
"type": []byte("git"),
|
|
},
|
|
}
|
|
|
|
var repoArgoCDWrite = &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-repo-secret",
|
|
Annotations: map[string]string{
|
|
common.AnnotationKeyManagedBy: common.AnnotationValueManagedByArgoCD,
|
|
},
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepositoryWrite,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"name": []byte("SomeRepo"),
|
|
"url": []byte("[email protected]:argoproj/argo-cd.git"),
|
|
"username": []byte("someUsername"),
|
|
"password": []byte("somePassword"),
|
|
"type": []byte("git"),
|
|
},
|
|
}
|
|
|
|
var repoArgoProjWrite = &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-other-repo-secret",
|
|
Annotations: map[string]string{
|
|
common.AnnotationKeyManagedBy: common.AnnotationValueManagedByArgoCD,
|
|
},
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepositoryWrite,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"name": []byte("OtherRepo"),
|
|
"url": []byte("[email protected]:argoproj/argoproj.git"),
|
|
"username": []byte("someUsername"),
|
|
"password": []byte("somePassword"),
|
|
"type": []byte("git"),
|
|
},
|
|
}
|
|
|
|
func TestDb_CreateRepository(t *testing.T) {
|
|
t.Parallel()
|
|
clientset := getClientset()
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
input := &appsv1.Repository{
|
|
Name: "TestRepo",
|
|
Repo: "[email protected]:argoproj/argo-cd.git",
|
|
Username: "someUsername",
|
|
Password: "somePassword",
|
|
}
|
|
|
|
// The repository was indeed created successfully
|
|
output, err := testee.CreateRepository(t.Context(), input)
|
|
require.NoError(t, err)
|
|
assert.Same(t, input, output)
|
|
|
|
secret, err := clientset.CoreV1().Secrets(testNamespace).Get(
|
|
t.Context(),
|
|
RepoURLToSecretName(repoSecretPrefix, input.Repo, ""),
|
|
metav1.GetOptions{},
|
|
)
|
|
assert.NotNil(t, secret)
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
func TestDb_GetRepository(t *testing.T) {
|
|
t.Parallel()
|
|
clientset := getClientset(repoArgoCD, repoArgoProj)
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
repository, err := testee.GetRepository(t.Context(), "[email protected]:argoproj/argoproj.git", "")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repository)
|
|
assert.Equal(t, "OtherRepo", repository.Name)
|
|
|
|
repository, err = testee.GetRepository(t.Context(), "[email protected]:argoproj/argo-cd.git", "")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repository)
|
|
assert.Equal(t, "SomeRepo", repository.Name)
|
|
|
|
repository, err = testee.GetRepository(t.Context(), "[email protected]:argoproj/not-existing.git", "")
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, repository)
|
|
assert.Equal(t, "[email protected]:argoproj/not-existing.git", repository.Repo)
|
|
}
|
|
|
|
func TestDb_GetWriteRepository(t *testing.T) {
|
|
t.Parallel()
|
|
clientset := getClientset(repoArgoCDWrite, repoArgoProjWrite)
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
repository, err := testee.GetWriteRepository(t.Context(), "[email protected]:argoproj/argoproj.git", "")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repository)
|
|
assert.Equal(t, "OtherRepo", repository.Name)
|
|
|
|
repository, err = testee.GetWriteRepository(t.Context(), "[email protected]:argoproj/argo-cd.git", "")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repository)
|
|
assert.Equal(t, "SomeRepo", repository.Name)
|
|
}
|
|
|
|
func TestDb_GetWriteRepository_SecretNotFound_DefaultRepo(t *testing.T) {
|
|
t.Parallel()
|
|
clientset := getClientset(repoArgoCD)
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
repository, err := testee.GetWriteRepository(t.Context(), "[email protected]:argoproj/argo-cd.git", "")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repository)
|
|
assert.Empty(t, repository.Name)
|
|
}
|
|
|
|
func TestDb_ListRepositories(t *testing.T) {
|
|
t.Parallel()
|
|
clientset := getClientset(repoArgoCD, repoArgoProj)
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
repositories, err := testee.ListRepositories(t.Context())
|
|
require.NoError(t, err)
|
|
assert.Len(t, repositories, 2)
|
|
}
|
|
|
|
func TestDb_UpdateRepository(t *testing.T) {
|
|
t.Parallel()
|
|
secretRepository := &appsv1.Repository{
|
|
Name: "SomeRepo",
|
|
Repo: "[email protected]:argoproj/argo-cd.git",
|
|
Username: "someUsername",
|
|
Password: "somePassword",
|
|
Type: "git",
|
|
}
|
|
|
|
clientset := getClientset(repoArgoCD)
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
secretRepository.Username = "UpdatedUsername"
|
|
repository, err := testee.UpdateRepository(t.Context(), secretRepository)
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, repository)
|
|
assert.Same(t, secretRepository, repository)
|
|
|
|
secret, err := clientset.CoreV1().Secrets(testNamespace).Get(
|
|
t.Context(),
|
|
"some-repo-secret",
|
|
metav1.GetOptions{},
|
|
)
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, secret)
|
|
assert.Equal(t, "UpdatedUsername", string(secret.Data["username"]))
|
|
}
|
|
|
|
func TestDb_DeleteRepository(t *testing.T) {
|
|
t.Parallel()
|
|
clientset := getClientset(repoArgoCD, repoArgoProj)
|
|
settingsManager := settings.NewSettingsManager(t.Context(), clientset, testNamespace)
|
|
testee := &db{
|
|
ns: testNamespace,
|
|
kubeclientset: clientset,
|
|
settingsMgr: settingsManager,
|
|
}
|
|
|
|
err := testee.DeleteRepository(t.Context(), "[email protected]:argoproj/argoproj.git", "")
|
|
require.NoError(t, err)
|
|
|
|
err = testee.DeleteRepository(t.Context(), "[email protected]:argoproj/argo-cd.git", "")
|
|
require.NoError(t, err)
|
|
|
|
_, err = clientset.CoreV1().Secrets(testNamespace).Get(t.Context(), "some-repo-secret", metav1.GetOptions{})
|
|
require.Error(t, err)
|
|
}
|
|
|
|
func TestDb_GetRepositoryCredentials(t *testing.T) {
|
|
t.Parallel()
|
|
gitHubRepoCredsSecret := &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-repocreds-secret",
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepoCreds,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"type": []byte("git"),
|
|
"url": []byte("[email protected]:argoproj"),
|
|
"username": []byte("someUsername"),
|
|
"password": []byte("somePassword"),
|
|
},
|
|
}
|
|
gitLabRepoCredsSecret := &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-other-repocreds-secret",
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepoCreds,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"type": []byte("git"),
|
|
"url": []byte("[email protected]"),
|
|
"username": []byte("someUsername"),
|
|
"password": []byte("somePassword"),
|
|
},
|
|
}
|
|
|
|
clientset := getClientset(gitHubRepoCredsSecret, gitLabRepoCredsSecret)
|
|
testee := NewDB(testNamespace, settings.NewSettingsManager(t.Context(), clientset, testNamespace), clientset)
|
|
|
|
repoCreds, err := testee.GetRepositoryCredentials(t.Context(), "[email protected]:argoproj/argoproj.git")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repoCreds)
|
|
assert.Equal(t, "[email protected]:argoproj", repoCreds.URL)
|
|
|
|
repoCreds, err = testee.GetRepositoryCredentials(t.Context(), "[email protected]:someorg/foobar.git")
|
|
require.NoError(t, err)
|
|
require.NotNil(t, repoCreds)
|
|
assert.Equal(t, "[email protected]", repoCreds.URL)
|
|
|
|
repoCreds, err = testee.GetRepositoryCredentials(t.Context(), "[email protected]:example/not-existing.git")
|
|
require.NoError(t, err)
|
|
assert.Nil(t, repoCreds)
|
|
}
|
|
|
|
func TestRepoURLToSecretName(t *testing.T) {
|
|
t.Parallel()
|
|
tables := []struct {
|
|
repoURL string
|
|
secretName string
|
|
project string
|
|
}{{
|
|
repoURL: "git://[email protected]:argoproj/ARGO-cd.git",
|
|
secretName: "repo-83273445",
|
|
project: "",
|
|
}, {
|
|
repoURL: "git://[email protected]:argoproj/ARGO-cd.git",
|
|
secretName: "repo-2733415816",
|
|
project: "foobar",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/ARGO-cd",
|
|
secretName: "repo-1890113693",
|
|
project: "",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/ARGO-cd",
|
|
secretName: "repo-4161185408",
|
|
project: "foobar",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/argo-cd",
|
|
secretName: "repo-42374749",
|
|
project: "",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/argo-cd",
|
|
secretName: "repo-1894545728",
|
|
project: "foobar",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/argo-cd.git",
|
|
secretName: "repo-821842295",
|
|
project: "",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/argo-cd.git",
|
|
secretName: "repo-1474166686",
|
|
project: "foobar",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/argo_cd.git",
|
|
secretName: "repo-1049844989",
|
|
project: "",
|
|
}, {
|
|
repoURL: "https://github.com/argoproj/argo_cd.git",
|
|
secretName: "repo-3916272608",
|
|
project: "foobar",
|
|
}, {
|
|
repoURL: "ssh://[email protected]/argoproj/argo-cd.git",
|
|
secretName: "repo-3569564120",
|
|
project: "",
|
|
}, {
|
|
repoURL: "ssh://[email protected]/argoproj/argo-cd.git",
|
|
secretName: "repo-754834421",
|
|
project: "foobar",
|
|
}}
|
|
|
|
for _, v := range tables {
|
|
sn := RepoURLToSecretName(repoSecretPrefix, v.repoURL, v.project)
|
|
assert.Equal(t, sn, v.secretName, "Expected secret name %q for repo %q; instead, got %q", v.secretName, v.repoURL, sn)
|
|
}
|
|
}
|
|
|
|
func Test_CredsURLToSecretName(t *testing.T) {
|
|
tables := map[string]string{
|
|
"git://[email protected]:argoproj": "creds-2483499391",
|
|
"git://[email protected]:argoproj/": "creds-1465032944",
|
|
"[email protected]:argoproj": "creds-2666065091",
|
|
"[email protected]:argoproj/": "creds-346879876",
|
|
}
|
|
|
|
for k, v := range tables {
|
|
sn := RepoURLToSecretName(credSecretPrefix, k, "")
|
|
assert.Equal(t, sn, v, "Expected secret name %q for repo %q; instead, got %q", v, k, sn)
|
|
}
|
|
}
|
|
|
|
func Test_GetProjectRepositories(t *testing.T) {
|
|
repoSecretWithProject := &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-repo-secret",
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepository,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"type": []byte("git"),
|
|
"url": []byte("[email protected]:argoproj/argo-cd"),
|
|
"project": []byte("some-project"),
|
|
},
|
|
}
|
|
|
|
repoSecretWithoutProject := &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: testNamespace,
|
|
Name: "some-other-repo-secret",
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepository,
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"type": []byte("git"),
|
|
"url": []byte("[email protected]:argoproj/argo-cd"),
|
|
},
|
|
}
|
|
|
|
clientset := getClientset(repoSecretWithProject, repoSecretWithoutProject)
|
|
argoDB := NewDB(testNamespace, settings.NewSettingsManager(t.Context(), clientset, testNamespace), clientset)
|
|
|
|
repos, err := argoDB.GetProjectRepositories("some-project")
|
|
require.NoError(t, err)
|
|
assert.Len(t, repos, 1)
|
|
assert.Equal(t, "[email protected]:argoproj/argo-cd", repos[0].Repo)
|
|
}
|