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]>
410 lines
12 KiB
Go
410 lines
12 KiB
Go
package generators
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/services/github_app_auth"
|
|
"github.com/hanzoai/deploy/applicationset/services/scm_provider"
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
func TestSCMProviderGenerateParams(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
cases := []struct {
|
|
name string
|
|
repos []*scm_provider.Repository
|
|
values map[string]string
|
|
expected []map[string]any
|
|
expectedError error
|
|
}{
|
|
{
|
|
name: "Multiple repos with labels",
|
|
repos: []*scm_provider.Repository{
|
|
{
|
|
Organization: "myorg",
|
|
Repository: "repo1",
|
|
RepositoryId: 190320251,
|
|
URL: "[email protected]:myorg/repo1.git",
|
|
Branch: "main",
|
|
SHA: "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
Labels: []string{"prod", "staging"},
|
|
},
|
|
{
|
|
Organization: "myorg",
|
|
Repository: "repo2",
|
|
RepositoryId: 190320252,
|
|
URL: "[email protected]:myorg/repo2.git",
|
|
Branch: "main",
|
|
SHA: "59d0",
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"organization": "myorg",
|
|
"repository": "repo1",
|
|
"repository_id": 190320251,
|
|
"url": "[email protected]:myorg/repo1.git",
|
|
"branch": "main",
|
|
"branchNormalized": "main",
|
|
"sha": "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
"short_sha": "0bc57212",
|
|
"short_sha_7": "0bc5721",
|
|
"labels": "prod,staging",
|
|
},
|
|
{
|
|
"organization": "myorg",
|
|
"repository": "repo2",
|
|
"repository_id": 190320252,
|
|
"url": "[email protected]:myorg/repo2.git",
|
|
"branch": "main",
|
|
"branchNormalized": "main",
|
|
"sha": "59d0",
|
|
"short_sha": "59d0",
|
|
"short_sha_7": "59d0",
|
|
"labels": "",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Value interpolation",
|
|
repos: []*scm_provider.Repository{
|
|
{
|
|
Organization: "myorg",
|
|
Repository: "repo3",
|
|
RepositoryId: 190320253,
|
|
URL: "[email protected]:myorg/repo3.git",
|
|
Branch: "main",
|
|
SHA: "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
Labels: []string{"prod", "staging"},
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
"should_i_force_push_to": "{{ branch }}?",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"organization": "myorg",
|
|
"repository": "repo3",
|
|
"repository_id": 190320253,
|
|
"url": "[email protected]:myorg/repo3.git",
|
|
"branch": "main",
|
|
"branchNormalized": "main",
|
|
"sha": "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
"short_sha": "0bc57212",
|
|
"short_sha_7": "0bc5721",
|
|
"labels": "prod,staging",
|
|
"values.foo": "bar",
|
|
"values.should_i_force_push_to": "main?",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Repos with and without id",
|
|
repos: []*scm_provider.Repository{
|
|
{
|
|
Organization: "myorg",
|
|
Repository: "repo4",
|
|
RepositoryId: "idaz09",
|
|
URL: "[email protected]:myorg/repo4.git",
|
|
Branch: "main",
|
|
SHA: "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
},
|
|
{
|
|
Organization: "myorg",
|
|
Repository: "repo5",
|
|
URL: "[email protected]:myorg/repo5.git",
|
|
Branch: "main",
|
|
SHA: "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"organization": "myorg",
|
|
"repository": "repo4",
|
|
"repository_id": "idaz09",
|
|
"url": "[email protected]:myorg/repo4.git",
|
|
"branch": "main",
|
|
"branchNormalized": "main",
|
|
"sha": "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
"short_sha": "0bc57212",
|
|
"short_sha_7": "0bc5721",
|
|
"labels": "",
|
|
},
|
|
{
|
|
"organization": "myorg",
|
|
"repository": "repo5",
|
|
"repository_id": nil,
|
|
"url": "[email protected]:myorg/repo5.git",
|
|
"branch": "main",
|
|
"branchNormalized": "main",
|
|
"sha": "0bc57212c3cbbec69d20b34c507284bd300def5b",
|
|
"short_sha": "0bc57212",
|
|
"short_sha_7": "0bc5721",
|
|
"labels": "",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, testCase := range cases {
|
|
testCaseCopy := testCase
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
mockProvider := &scm_provider.MockProvider{
|
|
Repos: testCaseCopy.repos,
|
|
}
|
|
scmGenerator := &SCMProviderGenerator{overrideProvider: mockProvider, SCMConfig: SCMConfig{enableSCMProviders: true}}
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
Generators: []argoprojiov1alpha1.ApplicationSetGenerator{{
|
|
SCMProvider: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
Values: testCaseCopy.values,
|
|
},
|
|
}},
|
|
},
|
|
}
|
|
|
|
got, err := scmGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
|
|
|
|
if testCaseCopy.expectedError != nil {
|
|
assert.EqualError(t, err, testCaseCopy.expectedError.Error())
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestAllowedSCMProvider(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
cases := []struct {
|
|
name string
|
|
providerConfig *argoprojiov1alpha1.SCMProviderGenerator
|
|
}{
|
|
{
|
|
name: "Error Github",
|
|
providerConfig: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
Github: &argoprojiov1alpha1.SCMProviderGeneratorGithub{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error Gitlab",
|
|
providerConfig: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
Gitlab: &argoprojiov1alpha1.SCMProviderGeneratorGitlab{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error Gitea",
|
|
providerConfig: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
Gitea: &argoprojiov1alpha1.SCMProviderGeneratorGitea{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error Bitbucket",
|
|
providerConfig: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
BitbucketServer: &argoprojiov1alpha1.SCMProviderGeneratorBitbucketServer{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Error AzureDevops",
|
|
providerConfig: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
AzureDevOps: &argoprojiov1alpha1.SCMProviderGeneratorAzureDevOps{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, testCase := range cases {
|
|
testCaseCopy := testCase
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
scmGenerator := &SCMProviderGenerator{
|
|
SCMConfig: SCMConfig{
|
|
allowedSCMProviders: []string{
|
|
"github.myorg.com",
|
|
"gitlab.myorg.com",
|
|
"gitea.myorg.com",
|
|
"bitbucket.myorg.com",
|
|
"azuredevops.myorg.com",
|
|
},
|
|
enableSCMProviders: true,
|
|
},
|
|
}
|
|
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
Generators: []argoprojiov1alpha1.ApplicationSetGenerator{{
|
|
SCMProvider: testCaseCopy.providerConfig,
|
|
}},
|
|
},
|
|
}
|
|
|
|
_, err := scmGenerator.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_SCMGenerator(t *testing.T) {
|
|
generator := &SCMProviderGenerator{SCMConfig: SCMConfig{enableSCMProviders: false}}
|
|
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
Generators: []argoprojiov1alpha1.ApplicationSetGenerator{{
|
|
SCMProvider: &argoprojiov1alpha1.SCMProviderGenerator{
|
|
Github: &argoprojiov1alpha1.SCMProviderGeneratorGithub{
|
|
API: "https://myservice.mynamespace.svc.cluster.local",
|
|
},
|
|
},
|
|
}},
|
|
},
|
|
}
|
|
|
|
_, err := generator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
|
|
assert.ErrorIs(t, err, ErrSCMProvidersDisabled)
|
|
}
|
|
|
|
func TestNewSCMHTTPClient(t *testing.T) {
|
|
t.Run("no proxy", func(t *testing.T) {
|
|
g := &SCMProviderGenerator{
|
|
SCMConfig: SCMConfig{
|
|
scmProxyURL: "",
|
|
},
|
|
}
|
|
client := g.newSCMHTTPClient()
|
|
assert.NotNil(t, client)
|
|
assert.Nil(t, client.Transport)
|
|
})
|
|
|
|
t.Run("with proxy", func(t *testing.T) {
|
|
proxyURL := "http://proxy.example.com:8080"
|
|
g := &SCMProviderGenerator{
|
|
SCMConfig: SCMConfig{
|
|
scmProxyURL: proxyURL,
|
|
scmNoProxy: "example.com",
|
|
},
|
|
}
|
|
client := g.newSCMHTTPClient()
|
|
assert.NotNil(t, client)
|
|
require.NotNil(t, client.Transport)
|
|
tr, ok := client.Transport.(*http.Transport)
|
|
assert.True(t, ok)
|
|
assert.NotNil(t, tr.Proxy)
|
|
|
|
req, _ := http.NewRequestWithContext(t.Context(), http.MethodGet, "http://github.com", http.NoBody)
|
|
u, err := tr.Proxy(req)
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, u)
|
|
assert.Equal(t, "proxy.example.com:8080", u.Host)
|
|
|
|
reqNoProxy, _ := http.NewRequestWithContext(t.Context(), http.MethodGet, "http://example.com", http.NoBody)
|
|
u, err = tr.Proxy(reqNoProxy)
|
|
require.NoError(t, err)
|
|
assert.Nil(t, u)
|
|
})
|
|
}
|
|
|
|
func TestNewSCMConfig(t *testing.T) {
|
|
scmRootCAPath := "/path/to/ca"
|
|
allowedSCMProviders := []string{"github.com", "gitlab.com"}
|
|
enableSCMProviders := true
|
|
enableGitHubAPIMetrics := true
|
|
gitHubApps := github_app_auth.Credentials(nil)
|
|
tokenRefStrictMode := true
|
|
|
|
t.Run("default config", func(t *testing.T) {
|
|
config := NewSCMConfig(scmRootCAPath, allowedSCMProviders, enableSCMProviders, enableGitHubAPIMetrics, gitHubApps, tokenRefStrictMode)
|
|
assert.Equal(t, scmRootCAPath, config.scmRootCAPath)
|
|
assert.Equal(t, allowedSCMProviders, config.allowedSCMProviders)
|
|
assert.Equal(t, enableSCMProviders, config.enableSCMProviders)
|
|
assert.Equal(t, enableGitHubAPIMetrics, config.enableGitHubAPIMetrics)
|
|
assert.Equal(t, gitHubApps, config.GitHubApps)
|
|
assert.Equal(t, tokenRefStrictMode, config.tokenRefStrictMode)
|
|
assert.Empty(t, config.scmProxyURL)
|
|
assert.Empty(t, config.scmNoProxy)
|
|
})
|
|
|
|
t.Run("config with options", func(t *testing.T) {
|
|
proxyURL := "http://proxy.example.com"
|
|
noProxy := "localhost,127.0.0.1"
|
|
config := NewSCMConfig(scmRootCAPath, allowedSCMProviders, enableSCMProviders, enableGitHubAPIMetrics, gitHubApps, tokenRefStrictMode,
|
|
WithProxyURL(proxyURL),
|
|
WithNoProxyList(noProxy),
|
|
)
|
|
assert.Equal(t, proxyURL, config.scmProxyURL)
|
|
assert.Equal(t, noProxy, config.scmNoProxy)
|
|
})
|
|
}
|
|
|
|
func TestGithubProvider_ProxyWithoutMetrics(t *testing.T) {
|
|
proxyURL := "http://proxy.example.com:8080"
|
|
|
|
t.Run("token-based auth passes httpClient when metrics disabled", func(t *testing.T) {
|
|
g := &SCMProviderGenerator{
|
|
SCMConfig: SCMConfig{
|
|
enableGitHubAPIMetrics: false,
|
|
scmProxyURL: proxyURL,
|
|
},
|
|
}
|
|
httpClient := g.newSCMHTTPClient()
|
|
|
|
// Verify the client has a proxy-configured transport
|
|
require.NotNil(t, httpClient.Transport)
|
|
tr, ok := httpClient.Transport.(*http.Transport)
|
|
require.True(t, ok)
|
|
require.NotNil(t, tr.Proxy)
|
|
|
|
req, _ := http.NewRequestWithContext(t.Context(), http.MethodGet, "http://github.com", http.NoBody)
|
|
u, err := tr.Proxy(req)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "proxy.example.com:8080", u.Host)
|
|
})
|
|
|
|
t.Run("no proxy configured returns bare client when metrics disabled", func(t *testing.T) {
|
|
g := &SCMProviderGenerator{
|
|
SCMConfig: SCMConfig{
|
|
enableGitHubAPIMetrics: false,
|
|
scmProxyURL: "",
|
|
},
|
|
}
|
|
httpClient := g.newSCMHTTPClient()
|
|
|
|
assert.NotNil(t, httpClient)
|
|
assert.Nil(t, httpClient.Transport) // bare &http.Client{} — uses DefaultTransport
|
|
})
|
|
}
|