Skip to content

Commit 7ab8335

Browse files
mareklibramareklibra
authored
chore(orchestrator): upgrade backstage to 1.36 (#418)
* chore(orchestrator): upgrade Backstage to 1.35.1 Signed-off-by: Marek Libra <marek.libra@gmail.com> * upgrade to 1.35.1 - manual changes Signed-off-by: Marek Libra <marek.libra@gmail.com> * upgrade to 1.36.0-next.3 Signed-off-by: Marek Libra <marek.libra@gmail.com> * dedupe Signed-off-by: Marek Libra <marek.libra@gmail.com> * manual changes after upgrade Signed-off-by: Marek Libra <marek.libra@gmail.com> --------- Signed-off-by: Marek Libra <marek.libra@gmail.com>
1 parent 7032c17 commit 7ab8335

15 files changed

Lines changed: 2984 additions & 3388 deletions

File tree

‎workspaces/orchestrator/backstage.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
{ "version": "1.32.4" }
1+
{
2+
"version": "1.36.0-next.3"
3+
}

‎workspaces/orchestrator/package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "1.0.0",
44
"private": true,
55
"engines": {
6-
"node": "18 || 20"
6+
"node": "18 || 20 || 22"
77
},
88
"scripts": {
99
"tsc": "tsc",
10-
"dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
10+
"dev": "yarn workspaces foreach -A --include backend --include app --parallel --jobs unlimited -v -i run start",
1111
"dev:debug": "LOG_LEVEL=debug yarn dev",
1212
"tsc:full": "tsc --skipLibCheck true --incremental false",
1313
"build:all": "backstage-cli repo build --all",
@@ -36,12 +36,11 @@
3636
"directory": "workspaces/orchestrator"
3737
},
3838
"devDependencies": {
39-
"@backstage/cli": "^0.29.0",
39+
"@backstage/cli": "^0.30.0-next.3",
4040
"@backstage/e2e-test-utils": "^0.1.1",
41-
"@backstage/repo-tools": "^0.10.0",
41+
"@backstage/repo-tools": "^0.12.2-next.3",
4242
"@changesets/cli": "^2.27.1",
4343
"@ianvs/prettier-plugin-sort-imports": "^4.4.0",
44-
"@spotify/prettier-config": "^12.0.0",
4544
"knip": "^5.40.0",
4645
"node-gyp": "^9.0.0",
4746
"prettier": "3.4.2",
@@ -53,7 +52,7 @@
5352
"react": "^18",
5453
"react-dom": "^18"
5554
},
56-
"prettier": "@spotify/prettier-config",
55+
"prettier": "@backstage/cli/config/prettier",
5756
"lint-staged": {
5857
"*.{js,jsx,ts,tsx,mjs,cjs}": [
5958
"eslint --fix",

‎workspaces/orchestrator/packages/app/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/plugin-rbac": "^1.33.2",
23-
"@backstage/app-defaults": "^1.5.12",
24-
"@backstage/catalog-model": "^1.7.0",
25-
"@backstage/cli": "^0.28.0",
26-
"@backstage/core-app-api": "^1.15.1",
27-
"@backstage/core-components": "^0.15.1",
28-
"@backstage/core-plugin-api": "^1.10.0",
29-
"@backstage/integration-react": "^1.2.0",
30-
"@backstage/plugin-api-docs": "^0.11.11",
31-
"@backstage/plugin-catalog": "^1.24.0",
32-
"@backstage/plugin-catalog-common": "^1.1.0",
33-
"@backstage/plugin-catalog-graph": "^0.4.11",
34-
"@backstage/plugin-catalog-import": "^0.12.5",
35-
"@backstage/plugin-catalog-react": "^1.14.0",
36-
"@backstage/plugin-notifications": "^0.4.1",
37-
"@backstage/plugin-org": "^0.6.31",
38-
"@backstage/plugin-permission-react": "^0.4.27",
39-
"@backstage/plugin-scaffolder": "^1.26.1",
40-
"@backstage/plugin-search": "^1.4.18",
41-
"@backstage/plugin-search-react": "^1.8.1",
42-
"@backstage/plugin-signals": "^0.0.13",
43-
"@backstage/plugin-techdocs": "^1.11.0",
44-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.16",
45-
"@backstage/plugin-techdocs-react": "^1.2.9",
46-
"@backstage/plugin-user-settings": "^0.8.14",
47-
"@backstage/theme": "^0.6.0",
23+
"@backstage/app-defaults": "^1.5.17-next.1",
24+
"@backstage/catalog-model": "^1.7.3",
25+
"@backstage/cli": "^0.30.0-next.3",
26+
"@backstage/core-app-api": "^1.15.5-next.0",
27+
"@backstage/core-components": "^0.16.4-next.1",
28+
"@backstage/core-plugin-api": "^1.10.4-next.0",
29+
"@backstage/integration-react": "^1.2.4-next.0",
30+
"@backstage/plugin-api-docs": "^0.12.4-next.3",
31+
"@backstage/plugin-catalog": "^1.27.0-next.3",
32+
"@backstage/plugin-catalog-common": "^1.1.3",
33+
"@backstage/plugin-catalog-graph": "^0.4.16-next.3",
34+
"@backstage/plugin-catalog-import": "^0.12.10-next.3",
35+
"@backstage/plugin-catalog-react": "^1.15.2-next.3",
36+
"@backstage/plugin-notifications": "^0.5.2-next.2",
37+
"@backstage/plugin-org": "^0.6.36-next.3",
38+
"@backstage/plugin-permission-react": "^0.4.31-next.0",
39+
"@backstage/plugin-scaffolder": "^1.28.0-next.3",
40+
"@backstage/plugin-search": "^1.4.23-next.3",
41+
"@backstage/plugin-search-react": "^1.8.6-next.3",
42+
"@backstage/plugin-signals": "^0.0.16-next.1",
43+
"@backstage/plugin-techdocs": "^1.12.3-next.3",
44+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21-next.1",
45+
"@backstage/plugin-techdocs-react": "^1.2.14-next.1",
46+
"@backstage/plugin-user-settings": "^0.8.19-next.3",
47+
"@backstage/theme": "^0.6.4-next.0",
4848
"@mui/icons-material": "5.16.13",
4949
"@mui/lab": "5.0.0-alpha.175",
5050
"@mui/material": "5.16.13",
@@ -59,7 +59,7 @@
5959
"react-use": "^17.4.0"
6060
},
6161
"devDependencies": {
62-
"@backstage/test-utils": "^1.7.0",
62+
"@backstage/test-utils": "^1.7.5-next.0",
6363
"@playwright/test": "^1.32.3",
6464
"@testing-library/dom": "^9.0.0",
6565
"@testing-library/jest-dom": "^6.0.0",

‎workspaces/orchestrator/packages/backend/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ WORKDIR /app
4040
# Copy files needed by Yarn
4141
COPY --chown=node:node .yarn ./.yarn
4242
COPY --chown=node:node .yarnrc.yml ./
43+
COPY --chown=node:node backstage.json ./
4344

4445
# This switches many Node.js dependencies to production mode.
4546
ENV NODE_ENV=production

‎workspaces/orchestrator/packages/backend/package.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@
2222
},
2323
"dependencies": {
2424
"@backstage-community/plugin-rbac-backend": "^5.2.6",
25-
"@backstage/backend-defaults": "^0.5.2",
26-
"@backstage/config": "^1.2.0",
27-
"@backstage/plugin-app-backend": "^0.3.76",
28-
"@backstage/plugin-auth-backend": "^0.23.1",
29-
"@backstage/plugin-auth-backend-module-github-provider": "^0.2.1",
30-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.1",
31-
"@backstage/plugin-auth-node": "^0.5.3",
32-
"@backstage/plugin-catalog-backend": "^1.27.1",
33-
"@backstage/plugin-catalog-backend-module-gitlab": "^0.6.2",
34-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.3",
35-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.1",
36-
"@backstage/plugin-notifications-backend": "^0.4.3",
37-
"@backstage/plugin-permission-backend": "^0.5.50",
38-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.1",
39-
"@backstage/plugin-permission-common": "^0.8.1",
40-
"@backstage/plugin-permission-node": "^0.8.4",
41-
"@backstage/plugin-proxy-backend": "^0.5.7",
42-
"@backstage/plugin-scaffolder-backend": "^1.26.2",
43-
"@backstage/plugin-scaffolder-backend-module-github": "^0.5.5",
44-
"@backstage/plugin-scaffolder-backend-module-gitlab": "^0.7.1",
45-
"@backstage/plugin-search-backend": "^1.6.1",
46-
"@backstage/plugin-search-backend-module-catalog": "^0.2.4",
47-
"@backstage/plugin-search-backend-module-pg": "^0.5.37",
48-
"@backstage/plugin-search-backend-module-techdocs": "^0.3.1",
49-
"@backstage/plugin-search-backend-node": "^1.3.4",
50-
"@backstage/plugin-signals-backend": "^0.2.3",
51-
"@backstage/plugin-techdocs-backend": "^1.11.1",
25+
"@backstage/backend-defaults": "^0.8.0-next.3",
26+
"@backstage/config": "^1.3.2",
27+
"@backstage/plugin-app-backend": "^0.4.5-next.2",
28+
"@backstage/plugin-auth-backend": "^0.24.3-next.3",
29+
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.0-next.2",
30+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5-next.2",
31+
"@backstage/plugin-auth-node": "^0.6.0-next.2",
32+
"@backstage/plugin-catalog-backend": "^1.31.0-next.3",
33+
"@backstage/plugin-catalog-backend-module-gitlab": "^0.6.3-next.3",
34+
"@backstage/plugin-catalog-backend-module-logs": "^0.1.7-next.3",
35+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.5-next.3",
36+
"@backstage/plugin-notifications-backend": "^0.5.2-next.3",
37+
"@backstage/plugin-permission-backend": "^0.5.54-next.2",
38+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.5-next.2",
39+
"@backstage/plugin-permission-common": "^0.8.4",
40+
"@backstage/plugin-permission-node": "^0.8.8-next.2",
41+
"@backstage/plugin-proxy-backend": "^0.5.11-next.2",
42+
"@backstage/plugin-scaffolder-backend": "^1.30.0-next.3",
43+
"@backstage/plugin-scaffolder-backend-module-github": "^0.6.0-next.2",
44+
"@backstage/plugin-scaffolder-backend-module-gitlab": "^0.8.0-next.3",
45+
"@backstage/plugin-search-backend": "^1.8.2-next.3",
46+
"@backstage/plugin-search-backend-module-catalog": "^0.3.1-next.3",
47+
"@backstage/plugin-search-backend-module-pg": "^0.5.41-next.2",
48+
"@backstage/plugin-search-backend-module-techdocs": "^0.3.6-next.3",
49+
"@backstage/plugin-search-backend-node": "^1.3.8-next.2",
50+
"@backstage/plugin-signals-backend": "^0.3.1-next.2",
51+
"@backstage/plugin-techdocs-backend": "^1.11.6-next.3",
5252
"@red-hat-developer-hub/backstage-plugin-orchestrator-backend": "workspace:^",
5353
"@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator": "workspace:^",
5454
"app": "link:../app",
@@ -58,7 +58,7 @@
5858
"winston": "^3.2.1"
5959
},
6060
"devDependencies": {
61-
"@backstage/cli": "^0.28.0",
61+
"@backstage/cli": "^0.30.0-next.3",
6262
"@types/express": "^4.17.6",
6363
"@types/express-serve-static-core": "^4.17.5",
6464
"@types/luxon": "^2.0.4"

‎workspaces/orchestrator/packages/backend/src/index.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import { createBackend } from '@backstage/backend-defaults';
1818

1919
const backend = createBackend();
2020

21-
backend.add(import('@backstage/plugin-app-backend/alpha'));
22-
backend.add(import('@backstage/plugin-proxy-backend/alpha'));
23-
backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
24-
backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
21+
backend.add(import('@backstage/plugin-app-backend'));
22+
backend.add(import('@backstage/plugin-proxy-backend'));
23+
backend.add(import('@backstage/plugin-scaffolder-backend'));
24+
backend.add(import('@backstage/plugin-techdocs-backend'));
2525

2626
// auth plugin
2727
backend.add(import('@backstage/plugin-auth-backend'));
@@ -31,7 +31,7 @@ backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
3131
backend.add(import('@backstage/plugin-auth-backend-module-github-provider'));
3232

3333
// catalog plugin
34-
backend.add(import('@backstage/plugin-catalog-backend/alpha'));
34+
backend.add(import('@backstage/plugin-catalog-backend'));
3535
backend.add(
3636
import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
3737
);
@@ -40,15 +40,15 @@ backend.add(
4040
backend.add(import('@backstage/plugin-catalog-backend-module-logs'));
4141

4242
// search plugin
43-
backend.add(import('@backstage/plugin-search-backend/alpha'));
43+
backend.add(import('@backstage/plugin-search-backend'));
4444

4545
// search engine
4646
// See https://backstage.io/docs/features/search/search-engines
47-
backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
47+
backend.add(import('@backstage/plugin-search-backend-module-pg'));
4848

4949
// search collators
50-
backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
51-
backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
50+
backend.add(import('@backstage/plugin-search-backend-module-catalog'));
51+
backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
5252

5353
// permission plugin
5454
backend.add(import('@backstage-community/plugin-rbac-backend'));

‎workspaces/orchestrator/plugins/orchestrator-backend/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@
6666
},
6767
"dependencies": {
6868
"@backstage/backend-common": "^0.25.0",
69-
"@backstage/backend-defaults": "^0.5.2",
70-
"@backstage/backend-plugin-api": "^1.0.1",
69+
"@backstage/backend-defaults": "^0.8.0-next.3",
70+
"@backstage/backend-plugin-api": "^1.2.0-next.2",
7171
"@backstage/backend-tasks": "^0.6.1",
72-
"@backstage/catalog-client": "^1.7.1",
73-
"@backstage/errors": "^1.2.4",
74-
"@backstage/integration": "^1.15.1",
75-
"@backstage/plugin-catalog-node": "^1.13.1",
76-
"@backstage/plugin-permission-common": "^0.8.1",
77-
"@backstage/plugin-permission-node": "^0.8.4",
78-
"@backstage/plugin-scaffolder-backend": "^1.26.2",
79-
"@backstage/plugin-scaffolder-node": "^0.5.0",
72+
"@backstage/catalog-client": "^1.9.1",
73+
"@backstage/errors": "^1.2.7",
74+
"@backstage/integration": "^1.16.1",
75+
"@backstage/plugin-catalog-node": "^1.16.0-next.3",
76+
"@backstage/plugin-permission-common": "^0.8.4",
77+
"@backstage/plugin-permission-node": "^0.8.8-next.2",
78+
"@backstage/plugin-scaffolder-backend": "^1.30.0-next.3",
79+
"@backstage/plugin-scaffolder-node": "^0.7.0-next.2",
8080
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^",
8181
"@urql/core": "^4.1.4",
8282
"ajv-formats": "^2.1.1",
@@ -91,8 +91,8 @@
9191
},
9292
"devDependencies": {
9393
"@backstage-community/plugin-rbac-common": "^1.12.1",
94-
"@backstage/backend-test-utils": "1.0.2",
95-
"@backstage/cli": "0.28.2",
94+
"@backstage/backend-test-utils": "^1.3.0-next.3",
95+
"@backstage/cli": "^0.30.0-next.3",
9696
"@janus-idp/backstage-plugin-audit-log-node": "^1.7.1",
9797
"@janus-idp/cli": "3.2.0",
9898
"@types/express": "4.17.21",

‎workspaces/orchestrator/plugins/orchestrator-backend/src/service/ScaffolderService.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 The Backstage Authors
2+
* Copyright Red Hat, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
import { loggerToWinstonLogger } from '@backstage/backend-common';
1718
import type {
1819
LoggerService,
@@ -121,10 +122,13 @@ export class ScaffolderService {
121122
principal: 'mock-principal',
122123
};
123124
},
124-
checkpoint: async (key, fn) => {
125+
checkpoint: async ({ key, fn }) => {
125126
this.logger.info(`Orchestrator ScaffolderService checkpoint ${key}`);
126127
return fn();
127128
},
129+
task: {
130+
id: 'task-orchestrator',
131+
},
128132
};
129133
await action.handler(actionContext);
130134

‎workspaces/orchestrator/plugins/orchestrator-common/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
"openapi:check": "./scripts/openapi.sh check"
5858
},
5959
"dependencies": {
60-
"@backstage/plugin-permission-common": "^0.8.1",
60+
"@backstage/plugin-permission-common": "^0.8.4",
6161
"@severlessworkflow/sdk-typescript": "^3.0.3",
6262
"axios": "^1.7.9",
6363
"js-yaml": "^4.1.0"
6464
},
6565
"devDependencies": {
66-
"@backstage/cli": "0.28.2",
67-
"@backstage/types": "^1.1.1",
66+
"@backstage/cli": "^0.30.0-next.3",
67+
"@backstage/types": "^1.2.1",
6868
"@openapitools/openapi-generator-cli": "2.16.3",
6969
"@types/json-schema": "7.0.15",
7070
"js-yaml-cli": "0.6.0"

‎workspaces/orchestrator/plugins/orchestrator-form-api/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"prettier:fix": "prettier --ignore-unknown --write ."
2828
},
2929
"dependencies": {
30-
"@backstage/core-plugin-api": "^1.10.0",
30+
"@backstage/core-plugin-api": "^1.10.4-next.0",
3131
"@rjsf/core": "^5.21.2",
3232
"@rjsf/utils": "^5.21.2"
3333
},
3434
"peerDependencies": {
3535
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
3636
},
3737
"devDependencies": {
38-
"@backstage/cli": "0.28.2",
39-
"@backstage/types": "^1.1.1",
38+
"@backstage/cli": "^0.30.0-next.3",
39+
"@backstage/types": "^1.2.1",
4040
"@types/json-schema": "7.0.15",
4141
"@types/react": "^18.2.58",
4242
"prettier": "3.4.2",

0 commit comments

Comments
 (0)