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]>
632 lines
22 KiB
Go
632 lines
22 KiB
Go
package e2e
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
. "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/test/e2e/fixture"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture/app"
|
|
|
|
. "github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
)
|
|
|
|
func restrictedDefaultProjectSpec() AppProjectSpec {
|
|
return AppProjectSpec{
|
|
SourceRepos: []string{"https://example.com/not-the-repo"},
|
|
Destinations: []ApplicationDestination{{Server: "*", Namespace: "*"}},
|
|
ClusterResourceWhitelist: []ClusterResourceRestrictionItem{{Group: "*", Kind: "*"}},
|
|
}
|
|
}
|
|
|
|
func permissiveDefaultProjectSpec() AppProjectSpec {
|
|
return AppProjectSpec{
|
|
SourceRepos: []string{"*"},
|
|
Destinations: []ApplicationDestination{{Server: "*", Namespace: "*"}},
|
|
ClusterResourceWhitelist: []ClusterResourceRestrictionItem{{Group: "*", Kind: "*"}},
|
|
}
|
|
}
|
|
|
|
func TestSimpleHydrator(t *testing.T) {
|
|
Given(t).
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
CreateApp().
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestHydrateTo(t *testing.T) {
|
|
Given(t).
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook").
|
|
SyncSourceBranch("env/test").
|
|
HydrateToBranch("env/test-next").
|
|
When().
|
|
CreateApp().
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Given().
|
|
// Async so we don't fail immediately on the error
|
|
Async(true).
|
|
When().
|
|
Sync().
|
|
Wait("--operation").
|
|
Then().
|
|
// Fails because we hydrated to env/test-next but not to env/test.
|
|
Expect(OperationPhaseIs(OperationError)).
|
|
When().
|
|
// Will now hydrate to the sync source branch.
|
|
AppSet("--hydrate-to-branch", "").
|
|
// a new git commit, that has a new revisionHistoryLimit.
|
|
PatchFile("guestbook/guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Wait("--operation").
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestAddingApp(t *testing.T) {
|
|
// Make sure that if we add another app targeting the same sync branch, it hydrates correctly.
|
|
Given(t).
|
|
Name("test-adding-app-1").
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook-1").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
CreateApp().
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Given().
|
|
Name("test-adding-app-2").
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook-2").
|
|
SyncSourceBranch("env/test2").
|
|
When().
|
|
CreateApp().
|
|
// a new git commit, that has a new revisionHistoryLimit.
|
|
PatchFile("guestbook/guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// Clean up the apps manually since we used custom names.
|
|
When().
|
|
Delete(true).
|
|
Then().
|
|
Expect(DoesNotExist()).
|
|
Given().
|
|
Name("test-adding-app-1").
|
|
When().
|
|
Delete(true).
|
|
Then().
|
|
Expect(DoesNotExist())
|
|
}
|
|
|
|
func TestHydratorNormalRefreshRecoversFailedHydration(t *testing.T) {
|
|
Given(t).
|
|
Name("test-normal-refresh-recovery").
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
CreateApp("--validate=false").
|
|
And(func() {
|
|
require.NoError(t, fixture.SetProjectSpec("default", restrictedDefaultProjectSpec()))
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseFailed)).
|
|
When().
|
|
And(func() {
|
|
require.NoError(t, fixture.SetProjectSpec("default", permissiveDefaultProjectSpec()))
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseHydrated))
|
|
}
|
|
|
|
func TestKustomizeVersionOverride(t *testing.T) {
|
|
Given(t).
|
|
Name("test-kustomize-version-override").
|
|
DrySourcePath("kustomize-with-version-override").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("kustomize-with-version-override").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
// Skip validation, otherwise app creation will fail on the unsupported kustomize version.
|
|
CreateApp("--validate=false").
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
// Expect a failure at first because the kustomize version is not supported.
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseFailed)).
|
|
// Now register the kustomize version override and try again.
|
|
Given().
|
|
RegisterKustomizeVersion("v1.2.3", "kustomize").
|
|
When().
|
|
// Hard refresh so we don't use the cached error.
|
|
Refresh(RefreshTypeHard).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestHydratorWithHelm(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("hydrator-helm").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source = nil
|
|
app.Spec.SourceHydrator = &SourceHydrator{
|
|
DrySource: DrySource{
|
|
RepoURL: fixture.RepoURL(fixture.RepoURLTypeFile),
|
|
Path: "hydrator-helm",
|
|
TargetRevision: "HEAD",
|
|
Helm: &ApplicationSourceHelm{
|
|
Parameters: []HelmParameter{
|
|
{Name: "message", Value: "helm-hydrated-with-inline-params"},
|
|
},
|
|
},
|
|
},
|
|
SyncSource: SyncSource{
|
|
TargetBranch: "env/test",
|
|
Path: "hydrator-helm-output",
|
|
},
|
|
}
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
// Verify that the inline helm parameter was applied
|
|
output, err := fixture.Run("", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", "configmap", "my-map",
|
|
"-ojsonpath={.data.message}")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "helm-hydrated-with-inline-params", output)
|
|
|
|
// Verify that the namespace was passed to helm
|
|
output, err = fixture.Run("", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", "configmap", "my-map",
|
|
"-ojsonpath={.data.helmns}")
|
|
require.NoError(t, err)
|
|
require.Equal(t, ctx.DeploymentNamespace(), output)
|
|
})
|
|
}
|
|
|
|
func TestHydratorWithKustomize(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("hydrator-kustomize").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source = nil
|
|
app.Spec.SourceHydrator = &SourceHydrator{
|
|
DrySource: DrySource{
|
|
RepoURL: fixture.RepoURL(fixture.RepoURLTypeFile),
|
|
Path: "hydrator-kustomize",
|
|
TargetRevision: "HEAD",
|
|
Kustomize: &ApplicationSourceKustomize{
|
|
NameSuffix: "-inline",
|
|
},
|
|
},
|
|
SyncSource: SyncSource{
|
|
TargetBranch: "env/test",
|
|
Path: "hydrator-kustomize-output",
|
|
},
|
|
}
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
// Verify that the inline kustomize nameSuffix was applied
|
|
// kustomization.yaml has namePrefix: kustomize-, and we added nameSuffix: -inline
|
|
// So the ConfigMap name should be kustomize-my-map-inline
|
|
_, err := fixture.Run("", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", "configmap", "kustomize-my-map-inline")
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestHydratorWithDirectory(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("hydrator-directory").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source = nil
|
|
app.Spec.SourceHydrator = &SourceHydrator{
|
|
DrySource: DrySource{
|
|
RepoURL: fixture.RepoURL(fixture.RepoURLTypeFile),
|
|
Path: "hydrator-directory",
|
|
TargetRevision: "HEAD",
|
|
Directory: &ApplicationSourceDirectory{
|
|
Recurse: true,
|
|
},
|
|
},
|
|
SyncSource: SyncSource{
|
|
TargetBranch: "env/test",
|
|
Path: "hydrator-directory-output",
|
|
},
|
|
}
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
// Verify that the recurse option was applied by checking the ConfigMap from subdir
|
|
_, err := fixture.Run("", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", "configmap", "my-map-subdir")
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestHydratorWithPlugin(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("hydrator-plugin").
|
|
RunningCMPServer("./testdata/hydrator-plugin").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source = nil
|
|
app.Spec.SourceHydrator = &SourceHydrator{
|
|
DrySource: DrySource{
|
|
RepoURL: fixture.RepoURL(fixture.RepoURLTypeFile),
|
|
Path: "hydrator-plugin",
|
|
TargetRevision: "HEAD",
|
|
Plugin: &ApplicationSourcePlugin{
|
|
Env: Env{
|
|
{Name: "PLUGIN_ENV", Value: "inline-plugin-value"},
|
|
},
|
|
},
|
|
},
|
|
SyncSource: SyncSource{
|
|
TargetBranch: "env/test",
|
|
Path: "hydrator-plugin-output",
|
|
},
|
|
}
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
// Verify that the inline plugin env was applied
|
|
output, err := fixture.Run("", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", "configmap", "plugin-generated-map",
|
|
"-ojsonpath={.data.plugin-env}")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "inline-plugin-value", output)
|
|
})
|
|
}
|
|
|
|
func TestHydratorNoOp(t *testing.T) {
|
|
// Test that when hydration is run for a no-op (manifests do not change),
|
|
// the hydrated SHA is persisted to the app's source hydrator status instead of an empty string.
|
|
var firstHydratedSHA string
|
|
var firstDrySHA string
|
|
|
|
Given(t).
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
CreateApp().
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseHydrated)).
|
|
And(func(app *Application) {
|
|
require.NotEmpty(t, app.Status.SourceHydrator.CurrentOperation.HydratedSHA, "First hydration should have a hydrated SHA")
|
|
require.NotEmpty(t, app.Status.SourceHydrator.CurrentOperation.DrySHA, "First hydration should have a dry SHA")
|
|
firstHydratedSHA = app.Status.SourceHydrator.CurrentOperation.HydratedSHA
|
|
firstDrySHA = app.Status.SourceHydrator.CurrentOperation.DrySHA
|
|
t.Logf("First hydration - drySHA: %s, hydratedSHA: %s", firstDrySHA, firstHydratedSHA)
|
|
}).
|
|
When().
|
|
// Make a change to the dry source that doesn't affect the generated manifests.
|
|
AddFile("guestbook/README.md", "# Guestbook\n\nThis is documentation.").
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
ExpectConsistently(HydrationPhaseIs(HydrateOperationPhaseHydrated), 1*time.Second, 5*time.Second).
|
|
And(func(app *Application) {
|
|
require.NotEmpty(t, app.Status.SourceHydrator.CurrentOperation.HydratedSHA,
|
|
"Hydrated SHA must not be empty")
|
|
require.NotEmpty(t, app.Status.SourceHydrator.CurrentOperation.DrySHA)
|
|
|
|
// The dry SHA should be different (new commit in the dry source)
|
|
require.NotEqual(t, firstDrySHA, app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
"Dry SHA should change after pushing a new commit")
|
|
|
|
t.Logf("Second hydration - drySHA: %s, hydratedSHA: %s",
|
|
app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
app.Status.SourceHydrator.CurrentOperation.HydratedSHA)
|
|
|
|
require.Equal(t, firstHydratedSHA, app.Status.SourceHydrator.CurrentOperation.HydratedSHA,
|
|
"Hydrated SHA should remain the same for no-op hydration")
|
|
})
|
|
}
|
|
|
|
func TestHydratorWithAuthenticatedRepo(t *testing.T) {
|
|
// Test that hydration works with an HTTPS repository requiring authentication,
|
|
// specifically that GetCommitNote and AddAndPushNote properly use credentials when
|
|
// fetching git notes. This test creates an initial hydration, then makes a change
|
|
// to trigger a second hydration. On the second hydration, the commit-server will
|
|
// need to fetch existing git notes from the authenticated repository, which requires
|
|
// credentials.
|
|
Given(t).
|
|
RepoURLType(fixture.RepoURLTypeHTTPS).
|
|
HTTPSInsecureRepoURLAdded(true).
|
|
// Add write credentials for commit-server to push hydrated manifests
|
|
WriteCredentials(true).
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
CreateApp().
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// Now make a change and re-hydrate. This will trigger git notes fetch
|
|
// operations that require credentials.
|
|
When().
|
|
PatchFile("guestbook/guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestHydratorHydratesAutomatically_NewCommit(t *testing.T) {
|
|
// Test that when a new commit is made to the dry source, a normal refresh (not a hydrate request)
|
|
// detects the new revision and triggers hydration automatically.
|
|
// This scenario has no manifest-path-annotation, so the controller always treats a new revision as
|
|
// potentially having changes.
|
|
var firstDrySHA string
|
|
var firstHydratedSHA string
|
|
var firstStartedAt time.Time
|
|
|
|
Given(t).
|
|
DrySourcePath("guestbook").
|
|
DrySourceRevision("HEAD").
|
|
SyncSourcePath("guestbook").
|
|
SyncSourceBranch("env/test").
|
|
When().
|
|
CreateApp().
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
require.NotNil(t, app.Status.SourceHydrator.CurrentOperation)
|
|
require.Equal(t, HydrateOperationPhaseHydrated, app.Status.SourceHydrator.CurrentOperation.Phase)
|
|
firstDrySHA = app.Status.SourceHydrator.CurrentOperation.DrySHA
|
|
firstHydratedSHA = app.Status.SourceHydrator.CurrentOperation.HydratedSHA
|
|
firstStartedAt = app.Status.SourceHydrator.CurrentOperation.StartedAt.Time
|
|
require.NotEmpty(t, firstDrySHA)
|
|
require.NotEmpty(t, firstHydratedSHA)
|
|
require.False(t, firstStartedAt.IsZero())
|
|
t.Logf("Initial hydration - drySHA: %s, hydratedSHA: %s, startedAt: %s", firstDrySHA, firstHydratedSHA, firstStartedAt)
|
|
|
|
// Wait a second here because we using the firstStartedAt timestamp and do not want it to be the same
|
|
// if we refresh too fast
|
|
time.Sleep(time.Second)
|
|
}).
|
|
// Verify the hydration is stable: a normal refresh should not trigger a new hydration
|
|
// when no commits have been made.
|
|
When().
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
ExpectConsistently(HydrationPhaseIs(HydrateOperationPhaseHydrated), 1*time.Second, 5*time.Second).
|
|
And(func(app *Application) {
|
|
require.Equal(t, firstDrySHA, app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
"Dry SHA should not change without a new commit")
|
|
require.Equal(t, firstHydratedSHA, app.Status.SourceHydrator.CurrentOperation.HydratedSHA,
|
|
"Hydrated SHA should not change without a new commit")
|
|
require.Equal(t, firstStartedAt, app.Status.SourceHydrator.CurrentOperation.StartedAt.Time,
|
|
"StartedAt should not change — no new hydration operation should have been triggered")
|
|
}).
|
|
// Now make a manifest-affecting change and verify that a normal refresh triggers re-hydration.
|
|
When().
|
|
PatchFile("guestbook/guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseHydrated)).
|
|
And(func(app *Application) {
|
|
require.NotEqual(t, firstDrySHA, app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
"Dry SHA should change after a new commit")
|
|
require.NotEqual(t, firstHydratedSHA, app.Status.SourceHydrator.CurrentOperation.HydratedSHA,
|
|
"Hydrated SHA should change when manifests differ")
|
|
t.Logf("After new commit - drySHA: %s, hydratedSHA: %s",
|
|
app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
app.Status.SourceHydrator.CurrentOperation.HydratedSHA)
|
|
}).
|
|
// Verify the new hydration is stable.
|
|
When().
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
ExpectConsistently(HydrationPhaseIs(HydrateOperationPhaseHydrated), 1*time.Second, 5*time.Second)
|
|
}
|
|
|
|
func TestHydratorHydratesAutomatically_NewCommit_WithChanges(t *testing.T) {
|
|
// Test that when a new commit is made to the dry source with manifest-generate-paths annotation,
|
|
// and the commit affects the watched path, hydration is triggered automatically.
|
|
var firstDrySHA string
|
|
var firstHydratedSHA string
|
|
var firstStartedAt time.Time
|
|
|
|
ctx := Given(t)
|
|
ctx.Path("guestbook").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source = nil
|
|
app.ObjectMeta.Annotations = map[string]string{
|
|
AnnotationKeyManifestGeneratePaths: ".",
|
|
}
|
|
app.Spec.SourceHydrator = &SourceHydrator{
|
|
DrySource: DrySource{
|
|
RepoURL: fixture.RepoURL(fixture.RepoURLTypeFile),
|
|
Path: "guestbook",
|
|
TargetRevision: "HEAD",
|
|
},
|
|
SyncSource: SyncSource{
|
|
TargetBranch: "env/test",
|
|
Path: "guestbook",
|
|
},
|
|
}
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseHydrated)).
|
|
And(func(app *Application) {
|
|
firstDrySHA = app.Status.SourceHydrator.CurrentOperation.DrySHA
|
|
firstHydratedSHA = app.Status.SourceHydrator.CurrentOperation.HydratedSHA
|
|
firstStartedAt = app.Status.SourceHydrator.CurrentOperation.StartedAt.Time
|
|
require.NotEmpty(t, firstDrySHA)
|
|
require.NotEmpty(t, firstHydratedSHA)
|
|
t.Logf("Initial hydration - drySHA: %s, hydratedSHA: %s", firstDrySHA, firstHydratedSHA)
|
|
|
|
// Wait a second here because we using the firstStartedAt timestamp and do not want it to be the same
|
|
// if we refresh too fast
|
|
time.Sleep(time.Second)
|
|
}).
|
|
// A change inside the watched path should trigger re-hydration.
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseHydrated)).
|
|
And(func(app *Application) {
|
|
require.NotEqual(t, firstDrySHA, app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
"Dry SHA should change after a new commit")
|
|
require.NotEqual(t, firstHydratedSHA, app.Status.SourceHydrator.CurrentOperation.HydratedSHA,
|
|
"Hydrated SHA should change when manifests differ")
|
|
require.NotEqual(t, firstStartedAt, app.Status.SourceHydrator.CurrentOperation.StartedAt.Time,
|
|
"StartedAt should change — a new hydration operation should have been triggered")
|
|
t.Logf("After change in watched path - drySHA: %s, hydratedSHA: %s",
|
|
app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
app.Status.SourceHydrator.CurrentOperation.HydratedSHA)
|
|
})
|
|
}
|
|
|
|
func TestHydratorHydratesAutomatically_NewCommit_WithoutChanges(t *testing.T) {
|
|
// Test that when a new commit is made to the dry source with manifest-generate-paths annotation,
|
|
// but the commit does NOT affect the watched path, hydration is NOT re-triggered.
|
|
var firstDrySHA string
|
|
var firstHydratedSHA string
|
|
var firstStartedAt time.Time
|
|
|
|
ctx := Given(t)
|
|
ctx.Path("guestbook").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source = nil
|
|
app.ObjectMeta.Annotations = map[string]string{
|
|
AnnotationKeyManifestGeneratePaths: ".",
|
|
}
|
|
app.Spec.SourceHydrator = &SourceHydrator{
|
|
DrySource: DrySource{
|
|
RepoURL: fixture.RepoURL(fixture.RepoURLTypeFile),
|
|
Path: "guestbook",
|
|
TargetRevision: "HEAD",
|
|
},
|
|
SyncSource: SyncSource{
|
|
TargetBranch: "env/test",
|
|
Path: "guestbook",
|
|
},
|
|
}
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Wait("--hydrated").
|
|
Then().
|
|
Expect(HydrationPhaseIs(HydrateOperationPhaseHydrated)).
|
|
And(func(app *Application) {
|
|
firstDrySHA = app.Status.SourceHydrator.CurrentOperation.DrySHA
|
|
firstHydratedSHA = app.Status.SourceHydrator.CurrentOperation.HydratedSHA
|
|
firstStartedAt = app.Status.SourceHydrator.CurrentOperation.StartedAt.Time
|
|
require.NotEmpty(t, firstDrySHA)
|
|
require.NotEmpty(t, firstHydratedSHA)
|
|
t.Logf("Initial hydration - drySHA: %s, hydratedSHA: %s", firstDrySHA, firstHydratedSHA)
|
|
|
|
// Wait a second here because we using the firstStartedAt timestamp and do not want it to be the same
|
|
// if we refresh too fast
|
|
time.Sleep(time.Second)
|
|
}).
|
|
// A change outside the watched path should NOT trigger re-hydration.
|
|
// Use fixture.AddFile directly to write outside the context path.
|
|
AndAction(func() {
|
|
fixture.AddFile(t, "unrelated-file.md", "# This change is outside the manifest-generate-paths")
|
|
}).
|
|
When().
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
ExpectConsistently(HydrationPhaseIs(HydrateOperationPhaseHydrated), 1*time.Second, 5*time.Second).
|
|
And(func(app *Application) {
|
|
require.Equal(t, firstDrySHA, app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
"Dry SHA should not change — no new hydration operation should have been triggered")
|
|
require.Equal(t, firstHydratedSHA, app.Status.SourceHydrator.CurrentOperation.HydratedSHA,
|
|
"Hydrated SHA should not change when the commit is outside the watched path")
|
|
require.Equal(t, firstStartedAt, app.Status.SourceHydrator.CurrentOperation.StartedAt.Time,
|
|
"StartedAt should not change — no new hydration operation should have been triggered")
|
|
t.Logf("After change outside watched path - drySHA: %s, hydratedSHA: %s",
|
|
app.Status.SourceHydrator.CurrentOperation.DrySHA,
|
|
app.Status.SourceHydrator.CurrentOperation.HydratedSHA)
|
|
})
|
|
}
|