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]>
444 lines
14 KiB
Go
444 lines
14 KiB
Go
package generators
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
pullrequest "github.com/hanzoai/deploy/applicationset/services/pull_request"
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
func TestPullRequestGithubGenerateParams(t *testing.T) {
|
|
ctx := t.Context()
|
|
cases := []struct {
|
|
selectFunc func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error)
|
|
values map[string]string
|
|
expected []map[string]any
|
|
expectedErr error
|
|
applicationSet argoprojiov1alpha1.ApplicationSet
|
|
continueOnRepoNotFoundError bool
|
|
}{
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 1,
|
|
Title: "title1",
|
|
Branch: "branch1",
|
|
TargetBranch: "master",
|
|
HeadSHA: "089d92cbf9ff857a39e6feccd32798ca700fb958",
|
|
Author: "testName",
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "1",
|
|
"title": "title1",
|
|
"branch": "branch1",
|
|
"branch_slug": "branch1",
|
|
"target_branch": "master",
|
|
"target_branch_slug": "master",
|
|
"head_sha": "089d92cbf9ff857a39e6feccd32798ca700fb958",
|
|
"head_short_sha": "089d92cb",
|
|
"head_short_sha_7": "089d92c",
|
|
"author": "testName",
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 2,
|
|
Title: "title2",
|
|
Branch: "feat/areally+long_pull_request_name_to_test_argo_slugification_and_branch_name_shortening_feature",
|
|
TargetBranch: "feat/anotherreally+long_pull_request_name_to_test_argo_slugification_and_branch_name_shortening_feature",
|
|
HeadSHA: "9b34ff5bd418e57d58891eb0aa0728043ca1e8be",
|
|
Author: "testName",
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "2",
|
|
"title": "title2",
|
|
"branch": "feat/areally+long_pull_request_name_to_test_argo_slugification_and_branch_name_shortening_feature",
|
|
"branch_slug": "feat-areally-long-pull-request-name-to-test-argo",
|
|
"target_branch": "feat/anotherreally+long_pull_request_name_to_test_argo_slugification_and_branch_name_shortening_feature",
|
|
"target_branch_slug": "feat-anotherreally-long-pull-request-name-to-test",
|
|
"head_sha": "9b34ff5bd418e57d58891eb0aa0728043ca1e8be",
|
|
"head_short_sha": "9b34ff5b",
|
|
"head_short_sha_7": "9b34ff5",
|
|
"author": "testName",
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 1,
|
|
Title: "title1",
|
|
Branch: "a-very-short-sha",
|
|
TargetBranch: "master",
|
|
HeadSHA: "abcd",
|
|
Author: "testName",
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "1",
|
|
"title": "title1",
|
|
"branch": "a-very-short-sha",
|
|
"branch_slug": "a-very-short-sha",
|
|
"target_branch": "master",
|
|
"target_branch_slug": "master",
|
|
"head_sha": "abcd",
|
|
"head_short_sha": "abcd",
|
|
"head_short_sha_7": "abcd",
|
|
"author": "testName",
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 1,
|
|
Title: "title1",
|
|
Branch: "my_branch",
|
|
TargetBranch: "master",
|
|
HeadSHA: "abcd",
|
|
Author: "testName",
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
"pr_branch": "{{ branch }}",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "1",
|
|
"title": "title1",
|
|
"branch": "my_branch",
|
|
"branch_slug": "my-branch",
|
|
"target_branch": "master",
|
|
"target_branch_slug": "master",
|
|
"head_sha": "abcd",
|
|
"head_short_sha": "abcd",
|
|
"head_short_sha_7": "abcd",
|
|
"author": "testName",
|
|
"values.foo": "bar",
|
|
"values.pr_branch": "my_branch",
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
nil,
|
|
errors.New("fake error"),
|
|
)
|
|
},
|
|
expected: nil,
|
|
expectedErr: errors.New("error listing repos: fake error"),
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
nil,
|
|
pullrequest.NewRepositoryNotFoundError(errors.New("repository not found")),
|
|
)
|
|
},
|
|
expected: []map[string]any{},
|
|
expectedErr: nil,
|
|
continueOnRepoNotFoundError: true,
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
nil,
|
|
pullrequest.NewRepositoryNotFoundError(errors.New("repository not found")),
|
|
)
|
|
},
|
|
expected: nil,
|
|
expectedErr: errors.New("error listing repos: repository not found"),
|
|
continueOnRepoNotFoundError: false,
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 1,
|
|
Title: "title1",
|
|
Branch: "branch1",
|
|
TargetBranch: "master",
|
|
HeadSHA: "089d92cbf9ff857a39e6feccd32798ca700fb958",
|
|
Labels: []string{"preview"},
|
|
Author: "testName",
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "1",
|
|
"title": "title1",
|
|
"branch": "branch1",
|
|
"branch_slug": "branch1",
|
|
"target_branch": "master",
|
|
"target_branch_slug": "master",
|
|
"head_sha": "089d92cbf9ff857a39e6feccd32798ca700fb958",
|
|
"head_short_sha": "089d92cb",
|
|
"head_short_sha_7": "089d92c",
|
|
"labels": []string{"preview"},
|
|
"author": "testName",
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
applicationSet: argoprojiov1alpha1.ApplicationSet{
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
// Application set is using Go Template.
|
|
GoTemplate: true,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 1,
|
|
Title: "title1",
|
|
Branch: "branch1",
|
|
TargetBranch: "master",
|
|
HeadSHA: "089d92cbf9ff857a39e6feccd32798ca700fb958",
|
|
Labels: []string{"preview"},
|
|
Author: "testName",
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "1",
|
|
"title": "title1",
|
|
"branch": "branch1",
|
|
"branch_slug": "branch1",
|
|
"target_branch": "master",
|
|
"target_branch_slug": "master",
|
|
"head_sha": "089d92cbf9ff857a39e6feccd32798ca700fb958",
|
|
"head_short_sha": "089d92cb",
|
|
"head_short_sha_7": "089d92c",
|
|
"author": "testName",
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
applicationSet: argoprojiov1alpha1.ApplicationSet{
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
// Application set is using fasttemplate.
|
|
GoTemplate: false,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
selectFunc: func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
return pullrequest.NewFakeService(
|
|
ctx,
|
|
[]*pullrequest.PullRequest{
|
|
{
|
|
Number: 1,
|
|
Title: "title1",
|
|
Branch: "my_branch",
|
|
TargetBranch: "master",
|
|
HeadSHA: "abcd",
|
|
Author: "testName",
|
|
Labels: []string{"preview", "preview:team1"},
|
|
},
|
|
},
|
|
nil,
|
|
)
|
|
},
|
|
values: map[string]string{
|
|
"preview_env": "{{ regexFind \"(team1|team2)\" (.labels | join \",\") }}",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"number": "1",
|
|
"title": "title1",
|
|
"branch": "my_branch",
|
|
"branch_slug": "my-branch",
|
|
"target_branch": "master",
|
|
"target_branch_slug": "master",
|
|
"head_sha": "abcd",
|
|
"head_short_sha": "abcd",
|
|
"head_short_sha_7": "abcd",
|
|
"author": "testName",
|
|
"labels": []string{"preview", "preview:team1"},
|
|
"values": map[string]string{"preview_env": "team1"},
|
|
},
|
|
},
|
|
expectedErr: nil,
|
|
applicationSet: argoprojiov1alpha1.ApplicationSet{
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
// Application set is using fasttemplate.
|
|
GoTemplate: true,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
gen := PullRequestGenerator{
|
|
selectServiceProviderFunc: c.selectFunc,
|
|
}
|
|
generatorConfig := argoprojiov1alpha1.ApplicationSetGenerator{
|
|
PullRequest: &argoprojiov1alpha1.PullRequestGenerator{
|
|
Values: c.values,
|
|
ContinueOnRepoNotFoundError: c.continueOnRepoNotFoundError,
|
|
},
|
|
}
|
|
|
|
got, gotErr := gen.GenerateParams(&generatorConfig, &c.applicationSet, nil)
|
|
if c.expectedErr != nil {
|
|
require.EqualError(t, gotErr, c.expectedErr.Error())
|
|
} else {
|
|
require.NoError(t, gotErr)
|
|
}
|
|
assert.ElementsMatch(t, c.expected, got)
|
|
}
|
|
}
|
|
|
|
func TestAllowedSCMProviderPullRequest(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
cases := []struct {
|
|
name string
|
|
providerConfig *argoprojiov1alpha1.PullRequestGenerator
|
|
}{
|
|
{
|
|
name: "Error Github",
|
|
providerConfig: &argoprojiov1alpha1.PullRequestGenerator{
|
|
Github: &argoprojiov1alpha1.PullRequestGeneratorGithub{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error Gitlab",
|
|
providerConfig: &argoprojiov1alpha1.PullRequestGenerator{
|
|
GitLab: &argoprojiov1alpha1.PullRequestGeneratorGitLab{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error Gitea",
|
|
providerConfig: &argoprojiov1alpha1.PullRequestGenerator{
|
|
Gitea: &argoprojiov1alpha1.PullRequestGeneratorGitea{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error Bitbucket",
|
|
providerConfig: &argoprojiov1alpha1.PullRequestGenerator{
|
|
BitbucketServer: &argoprojiov1alpha1.PullRequestGeneratorBitbucketServer{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, testCase := range cases {
|
|
testCaseCopy := testCase
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
pullRequestGenerator := NewPullRequestGenerator(nil, NewSCMConfig("", []string{
|
|
"github.myorg.com",
|
|
"gitlab.myorg.com",
|
|
"gitea.myorg.com",
|
|
"bitbucket.myorg.com",
|
|
"azuredevops.myorg.com",
|
|
}, true, true, nil, true))
|
|
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
Generators: []argoprojiov1alpha1.ApplicationSetGenerator{{
|
|
PullRequest: testCaseCopy.providerConfig,
|
|
}},
|
|
},
|
|
}
|
|
|
|
_, err := pullRequestGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
|
|
|
|
require.Error(t, err, "Must return an error")
|
|
var expectedError ErrDisallowedSCMProvider
|
|
assert.ErrorAs(t, err, &expectedError)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSCMProviderDisabled_PRGenerator(t *testing.T) {
|
|
generator := NewPullRequestGenerator(nil, NewSCMConfig("", []string{}, false, true, nil, true))
|
|
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
Generators: []argoprojiov1alpha1.ApplicationSetGenerator{{
|
|
PullRequest: &argoprojiov1alpha1.PullRequestGenerator{
|
|
Github: &argoprojiov1alpha1.PullRequestGeneratorGithub{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
}},
|
|
},
|
|
}
|
|
|
|
_, err := generator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
|
|
assert.ErrorIs(t, err, ErrSCMProvidersDisabled)
|
|
}
|