628ab153a8
## What
Makes the app-installation version gate **workspace-scoped**. App
installation now validates a manifest's `engines.twenty` requirement
against the version the **target workspace has actually finished
upgrading to**, instead of the instance/server's inferred version.
## Why
The server binary and a given workspace's migration state can diverge.
In a multi-workspace deployment the instance can already report version
`X` while an individual workspace still hasn't completed its
workspace-scoped upgrade commands for `X` (it's mid-upgrade or a
migration failed). Gating on the instance version let an app that
requires `X` install into a workspace whose schema/metadata is
effectively still at `X-1`, which can break the app. The requirement
should be checked against what the *workspace* has completed, not what
the server reports.
## How
- **`UpgradeStatusService.getWorkspaceCompletedVersion(workspaceId)`**
(new): resolves the last fully-completed upgrade version for a workspace
by reading its upgrade cursor and walking the upgrade sequence:
- Returns the cursor's version when the cursor sits on the **last step
of its version segment** and its status is `completed`.
- Otherwise walks backwards to the previous fully-completed version
segment.
- Returns `null` when the cursor is missing, not found in the sequence,
or otherwise uninterpretable.
- **`ApplicationVersionValidationService`**:
- Adds `validateWorkspaceCompatibility({ requiredServerVersion,
workspaceId })`.
- Extracts the shared semver logic into a private
`validateVersionAgainstRange({ version, requiredVersionRange, scope })`
and makes error messages scope-aware (workspace vs. instance).
`validateServerCompatibility` is preserved and now delegates to it.
- New failure reason `INVALID_WORKSPACE_VERSION`.
- **`ApplicationInstallService`** now calls
`validateWorkspaceCompatibility` with the `workspaceId` instead of
`validateServerCompatibility`.
- **Exception plumbing**: new
`ApplicationExceptionCode.INVALID_WORKSPACE_VERSION`, surfaced as a
`UserInputError` (`BAD_USER_INPUT`) with a user-friendly message ("This
workspace's upgrade state could not be determined…"). The
tarball/registration path maps it onto the existing
`INVALID_SERVER_VERSION` registration code.
## Notes
- **Publishing (app registration) is intentionally not
workspace-gated.** The tarball/registration path
(`ApplicationTarballService`) still uses the instance-level
`validateServerCompatibility` check, not the new workspace-scoped one.
Publishing an app is not tied to any particular workspace's upgrade
state, so there is no workspace version to check at that point — the
workspace-completed-version gate only applies when installing an app
into a specific workspace.
## Testing
- Unit tests for `ApplicationVersionValidationService`
(`validateServerCompatibility` + new `validateWorkspaceCompatibility`)
covering: no requirement, invalid semver range, satisfied/unsatisfied
ranges, and the uninterpretable-cursor case.
- Unit tests for `UpgradeStatusService.getWorkspaceCompletedVersion`
against a three-segment mock upgrade sequence (multi-command version,
instance-only version, workspace-terminated version).
- New integration suite
`failing-app-installation-workspace-version.integration-spec.ts` (+
snapshots) exercising the real install flow: rejects installation when
the workspace hasn't completed the required version, and when the
workspace's upgrade cursor can't be interpreted. Adds a
`create-app-tarball.util.ts` test helper.
200 lines
5.4 KiB
TypeScript
200 lines
5.4 KiB
TypeScript
import {
|
|
type IntegrationTestContext,
|
|
createUpgradeSequenceRunnerIntegrationTestModule,
|
|
DEFAULT_OPTIONS,
|
|
makeFastInstance,
|
|
makeWorkspace,
|
|
migrationRecordToKey,
|
|
resetSeedSequenceCounter,
|
|
restoreUpgradeMigrations,
|
|
seedInstanceMigration,
|
|
setMockActiveWorkspaceIds,
|
|
snapshotUpgradeMigrations,
|
|
testGetExecutedMigrationsInOrder,
|
|
WS_1,
|
|
WS_2,
|
|
WS_3,
|
|
WS_4,
|
|
} from 'test/integration/upgrade/utils/upgrade-sequence-runner-integration-test.util';
|
|
|
|
// Sorted ASC: WS_1 < WS_2 < WS_3 < WS_4
|
|
|
|
describe('UpgradeSequenceRunnerService — startFromWorkspaceId (integration)', () => {
|
|
let context: IntegrationTestContext;
|
|
let savedUpgradeMigrations: Awaited<
|
|
ReturnType<typeof snapshotUpgradeMigrations>
|
|
>;
|
|
|
|
beforeAll(async () => {
|
|
context = await createUpgradeSequenceRunnerIntegrationTestModule();
|
|
savedUpgradeMigrations = await snapshotUpgradeMigrations(
|
|
context.dataSource,
|
|
);
|
|
}, 30000);
|
|
|
|
afterAll(async () => {
|
|
await restoreUpgradeMigrations(context.dataSource, savedUpgradeMigrations);
|
|
await context.module?.close();
|
|
await context.dataSource?.destroy();
|
|
}, 15000);
|
|
|
|
beforeEach(async () => {
|
|
await context.dataSource.query('DELETE FROM core."upgradeMigration"');
|
|
resetSeedSequenceCounter();
|
|
setMockActiveWorkspaceIds([]);
|
|
jest.restoreAllMocks();
|
|
});
|
|
|
|
it('should only process workspaces whose id >= startFromWorkspaceId', async () => {
|
|
const sequence = [
|
|
makeFastInstance('Ic1'),
|
|
makeWorkspace('Wc1'),
|
|
makeWorkspace('Wc2'),
|
|
makeFastInstance('Ic2'),
|
|
];
|
|
|
|
setMockActiveWorkspaceIds([WS_1, WS_2, WS_3]);
|
|
|
|
await seedInstanceMigration(context.dataSource, {
|
|
name: 'Ic1',
|
|
status: 'completed',
|
|
workspaceIds: [WS_1, WS_2, WS_3],
|
|
});
|
|
|
|
const report = await context.runner.run({
|
|
sequence,
|
|
options: {
|
|
...DEFAULT_OPTIONS,
|
|
startFromWorkspaceId: WS_2,
|
|
},
|
|
});
|
|
|
|
expect(report.totalFailures).toBe(0);
|
|
expect(report.totalSuccesses).toBe(2);
|
|
|
|
const executed = await testGetExecutedMigrationsInOrder(context.dataSource);
|
|
|
|
expect(executed.map(migrationRecordToKey)).toStrictEqual([
|
|
// Seeds
|
|
'Ic1:instance:completed:1',
|
|
`Ic1:${WS_1}:completed:1`,
|
|
`Ic1:${WS_2}:completed:1`,
|
|
`Ic1:${WS_3}:completed:1`,
|
|
|
|
// Only WS_2 and WS_3 are processed (WS_1 skipped)
|
|
`Wc1:${WS_2}:completed:1`,
|
|
`Wc2:${WS_2}:completed:1`,
|
|
`Wc1:${WS_3}:completed:1`,
|
|
`Wc2:${WS_3}:completed:1`,
|
|
]);
|
|
});
|
|
|
|
it('should respect workspaceCountLimit together with startFromWorkspaceId', async () => {
|
|
const sequence = [makeFastInstance('Ic1'), makeWorkspace('Wc1')];
|
|
|
|
setMockActiveWorkspaceIds([WS_1, WS_2, WS_3, WS_4]);
|
|
|
|
await seedInstanceMigration(context.dataSource, {
|
|
name: 'Ic1',
|
|
status: 'completed',
|
|
workspaceIds: [WS_1, WS_2, WS_3, WS_4],
|
|
});
|
|
|
|
const report = await context.runner.run({
|
|
sequence,
|
|
options: {
|
|
...DEFAULT_OPTIONS,
|
|
startFromWorkspaceId: WS_2,
|
|
workspaceCountLimit: 1,
|
|
},
|
|
});
|
|
|
|
expect(report.totalFailures).toBe(0);
|
|
expect(report.totalSuccesses).toBe(1);
|
|
|
|
const executed = await testGetExecutedMigrationsInOrder(context.dataSource);
|
|
|
|
expect(executed.map(migrationRecordToKey)).toStrictEqual([
|
|
// Seeds
|
|
'Ic1:instance:completed:1',
|
|
`Ic1:${WS_1}:completed:1`,
|
|
`Ic1:${WS_2}:completed:1`,
|
|
`Ic1:${WS_3}:completed:1`,
|
|
`Ic1:${WS_4}:completed:1`,
|
|
|
|
// Only WS_2 processed (first after startFrom, limited to 1)
|
|
`Wc1:${WS_2}:completed:1`,
|
|
]);
|
|
});
|
|
|
|
it('should stop before instance step when startFromWorkspaceId is set', async () => {
|
|
const sequence = [
|
|
makeFastInstance('Ic1'),
|
|
makeWorkspace('Wc1'),
|
|
makeWorkspace('Wc2'),
|
|
makeFastInstance('Ic2'),
|
|
makeWorkspace('Wc3'),
|
|
];
|
|
|
|
setMockActiveWorkspaceIds([WS_1, WS_2, WS_3]);
|
|
|
|
await seedInstanceMigration(context.dataSource, {
|
|
name: 'Ic1',
|
|
status: 'completed',
|
|
workspaceIds: [WS_1, WS_2, WS_3],
|
|
});
|
|
|
|
const report = await context.runner.run({
|
|
sequence,
|
|
options: {
|
|
...DEFAULT_OPTIONS,
|
|
startFromWorkspaceId: WS_2,
|
|
},
|
|
});
|
|
|
|
expect(report.totalFailures).toBe(0);
|
|
expect(report.totalSuccesses).toBe(2);
|
|
|
|
const executed = await testGetExecutedMigrationsInOrder(context.dataSource);
|
|
|
|
expect(executed.map(migrationRecordToKey)).toStrictEqual([
|
|
// Seeds
|
|
'Ic1:instance:completed:1',
|
|
`Ic1:${WS_1}:completed:1`,
|
|
`Ic1:${WS_2}:completed:1`,
|
|
`Ic1:${WS_3}:completed:1`,
|
|
|
|
// Workspace segment: only WS_2 and WS_3 run
|
|
`Wc1:${WS_2}:completed:1`,
|
|
`Wc2:${WS_2}:completed:1`,
|
|
`Wc1:${WS_3}:completed:1`,
|
|
`Wc2:${WS_3}:completed:1`,
|
|
|
|
// Ic2 and Wc3 never reached — runner stopped at instance step boundary
|
|
]);
|
|
});
|
|
|
|
it('should process no workspaces when startFromWorkspaceId is greater than all ids', async () => {
|
|
const sequence = [makeFastInstance('Ic1'), makeWorkspace('Wc1')];
|
|
|
|
setMockActiveWorkspaceIds([WS_1, WS_2]);
|
|
|
|
await seedInstanceMigration(context.dataSource, {
|
|
name: 'Ic1',
|
|
status: 'completed',
|
|
workspaceIds: [WS_1, WS_2],
|
|
});
|
|
|
|
const report = await context.runner.run({
|
|
sequence,
|
|
options: {
|
|
...DEFAULT_OPTIONS,
|
|
startFromWorkspaceId: 'ffffffff-ffff-ffff-ffff-ffffffffffff',
|
|
},
|
|
});
|
|
|
|
expect(report.totalFailures).toBe(0);
|
|
expect(report.totalSuccesses).toBe(0);
|
|
});
|
|
});
|