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]>
1365 lines
38 KiB
Go
1365 lines
38 KiB
Go
package generators
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
|
|
|
|
generatorsMock "github.com/hanzoai/deploy/applicationset/generators/mocks"
|
|
servicesMocks "github.com/hanzoai/deploy/applicationset/services/mocks"
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
func TestMatrixGenerate(t *testing.T) {
|
|
gitGenerator := &v1alpha1.GitGenerator{
|
|
RepoURL: "RepoURL",
|
|
Revision: "Revision",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{{Path: "*"}},
|
|
}
|
|
|
|
listGenerator := &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{{Raw: []byte(`{"cluster": "Cluster","url": "Url", "templated": "test-{{path.basenameNormalized}}"}`)}},
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
baseGenerators []v1alpha1.ApplicationSetNestedGenerator
|
|
expectedErr error
|
|
expected []map[string]any
|
|
}{
|
|
{
|
|
name: "happy flow - generate params",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{"path": "app1", "path.basename": "app1", "path.basenameNormalized": "app1", "cluster": "Cluster", "url": "Url", "templated": "test-app1"},
|
|
{"path": "app2", "path.basename": "app2", "path.basenameNormalized": "app2", "cluster": "Cluster", "url": "Url", "templated": "test-app2"},
|
|
},
|
|
},
|
|
{
|
|
name: "happy flow - generate params from two lists",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{Raw: []byte(`{"a": "1"}`)},
|
|
{Raw: []byte(`{"a": "2"}`)},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{Raw: []byte(`{"b": "1"}`)},
|
|
{Raw: []byte(`{"b": "2"}`)},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{"a": "1", "b": "1"},
|
|
{"a": "1", "b": "2"},
|
|
{"a": "2", "b": "1"},
|
|
{"a": "2", "b": "2"},
|
|
},
|
|
},
|
|
{
|
|
name: "returns error if there is less than two base generators",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrLessThanTwoGenerators,
|
|
},
|
|
{
|
|
name: "returns error if there is more than two base generators",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrMoreThanTwoGenerators,
|
|
},
|
|
{
|
|
name: "returns error if there is more than one inner generator in the first base generator",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrMoreThenOneInnerGenerators,
|
|
},
|
|
{
|
|
name: "returns error if there is more than one inner generator in the second base generator",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
Git: gitGenerator,
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrMoreThenOneInnerGenerators,
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
testCaseCopy := testCase // Since tests may run in parallel
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
genMock := &generatorsMock.Generator{}
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{},
|
|
}
|
|
|
|
for _, g := range testCaseCopy.baseGenerators {
|
|
gitGeneratorSpec := v1alpha1.ApplicationSetGenerator{
|
|
Git: g.Git,
|
|
List: g.List,
|
|
}
|
|
genMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]any{
|
|
{
|
|
"path": "app1",
|
|
"path.basename": "app1",
|
|
"path.basenameNormalized": "app1",
|
|
},
|
|
{
|
|
"path": "app2",
|
|
"path.basename": "app2",
|
|
"path.basenameNormalized": "app2",
|
|
},
|
|
}, nil)
|
|
|
|
genMock.EXPECT().GetTemplate(&gitGeneratorSpec).
|
|
Return(&v1alpha1.ApplicationSetTemplate{})
|
|
}
|
|
|
|
matrixGenerator := NewMatrixGenerator(
|
|
map[string]Generator{
|
|
"Git": genMock,
|
|
"List": &ListGenerator{},
|
|
},
|
|
)
|
|
|
|
got, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: testCaseCopy.baseGenerators,
|
|
Template: v1alpha1.ApplicationSetTemplate{},
|
|
},
|
|
}, appSet, nil)
|
|
|
|
if testCaseCopy.expectedErr != nil {
|
|
require.ErrorIs(t, err, testCaseCopy.expectedErr)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMatrixGenerateGoTemplate(t *testing.T) {
|
|
gitGenerator := &v1alpha1.GitGenerator{
|
|
RepoURL: "RepoURL",
|
|
Revision: "Revision",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{{Path: "*"}},
|
|
}
|
|
|
|
listGenerator := &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{{Raw: []byte(`{"cluster": "Cluster","url": "Url"}`)}},
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
baseGenerators []v1alpha1.ApplicationSetNestedGenerator
|
|
expectedErr error
|
|
expected []map[string]any
|
|
}{
|
|
{
|
|
name: "happy flow - generate params",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"path": map[string]string{
|
|
"path": "app1",
|
|
"basename": "app1",
|
|
"basenameNormalized": "app1",
|
|
},
|
|
"cluster": "Cluster",
|
|
"url": "Url",
|
|
},
|
|
{
|
|
"path": map[string]string{
|
|
"path": "app2",
|
|
"basename": "app2",
|
|
"basenameNormalized": "app2",
|
|
},
|
|
"cluster": "Cluster",
|
|
"url": "Url",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "happy flow - generate params from two lists",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{Raw: []byte(`{"a": "1"}`)},
|
|
{Raw: []byte(`{"a": "2"}`)},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{Raw: []byte(`{"b": "1"}`)},
|
|
{Raw: []byte(`{"b": "2"}`)},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{"a": "1", "b": "1"},
|
|
{"a": "1", "b": "2"},
|
|
{"a": "2", "b": "1"},
|
|
{"a": "2", "b": "2"},
|
|
},
|
|
},
|
|
{
|
|
name: "parameter override: first list elements take precedence",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{Raw: []byte(`{"booleanFalse": false, "booleanTrue": true, "stringFalse": "false", "stringTrue": "true"}`)},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{Raw: []byte(`{"booleanFalse": true, "booleanTrue": false, "stringFalse": "true", "stringTrue": "false"}`)},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{"booleanFalse": false, "booleanTrue": true, "stringFalse": "false", "stringTrue": "true"},
|
|
},
|
|
},
|
|
{
|
|
name: "returns error if there is less than two base generators",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrLessThanTwoGenerators,
|
|
},
|
|
{
|
|
name: "returns error if there is more than two base generators",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrMoreThanTwoGenerators,
|
|
},
|
|
{
|
|
name: "returns error if there is more than one inner generator in the first base generator",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrMoreThenOneInnerGenerators,
|
|
},
|
|
{
|
|
name: "returns error if there is more than one inner generator in the second base generator",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
{
|
|
Git: gitGenerator,
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expectedErr: ErrMoreThenOneInnerGenerators,
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
testCaseCopy := testCase // Since tests may run in parallel
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
genMock := &generatorsMock.Generator{}
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
GoTemplate: true,
|
|
},
|
|
}
|
|
|
|
for _, g := range testCaseCopy.baseGenerators {
|
|
gitGeneratorSpec := v1alpha1.ApplicationSetGenerator{
|
|
Git: g.Git,
|
|
List: g.List,
|
|
}
|
|
genMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]any{
|
|
{
|
|
"path": map[string]string{
|
|
"path": "app1",
|
|
"basename": "app1",
|
|
"basenameNormalized": "app1",
|
|
},
|
|
},
|
|
{
|
|
"path": map[string]string{
|
|
"path": "app2",
|
|
"basename": "app2",
|
|
"basenameNormalized": "app2",
|
|
},
|
|
},
|
|
}, nil)
|
|
|
|
genMock.EXPECT().GetTemplate(&gitGeneratorSpec).
|
|
Return(&v1alpha1.ApplicationSetTemplate{})
|
|
}
|
|
|
|
matrixGenerator := NewMatrixGenerator(
|
|
map[string]Generator{
|
|
"Git": genMock,
|
|
"List": &ListGenerator{},
|
|
},
|
|
)
|
|
|
|
got, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: testCaseCopy.baseGenerators,
|
|
Template: v1alpha1.ApplicationSetTemplate{},
|
|
},
|
|
}, appSet, nil)
|
|
|
|
if testCaseCopy.expectedErr != nil {
|
|
require.ErrorIs(t, err, testCaseCopy.expectedErr)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMatrixGetRequeueAfter(t *testing.T) {
|
|
gitGenerator := &v1alpha1.GitGenerator{
|
|
RepoURL: "RepoURL",
|
|
Revision: "Revision",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{{Path: "*"}},
|
|
}
|
|
|
|
listGenerator := &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{{Raw: []byte(`{"cluster": "Cluster","url": "Url"}`)}},
|
|
}
|
|
|
|
pullRequestGenerator := &v1alpha1.PullRequestGenerator{}
|
|
|
|
scmGenerator := &v1alpha1.SCMProviderGenerator{}
|
|
|
|
duckTypeGenerator := &v1alpha1.DuckTypeGenerator{}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
baseGenerators []v1alpha1.ApplicationSetNestedGenerator
|
|
gitGetRequeueAfter time.Duration
|
|
expected time.Duration
|
|
}{
|
|
{
|
|
name: "return NoRequeueAfter if all the inner baseGenerators returns it",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
gitGetRequeueAfter: NoRequeueAfter,
|
|
expected: NoRequeueAfter,
|
|
},
|
|
{
|
|
name: "returns the minimal time",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
gitGetRequeueAfter: time.Duration(1),
|
|
expected: time.Duration(1),
|
|
},
|
|
{
|
|
name: "returns the minimal time for pull request",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
PullRequest: pullRequestGenerator,
|
|
},
|
|
},
|
|
gitGetRequeueAfter: time.Duration(15 * time.Second),
|
|
expected: time.Duration(15 * time.Second),
|
|
},
|
|
{
|
|
name: "returns the default time if no requeueAfterSeconds is provided",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
PullRequest: pullRequestGenerator,
|
|
},
|
|
},
|
|
expected: time.Duration(30 * time.Minute),
|
|
},
|
|
{
|
|
name: "returns the default time for duck type generator",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
ClusterDecisionResource: duckTypeGenerator,
|
|
},
|
|
},
|
|
expected: time.Duration(3 * time.Minute),
|
|
},
|
|
{
|
|
name: "returns the default time for scm generator",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
SCMProvider: scmGenerator,
|
|
},
|
|
},
|
|
expected: time.Duration(30 * time.Minute),
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
testCaseCopy := testCase // Since tests may run in parallel
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
mock := &generatorsMock.Generator{}
|
|
|
|
for _, g := range testCaseCopy.baseGenerators {
|
|
gitGeneratorSpec := v1alpha1.ApplicationSetGenerator{
|
|
Git: g.Git,
|
|
List: g.List,
|
|
PullRequest: g.PullRequest,
|
|
SCMProvider: g.SCMProvider,
|
|
ClusterDecisionResource: g.ClusterDecisionResource,
|
|
}
|
|
mock.EXPECT().GetRequeueAfter(&gitGeneratorSpec).Return(testCaseCopy.gitGetRequeueAfter)
|
|
}
|
|
|
|
matrixGenerator := NewMatrixGenerator(
|
|
map[string]Generator{
|
|
"Git": mock,
|
|
"List": &ListGenerator{},
|
|
"PullRequest": &PullRequestGenerator{},
|
|
"SCMProvider": &SCMProviderGenerator{},
|
|
"ClusterDecisionResource": &DuckTypeGenerator{},
|
|
},
|
|
)
|
|
|
|
got := matrixGenerator.GetRequeueAfter(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: testCaseCopy.baseGenerators,
|
|
Template: v1alpha1.ApplicationSetTemplate{},
|
|
},
|
|
})
|
|
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestInterpolatedMatrixGenerate(t *testing.T) {
|
|
interpolatedGitGenerator := &v1alpha1.GitGenerator{
|
|
RepoURL: "RepoURL",
|
|
Revision: "Revision",
|
|
Files: []v1alpha1.GitFileGeneratorItem{
|
|
{Path: "examples/git-generator-files-discovery/cluster-config/dev/config.json"},
|
|
{Path: "examples/git-generator-files-discovery/cluster-config/prod/config.json"},
|
|
},
|
|
}
|
|
|
|
interpolatedClusterGenerator := &v1alpha1.ClusterGenerator{
|
|
Selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"environment": "{{path.basename}}"},
|
|
MatchExpressions: nil,
|
|
},
|
|
}
|
|
testCases := []struct {
|
|
name string
|
|
baseGenerators []v1alpha1.ApplicationSetNestedGenerator
|
|
expectedErr error
|
|
expected []map[string]any
|
|
clientError bool
|
|
}{
|
|
{
|
|
name: "happy flow - generate interpolated params",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: interpolatedGitGenerator,
|
|
},
|
|
{
|
|
Clusters: interpolatedClusterGenerator,
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{"path": "examples/git-generator-files-discovery/cluster-config/dev/config.json", "path.basename": "dev", "path.basenameNormalized": "dev", "name": "dev-01", "nameNormalized": "dev-01", "server": "https://dev-01.example.com", "metadata.labels.environment": "dev", "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "project": ""},
|
|
{"path": "examples/git-generator-files-discovery/cluster-config/prod/config.json", "path.basename": "prod", "path.basenameNormalized": "prod", "name": "prod-01", "nameNormalized": "prod-01", "server": "https://prod-01.example.com", "metadata.labels.environment": "prod", "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "project": ""},
|
|
},
|
|
clientError: false,
|
|
},
|
|
}
|
|
clusters := []client.Object{
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "dev-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "dev",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("dev-01"),
|
|
"server": []byte("https://dev-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "prod-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "prod",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("prod-01"),
|
|
"server": []byte("https://prod-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
testCaseCopy := testCase // Since tests may run in parallel
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
genMock := &generatorsMock.Generator{}
|
|
appSet := &v1alpha1.ApplicationSet{}
|
|
|
|
fakeClient := fake.NewClientBuilder().WithObjects(clusters...).Build()
|
|
cl := &possiblyErroringFakeCtrlRuntimeClient{
|
|
fakeClient,
|
|
testCase.clientError,
|
|
}
|
|
clusterGenerator := NewClusterGenerator(cl, "namespace")
|
|
|
|
for _, g := range testCaseCopy.baseGenerators {
|
|
gitGeneratorSpec := v1alpha1.ApplicationSetGenerator{
|
|
Git: g.Git,
|
|
Clusters: g.Clusters,
|
|
}
|
|
genMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]any{
|
|
{
|
|
"path": "examples/git-generator-files-discovery/cluster-config/dev/config.json",
|
|
"path.basename": "dev",
|
|
"path.basenameNormalized": "dev",
|
|
},
|
|
{
|
|
"path": "examples/git-generator-files-discovery/cluster-config/prod/config.json",
|
|
"path.basename": "prod",
|
|
"path.basenameNormalized": "prod",
|
|
},
|
|
}, nil)
|
|
genMock.EXPECT().GetTemplate(&gitGeneratorSpec).
|
|
Return(&v1alpha1.ApplicationSetTemplate{})
|
|
}
|
|
matrixGenerator := NewMatrixGenerator(
|
|
map[string]Generator{
|
|
"Git": genMock,
|
|
"Clusters": clusterGenerator,
|
|
},
|
|
)
|
|
|
|
got, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: testCaseCopy.baseGenerators,
|
|
Template: v1alpha1.ApplicationSetTemplate{},
|
|
},
|
|
}, appSet, nil)
|
|
|
|
if testCaseCopy.expectedErr != nil {
|
|
require.ErrorIs(t, err, testCaseCopy.expectedErr)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestInterpolatedMatrixGenerateGoTemplate(t *testing.T) {
|
|
interpolatedGitGenerator := &v1alpha1.GitGenerator{
|
|
RepoURL: "RepoURL",
|
|
Revision: "Revision",
|
|
Files: []v1alpha1.GitFileGeneratorItem{
|
|
{Path: "examples/git-generator-files-discovery/cluster-config/dev/config.json"},
|
|
{Path: "examples/git-generator-files-discovery/cluster-config/prod/config.json"},
|
|
},
|
|
}
|
|
|
|
interpolatedClusterGenerator := &v1alpha1.ClusterGenerator{
|
|
Selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"environment": "{{.path.basename}}"},
|
|
MatchExpressions: nil,
|
|
},
|
|
}
|
|
testCases := []struct {
|
|
name string
|
|
baseGenerators []v1alpha1.ApplicationSetNestedGenerator
|
|
expectedErr error
|
|
expected []map[string]any
|
|
clientError bool
|
|
}{
|
|
{
|
|
name: "happy flow - generate interpolated params",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: interpolatedGitGenerator,
|
|
},
|
|
{
|
|
Clusters: interpolatedClusterGenerator,
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"path": map[string]string{
|
|
"path": "examples/git-generator-files-discovery/cluster-config/dev/config.json",
|
|
"basename": "dev",
|
|
"basenameNormalized": "dev",
|
|
},
|
|
"name": "dev-01",
|
|
"nameNormalized": "dev-01",
|
|
"server": "https://dev-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"environment": "dev",
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
"path": map[string]string{
|
|
"path": "examples/git-generator-files-discovery/cluster-config/prod/config.json",
|
|
"basename": "prod",
|
|
"basenameNormalized": "prod",
|
|
},
|
|
"name": "prod-01",
|
|
"nameNormalized": "prod-01",
|
|
"server": "https://prod-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"environment": "prod",
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
},
|
|
}
|
|
clusters := []client.Object{
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "dev-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "dev",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("dev-01"),
|
|
"server": []byte("https://dev-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "prod-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "prod",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("prod-01"),
|
|
"server": []byte("https://prod-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
testCaseCopy := testCase // Since tests may run in parallel
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
genMock := &generatorsMock.Generator{}
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
GoTemplate: true,
|
|
},
|
|
}
|
|
|
|
fakeClient := fake.NewClientBuilder().WithObjects(clusters...).Build()
|
|
cl := &possiblyErroringFakeCtrlRuntimeClient{
|
|
fakeClient,
|
|
testCase.clientError,
|
|
}
|
|
clusterGenerator := NewClusterGenerator(cl, "namespace")
|
|
|
|
for _, g := range testCaseCopy.baseGenerators {
|
|
gitGeneratorSpec := v1alpha1.ApplicationSetGenerator{
|
|
Git: g.Git,
|
|
Clusters: g.Clusters,
|
|
}
|
|
genMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]any{
|
|
{
|
|
"path": map[string]string{
|
|
"path": "examples/git-generator-files-discovery/cluster-config/dev/config.json",
|
|
"basename": "dev",
|
|
"basenameNormalized": "dev",
|
|
},
|
|
},
|
|
{
|
|
"path": map[string]string{
|
|
"path": "examples/git-generator-files-discovery/cluster-config/prod/config.json",
|
|
"basename": "prod",
|
|
"basenameNormalized": "prod",
|
|
},
|
|
},
|
|
}, nil)
|
|
genMock.EXPECT().GetTemplate(&gitGeneratorSpec).
|
|
Return(&v1alpha1.ApplicationSetTemplate{})
|
|
}
|
|
matrixGenerator := NewMatrixGenerator(
|
|
map[string]Generator{
|
|
"Git": genMock,
|
|
"Clusters": clusterGenerator,
|
|
},
|
|
)
|
|
|
|
got, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: testCaseCopy.baseGenerators,
|
|
Template: v1alpha1.ApplicationSetTemplate{},
|
|
},
|
|
}, appSet, nil)
|
|
|
|
if testCaseCopy.expectedErr != nil {
|
|
require.ErrorIs(t, err, testCaseCopy.expectedErr)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMatrixGenerateListElementsYaml(t *testing.T) {
|
|
gitGenerator := &v1alpha1.GitGenerator{
|
|
RepoURL: "RepoURL",
|
|
Revision: "Revision",
|
|
Files: []v1alpha1.GitFileGeneratorItem{
|
|
{Path: "config.yaml"},
|
|
},
|
|
}
|
|
|
|
listGenerator := &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{},
|
|
ElementsYaml: "{{ .foo.bar | toJson }}",
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
baseGenerators []v1alpha1.ApplicationSetNestedGenerator
|
|
expectedErr error
|
|
expected []map[string]any
|
|
}{
|
|
{
|
|
name: "happy flow - generate params",
|
|
baseGenerators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Git: gitGenerator,
|
|
},
|
|
{
|
|
List: listGenerator,
|
|
},
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"chart": "a",
|
|
"version": "1",
|
|
"foo": map[string]any{
|
|
"bar": []any{
|
|
map[string]any{
|
|
"chart": "a",
|
|
"version": "1",
|
|
},
|
|
map[string]any{
|
|
"chart": "b",
|
|
"version": "2",
|
|
},
|
|
},
|
|
},
|
|
"path": map[string]any{
|
|
"basename": "dir",
|
|
"basenameNormalized": "dir",
|
|
"filename": "file_name.yaml",
|
|
"filenameNormalized": "file-name.yaml",
|
|
"path": "path/dir",
|
|
"segments": []string{
|
|
"path",
|
|
"dir",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
"chart": "b",
|
|
"version": "2",
|
|
"foo": map[string]any{
|
|
"bar": []any{
|
|
map[string]any{
|
|
"chart": "a",
|
|
"version": "1",
|
|
},
|
|
map[string]any{
|
|
"chart": "b",
|
|
"version": "2",
|
|
},
|
|
},
|
|
},
|
|
"path": map[string]any{
|
|
"basename": "dir",
|
|
"basenameNormalized": "dir",
|
|
"filename": "file_name.yaml",
|
|
"filenameNormalized": "file-name.yaml",
|
|
"path": "path/dir",
|
|
"segments": []string{
|
|
"path",
|
|
"dir",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
testCaseCopy := testCase // Since tests may run in parallel
|
|
|
|
t.Run(testCaseCopy.name, func(t *testing.T) {
|
|
genMock := &generatorsMock.Generator{}
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
GoTemplate: true,
|
|
},
|
|
}
|
|
|
|
for _, g := range testCaseCopy.baseGenerators {
|
|
gitGeneratorSpec := v1alpha1.ApplicationSetGenerator{
|
|
Git: g.Git,
|
|
List: g.List,
|
|
}
|
|
genMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]any{{
|
|
"foo": map[string]any{
|
|
"bar": []any{
|
|
map[string]any{
|
|
"chart": "a",
|
|
"version": "1",
|
|
},
|
|
map[string]any{
|
|
"chart": "b",
|
|
"version": "2",
|
|
},
|
|
},
|
|
},
|
|
"path": map[string]any{
|
|
"basename": "dir",
|
|
"basenameNormalized": "dir",
|
|
"filename": "file_name.yaml",
|
|
"filenameNormalized": "file-name.yaml",
|
|
"path": "path/dir",
|
|
"segments": []string{
|
|
"path",
|
|
"dir",
|
|
},
|
|
},
|
|
}}, nil)
|
|
genMock.EXPECT().GetTemplate(&gitGeneratorSpec).
|
|
Return(&v1alpha1.ApplicationSetTemplate{})
|
|
}
|
|
|
|
matrixGenerator := NewMatrixGenerator(
|
|
map[string]Generator{
|
|
"Git": genMock,
|
|
"List": &ListGenerator{},
|
|
},
|
|
)
|
|
|
|
got, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: testCaseCopy.baseGenerators,
|
|
Template: v1alpha1.ApplicationSetTemplate{},
|
|
},
|
|
}, appSet, nil)
|
|
|
|
if testCaseCopy.expectedErr != nil {
|
|
require.ErrorIs(t, err, testCaseCopy.expectedErr)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testCaseCopy.expected, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGitGenerator_GenerateParams_list_x_git_matrix_generator(t *testing.T) {
|
|
// Given a matrix generator over a list generator and a git files generator, the nested git files generator should
|
|
// be treated as a files generator, and it should produce parameters.
|
|
|
|
// This tests for a specific bug where a nested git files generator was being treated as a directory generator. This
|
|
// happened because, when the matrix generator was being processed, the nested git files generator was being
|
|
// interpolated by the deeplyReplace function. That function cannot differentiate between a nil slice and an empty
|
|
// slice. So it was replacing the `Directories` field with an empty slice, which the ApplicationSet controller
|
|
// interpreted as meaning this was a directory generator, not a files generator.
|
|
|
|
// Now instead of checking for nil, we check whether the field is a non-empty slice. This test prevents a regression
|
|
// of that bug.
|
|
|
|
listGeneratorMock := &generatorsMock.Generator{}
|
|
listGeneratorMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).Return([]map[string]any{
|
|
{"some": "value"},
|
|
}, nil)
|
|
listGeneratorMock.EXPECT().GetTemplate(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator")).Return(&v1alpha1.ApplicationSetTemplate{})
|
|
|
|
gitGeneratorSpec := &v1alpha1.GitGenerator{
|
|
RepoURL: "https://git.example.com",
|
|
Files: []v1alpha1.GitFileGeneratorItem{
|
|
{Path: "some/path.json"},
|
|
},
|
|
}
|
|
|
|
repoServiceMock := &servicesMocks.Repos{}
|
|
repoServiceMock.EXPECT().GetFiles(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(map[string][]byte{
|
|
"some/path.json": []byte("test: content"),
|
|
}, nil).Maybe()
|
|
gitGenerator := NewGitGenerator(repoServiceMock, "")
|
|
|
|
matrixGenerator := NewMatrixGenerator(map[string]Generator{
|
|
"List": listGeneratorMock,
|
|
"Git": gitGenerator,
|
|
})
|
|
|
|
matrixGeneratorSpec := &v1alpha1.MatrixGenerator{
|
|
Generators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{
|
|
Raw: []byte(`{"some": "value"}`),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Git: gitGeneratorSpec,
|
|
},
|
|
},
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
err := v1alpha1.AddToScheme(scheme)
|
|
require.NoError(t, err)
|
|
appProject := v1alpha1.AppProject{}
|
|
|
|
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
|
|
|
|
params, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: matrixGeneratorSpec,
|
|
}, &v1alpha1.ApplicationSet{}, client)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []map[string]any{{
|
|
"path": "some",
|
|
"path.basename": "some",
|
|
"path.basenameNormalized": "some",
|
|
"path.filename": "path.json",
|
|
"path.filenameNormalized": "path.json",
|
|
"path[0]": "some",
|
|
"some": "value",
|
|
"test": "content",
|
|
}}, params)
|
|
}
|
|
|
|
func TestGitGenerator_GenerateParams_list_x_git_matrix_generator_error_includes_repo(t *testing.T) {
|
|
gitGeneratorSpec := &v1alpha1.GitGenerator{
|
|
RepoURL: "{{url}}",
|
|
Revision: "HEAD",
|
|
Files: []v1alpha1.GitFileGeneratorItem{
|
|
{Path: "ste1/values.yaml"},
|
|
},
|
|
}
|
|
|
|
repoServiceMock := &servicesMocks.Repos{}
|
|
repoServiceMock.EXPECT().GetFiles(
|
|
mock.Anything,
|
|
"https://git.example.com/repo-a.git",
|
|
mock.Anything,
|
|
mock.Anything,
|
|
"ste1/values.yaml",
|
|
mock.Anything,
|
|
mock.Anything,
|
|
).Return(map[string][]byte{
|
|
"ste1/values.yaml": []byte("invalid: ["),
|
|
}, nil)
|
|
gitGenerator := NewGitGenerator(repoServiceMock, "")
|
|
|
|
matrixGenerator := NewMatrixGenerator(map[string]Generator{
|
|
"List": &ListGenerator{},
|
|
"Git": gitGenerator,
|
|
})
|
|
|
|
matrixGeneratorSpec := &v1alpha1.MatrixGenerator{
|
|
Generators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{
|
|
Raw: []byte(`{"url": "https://git.example.com/repo-a.git"}`),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Git: gitGeneratorSpec,
|
|
},
|
|
},
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
err := v1alpha1.AddToScheme(scheme)
|
|
require.NoError(t, err)
|
|
appProject := v1alpha1.AppProject{}
|
|
|
|
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
|
|
|
|
_, err = matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: matrixGeneratorSpec,
|
|
}, &v1alpha1.ApplicationSet{}, client)
|
|
require.Error(t, err)
|
|
require.ErrorContains(t, err, "https://git.example.com/repo-a.git")
|
|
require.ErrorContains(t, err, "ste1/values.yaml")
|
|
}
|
|
|
|
func TestGitGenerator_GenerateParams_list_x_git_matrix_generator_go_templates_values(t *testing.T) {
|
|
// Given a matrix generator over a list generator and a git generator with values,
|
|
// that contain a template that refers to got generator output parameters.
|
|
// This tests for a specific bug where the second generator in the matrix
|
|
// failed to evaluate value templates that referred to generator output parameters.
|
|
|
|
listGeneratorMock := &generatorsMock.Generator{}
|
|
listGeneratorMock.EXPECT().GenerateParams(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), mock.AnythingOfType("*v1alpha1.ApplicationSet"), mock.Anything).Return([]map[string]any{
|
|
{"some": "value"},
|
|
}, nil)
|
|
listGeneratorMock.EXPECT().GetTemplate(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator")).Return(&v1alpha1.ApplicationSetTemplate{})
|
|
|
|
gitGeneratorSpec := &v1alpha1.GitGenerator{
|
|
RepoURL: "https://git.example.com",
|
|
Files: []v1alpha1.GitFileGeneratorItem{
|
|
{Path: "some/path.json"},
|
|
},
|
|
Values: map[string]string{
|
|
"foo": "{{.path.basename}}",
|
|
},
|
|
}
|
|
|
|
repoServiceMock := &servicesMocks.Repos{}
|
|
repoServiceMock.EXPECT().GetFiles(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(map[string][]byte{
|
|
"some/path.json": []byte("test: content"),
|
|
}, nil).Maybe()
|
|
gitGenerator := NewGitGenerator(repoServiceMock, "")
|
|
|
|
matrixGenerator := NewMatrixGenerator(map[string]Generator{
|
|
"List": listGeneratorMock,
|
|
"Git": gitGenerator,
|
|
})
|
|
|
|
matrixGeneratorSpec := &v1alpha1.MatrixGenerator{
|
|
Generators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
List: &v1alpha1.ListGenerator{
|
|
Elements: []apiextensionsv1.JSON{
|
|
{
|
|
Raw: []byte(`{"some": "value"}`),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Git: gitGeneratorSpec,
|
|
},
|
|
},
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
err := v1alpha1.AddToScheme(scheme)
|
|
require.NoError(t, err)
|
|
appProject := v1alpha1.AppProject{}
|
|
|
|
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
|
|
|
|
params, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: matrixGeneratorSpec,
|
|
}, &v1alpha1.ApplicationSet{
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
GoTemplate: true,
|
|
},
|
|
}, client)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []map[string]any{{
|
|
"path": map[string]any{
|
|
"basename": "some",
|
|
"basenameNormalized": "some",
|
|
"filename": "path.json",
|
|
"filenameNormalized": "path.json",
|
|
"path": "some",
|
|
"segments": []string{"some"},
|
|
},
|
|
"some": "value",
|
|
"test": "content",
|
|
"values": map[string]string{
|
|
"foo": "some",
|
|
},
|
|
}}, params)
|
|
}
|
|
|
|
func TestInterpolatedMatrixGenerateGoTemplate_ClusterValuesFromFirstGenerator(t *testing.T) {
|
|
const guestBook = "guestbook"
|
|
|
|
gitGeneratorSpec, genMock, clusterGeneratorSpec := getGenerators()
|
|
|
|
fakeClient := fake.NewClientBuilder().WithObjects([]client.Object{clusterSecret()}...).Build()
|
|
clusterGenerator := NewClusterGenerator(fakeClient, "argocd")
|
|
|
|
matrixGenerator := NewMatrixGenerator(map[string]Generator{
|
|
"Git": genMock,
|
|
"Clusters": clusterGenerator,
|
|
})
|
|
|
|
params, err := matrixGenerator.GenerateParams(&v1alpha1.ApplicationSetGenerator{
|
|
Matrix: &v1alpha1.MatrixGenerator{
|
|
Generators: []v1alpha1.ApplicationSetNestedGenerator{
|
|
{Git: gitGeneratorSpec},
|
|
{Clusters: clusterGeneratorSpec},
|
|
},
|
|
},
|
|
}, appSet(), fakeClient)
|
|
|
|
require.NoError(t, err, "Expected cluster values referencing git params to resolve correctly")
|
|
require.Len(t, params, 1, "Expected exactly one combined param set")
|
|
|
|
assert.Equal(t, map[string]string{
|
|
"path": guestBook,
|
|
"basename": guestBook,
|
|
"basenameNormalized": guestBook,
|
|
}, params[0]["path"], "Git path params should be present")
|
|
|
|
assert.Equal(t, map[string]string{
|
|
"env": guestBook,
|
|
}, params[0]["values"], "Cluster values.env should be resolved from git params")
|
|
|
|
assert.Equal(t, "guestbook-cluster", params[0]["name"])
|
|
assert.Equal(t, "https://guestbook.example.com", params[0]["server"])
|
|
}
|
|
|
|
func appSet() *v1alpha1.ApplicationSet {
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "repro",
|
|
Namespace: "argocd",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
GoTemplate: true,
|
|
// This is the most important part of the test because this is telling the code to return an error
|
|
GoTemplateOptions: []string{"missingkey=error"},
|
|
},
|
|
}
|
|
return appSet
|
|
}
|
|
|
|
func clusterSecret() *corev1.Secret {
|
|
clusterSecret := &corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "guestbook-cluster",
|
|
Namespace: "argocd",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "guestbook",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("guestbook-cluster"),
|
|
"server": []byte("https://guestbook.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
}
|
|
return clusterSecret
|
|
}
|
|
|
|
func getGenerators() (*v1alpha1.GitGenerator, *generatorsMock.Generator, *v1alpha1.ClusterGenerator) {
|
|
const guestBook = "guestbook"
|
|
gitGeneratorSpec := &v1alpha1.GitGenerator{
|
|
RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
|
|
Revision: "HEAD",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{
|
|
{Path: guestBook},
|
|
},
|
|
}
|
|
|
|
genMock := &generatorsMock.Generator{}
|
|
genMock.EXPECT().
|
|
GenerateParams(
|
|
mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"),
|
|
mock.AnythingOfType("*v1alpha1.ApplicationSet"),
|
|
mock.Anything).
|
|
Return([]map[string]any{
|
|
{
|
|
"path": map[string]string{
|
|
"path": guestBook,
|
|
"basename": guestBook,
|
|
"basenameNormalized": guestBook,
|
|
},
|
|
},
|
|
}, nil)
|
|
genMock.EXPECT().
|
|
GetTemplate(mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator")).
|
|
Return(&v1alpha1.ApplicationSetTemplate{})
|
|
|
|
clusterGeneratorSpec := &v1alpha1.ClusterGenerator{
|
|
Selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"environment": "{{.path.basename}}",
|
|
},
|
|
},
|
|
Values: map[string]string{
|
|
"env": "{{.path.basename}}",
|
|
},
|
|
}
|
|
return gitGeneratorSpec, genMock, clusterGeneratorSpec
|
|
}
|