Skip to content

Commit 8bda2b0

Browse files
authored
feat: remove deprecated system blueprint migrations (#1645)
* feat: remove deprecated system blueprint migrations * feat: remove support for input during migrations * fix: remove manualStep count tracking
2 parents dc3f171 + c28e074 commit 8bda2b0

17 files changed

Lines changed: 84 additions & 830 deletions

File tree

meteor/server/api/blueprints/__tests__/migrationContext.test.ts

Lines changed: 0 additions & 194 deletions
This file was deleted.

meteor/server/api/blueprints/migrationContext.ts

Lines changed: 0 additions & 123 deletions
This file was deleted.

meteor/server/api/rest/v1/system.ts

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
88
import { Meteor } from 'meteor/meteor'
99
import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
1010
import { MeteorCall } from '../../methods'
11-
import { MigrationStepInputResult } from '@sofie-automation/blueprints-integration'
1211

1312
class SystemServerAPI implements SystemRestAPI {
1413
async assignSystemBlueprint(
@@ -33,36 +32,20 @@ class SystemServerAPI implements SystemRestAPI {
3332
const migrationStatus = await MeteorCall.migration.getMigrationStatus()
3433
if (!migrationStatus.migrationNeeded) return ClientAPI.responseSuccess({ inputs: [] })
3534

36-
const requiredInputs: PendingMigrations = []
37-
for (const migration of migrationStatus.migration.manualInputs) {
38-
if (migration.stepId && migration.attribute) {
39-
requiredInputs.push({
40-
stepId: migration.stepId,
41-
attributeId: migration.attribute,
42-
})
43-
}
44-
}
45-
46-
return ClientAPI.responseSuccess({ inputs: requiredInputs })
35+
// Inputs are no longer supported, but need to be preserved for api compatibility
36+
return ClientAPI.responseSuccess({ inputs: [] })
4737
}
4838

4939
async applyPendingMigrations(
5040
_connection: Meteor.Connection,
51-
_event: string,
52-
inputs: MigrationData
41+
_event: string
5342
): Promise<ClientAPI.ClientResponse<void>> {
5443
const migrationStatus = await MeteorCall.migration.getMigrationStatus()
5544
if (!migrationStatus.migrationNeeded) throw new Error(`Migration does not need to be applied`)
5645

57-
const migrationData: MigrationStepInputResult[] = inputs.map((input) => ({
58-
stepId: input.stepId,
59-
attribute: input.attributeId,
60-
value: input.migrationValue,
61-
}))
6246
const result = await MeteorCall.migration.runMigration(
6347
migrationStatus.migration.chunks,
64-
migrationStatus.migration.hash,
65-
migrationData
48+
migrationStatus.migration.hash
6649
)
6750
if (result.migrationCompleted) return ClientAPI.responseSuccess(undefined)
6851
throw new Error(`Unknown error occurred`)
@@ -95,12 +78,10 @@ export function registerRoutes(registerRoute: APIRegisterHook<SystemRestAPI>): v
9578
'/system/migrations',
9679
new Map([[400, [UserErrorMessage.NoMigrationsToApply]]]),
9780
systemAPIFactory,
98-
async (serverAPI, connection, event, _params, body) => {
99-
const inputs = body.inputs
81+
async (serverAPI, connection, event, _params, _body) => {
10082
logger.info(`API POST: System migrations`)
10183

102-
check(inputs, Array)
103-
return await serverAPI.applyPendingMigrations(connection, event, inputs)
84+
return await serverAPI.applyPendingMigrations(connection, event)
10485
}
10586
)
10687

meteor/server/coreSystem/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ async function initializeCoreSystem() {
8484
if (!isRunningInJest()) {
8585
// Check what migration has to provide:
8686
const migration = await prepareMigration(true)
87-
if (migration.migrationNeeded && migration.manualStepCount === 0 && migration.chunks.length <= 1) {
87+
if (migration.migrationNeeded && migration.chunks.length <= 1) {
8888
// Since we've determined that the migration can be done automatically, and we have a fresh system, just do the migration automatically:
89-
await runMigration(migration.chunks, migration.hash, [])
89+
await runMigration(migration.chunks, migration.hash)
9090
}
9191
}
9292
}

0 commit comments

Comments
 (0)