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]>
237 lines
6.4 KiB
Go
237 lines
6.4 KiB
Go
package pull_request
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/core"
|
|
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/git"
|
|
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/webapi"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
azureMock "github.com/hanzoai/deploy/applicationset/services/scm_provider/azure_devops/git/mocks"
|
|
"github.com/hanzoai/deploy/applicationset/services/scm_provider/mocks"
|
|
)
|
|
|
|
func TestListPullRequest(t *testing.T) {
|
|
t.Parallel()
|
|
teamProject := "myorg_project"
|
|
repoName := "myorg_project_repo"
|
|
prID := 123
|
|
prTitle := "feat(123)"
|
|
prHeadSha := "cd4973d9d14a08ffe6b641a89a68891d6aac8056"
|
|
ctx := t.Context()
|
|
uniqueName := "testName"
|
|
|
|
pullRequestMock := []git.GitPullRequest{
|
|
{
|
|
PullRequestId: new(prID),
|
|
Title: new(prTitle),
|
|
SourceRefName: new("refs/heads/feature-branch"),
|
|
TargetRefName: new("refs/heads/main"),
|
|
LastMergeSourceCommit: &git.GitCommitRef{
|
|
CommitId: new(prHeadSha),
|
|
},
|
|
Labels: &[]core.WebApiTagDefinition{},
|
|
Repository: &git.GitRepository{
|
|
Name: new(repoName),
|
|
},
|
|
CreatedBy: &webapi.IdentityRef{
|
|
UniqueName: new(uniqueName + "@example.com"),
|
|
},
|
|
},
|
|
}
|
|
|
|
args := git.GetPullRequestsByProjectArgs{
|
|
Project: &teamProject,
|
|
SearchCriteria: &git.GitPullRequestSearchCriteria{},
|
|
}
|
|
|
|
gitClientMock := &azureMock.Client{}
|
|
clientFactoryMock := &mocks.AzureDevOpsClientFactory{}
|
|
clientFactoryMock.EXPECT().GetClient(mock.Anything).Return(gitClientMock, nil)
|
|
gitClientMock.EXPECT().GetPullRequestsByProject(mock.Anything, args).Return(&pullRequestMock, nil)
|
|
|
|
provider := AzureDevOpsService{
|
|
clientFactory: clientFactoryMock,
|
|
project: teamProject,
|
|
repo: repoName,
|
|
labels: nil,
|
|
}
|
|
|
|
list, err := provider.List(ctx)
|
|
require.NoError(t, err)
|
|
assert.Len(t, list, 1)
|
|
assert.Equal(t, "feature-branch", list[0].Branch)
|
|
assert.Equal(t, "main", list[0].TargetBranch)
|
|
assert.Equal(t, prHeadSha, list[0].HeadSHA)
|
|
assert.Equal(t, "feat(123)", list[0].Title)
|
|
assert.Equal(t, int64(prID), list[0].Number)
|
|
assert.Equal(t, uniqueName, list[0].Author)
|
|
}
|
|
|
|
func TestConvertLabes(t *testing.T) {
|
|
t.Parallel()
|
|
testCases := []struct {
|
|
name string
|
|
gotLabels *[]core.WebApiTagDefinition
|
|
expectedLabels []string
|
|
}{
|
|
{
|
|
name: "empty labels",
|
|
gotLabels: &[]core.WebApiTagDefinition{},
|
|
expectedLabels: []string{},
|
|
},
|
|
{
|
|
name: "nil labels",
|
|
gotLabels: nil,
|
|
expectedLabels: []string{},
|
|
},
|
|
{
|
|
name: "one label",
|
|
gotLabels: &[]core.WebApiTagDefinition{
|
|
{Name: new("label1"), Active: new(true)},
|
|
},
|
|
expectedLabels: []string{"label1"},
|
|
},
|
|
{
|
|
name: "two label",
|
|
gotLabels: &[]core.WebApiTagDefinition{
|
|
{Name: new("label1"), Active: new(true)},
|
|
{Name: new("label2"), Active: new(true)},
|
|
},
|
|
expectedLabels: []string{"label1", "label2"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
got := convertLabels(tc.gotLabels)
|
|
assert.Equal(t, tc.expectedLabels, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestContainAzureDevOpsLabels(t *testing.T) {
|
|
t.Parallel()
|
|
testCases := []struct {
|
|
name string
|
|
expectedLabels []string
|
|
gotLabels []string
|
|
expectedResult bool
|
|
}{
|
|
{
|
|
name: "empty labels",
|
|
expectedLabels: []string{},
|
|
gotLabels: []string{},
|
|
expectedResult: true,
|
|
},
|
|
{
|
|
name: "no matching labels",
|
|
expectedLabels: []string{"label1", "label2"},
|
|
gotLabels: []string{"label3", "label4"},
|
|
expectedResult: false,
|
|
},
|
|
{
|
|
name: "some matching labels",
|
|
expectedLabels: []string{"label1", "label2"},
|
|
gotLabels: []string{"label1", "label3"},
|
|
expectedResult: false,
|
|
},
|
|
{
|
|
name: "all matching labels",
|
|
expectedLabels: []string{"label1", "label2"},
|
|
gotLabels: []string{"label1", "label2"},
|
|
expectedResult: true,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
got := containAzureDevOpsLabels(tc.expectedLabels, tc.gotLabels)
|
|
assert.Equal(t, tc.expectedResult, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestBuildURL(t *testing.T) {
|
|
t.Parallel()
|
|
testCases := []struct {
|
|
name string
|
|
url string
|
|
organization string
|
|
expected string
|
|
}{
|
|
{
|
|
name: "Provided default URL and organization",
|
|
url: "https://dev.azure.com/",
|
|
organization: "myorganization",
|
|
expected: "https://dev.azure.com/myorganization",
|
|
},
|
|
{
|
|
name: "Provided default URL and organization without trailing slash",
|
|
url: "https://dev.azure.com",
|
|
organization: "myorganization",
|
|
expected: "https://dev.azure.com/myorganization",
|
|
},
|
|
{
|
|
name: "Provided no URL and organization",
|
|
url: "",
|
|
organization: "myorganization",
|
|
expected: "https://dev.azure.com/myorganization",
|
|
},
|
|
{
|
|
name: "Provided custom URL and organization",
|
|
url: "https://azuredevops.example.com/",
|
|
organization: "myorganization",
|
|
expected: "https://azuredevops.example.com/myorganization",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
result := buildURL(tc.url, tc.organization)
|
|
assert.Equal(t, tc.expected, result)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestAzureDevOpsListReturnsRepositoryNotFoundError(t *testing.T) {
|
|
t.Parallel()
|
|
args := git.GetPullRequestsByProjectArgs{
|
|
Project: new("nonexistent"),
|
|
SearchCriteria: &git.GitPullRequestSearchCriteria{},
|
|
}
|
|
|
|
pullRequestMock := []git.GitPullRequest{}
|
|
|
|
gitClientMock := &azureMock.Client{}
|
|
clientFactoryMock := &mocks.AzureDevOpsClientFactory{}
|
|
clientFactoryMock.EXPECT().GetClient(mock.Anything).Return(gitClientMock, nil)
|
|
|
|
// Mock the GetPullRequestsByProject to return an error containing "404"
|
|
gitClientMock.EXPECT().GetPullRequestsByProject(mock.Anything, args).Return(&pullRequestMock,
|
|
errors.New("The following project does not exist:"))
|
|
|
|
provider := AzureDevOpsService{
|
|
clientFactory: clientFactoryMock,
|
|
project: "nonexistent",
|
|
repo: "nonexistent",
|
|
labels: nil,
|
|
}
|
|
|
|
prs, err := provider.List(t.Context())
|
|
|
|
// Should return empty pull requests list
|
|
assert.Empty(t, prs)
|
|
|
|
// Should return RepositoryNotFoundError
|
|
require.Error(t, err)
|
|
assert.True(t, IsRepositoryNotFoundError(err), "Expected RepositoryNotFoundError but got: %v", err)
|
|
}
|