Skip to content

Commit 1a519f8

Browse files
lholmquistlholmquist
authored
fix: remove @backstage/backend-common (#1621)
* fix: remove @backstage/backend-common * squash: add changeset * squah: dedupe * squash: change changeset version to minor
1 parent 11a5d0f commit 1a519f8

4 files changed

Lines changed: 63 additions & 39 deletions

File tree

‎workspaces/orchestrator/.changeset/heavy-cheetahs-refuse.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-orchestrator-backend': minor
3+
---
4+
5+
removal of @backstage/backend-common

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"export-dynamic": "janus-cli package export-dynamic-plugin"
6666
},
6767
"dependencies": {
68-
"@backstage/backend-common": "^0.25.0",
6968
"@backstage/backend-defaults": "^0.10.0",
7069
"@backstage/backend-plugin-api": "^1.3.1",
7170
"@backstage/backend-tasks": "^0.6.1",
@@ -77,7 +76,7 @@
7776
"@backstage/plugin-permission-common": "^0.9.0",
7877
"@backstage/plugin-permission-node": "^0.10.0",
7978
"@backstage/plugin-scaffolder-backend": "^1.33.0",
80-
"@backstage/plugin-scaffolder-node": "^0.8.2",
79+
"@backstage/plugin-scaffolder-node": "^0.9.0",
8180
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^",
8281
"@urql/core": "^4.1.4",
8382
"ajv-formats": "^2.1.1",

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { loggerToWinstonLogger } from '@backstage/backend-common';
1817
import type {
1918
LoggerService,
2019
UrlReaderService,
@@ -36,7 +35,6 @@ import fs from 'fs-extra';
3635

3736
import { randomUUID } from 'crypto';
3837
import path from 'path';
39-
import { PassThrough } from 'stream';
4038

4139
import { getWorkingDirectory } from './Helper';
4240

@@ -48,7 +46,6 @@ export interface ActionExecutionContext {
4846

4947
export class ScaffolderService {
5048
private actionRegistry: TemplateActionRegistry;
51-
private streamLogger = new PassThrough();
5249

5350
constructor(
5451
private readonly logger: LoggerService,
@@ -107,10 +104,7 @@ export class ScaffolderService {
107104
const actionContext: ActionContext<JsonObject> = {
108105
input: actionExecutionContext.input,
109106
workspacePath: workspacePath,
110-
// TODO: Move this to LoggerService after scaffolder-node moves to LoggerService
111-
// https://github.com/backstage/backstage/issues/26933
112-
logger: loggerToWinstonLogger(this.logger),
113-
logStream: this.streamLogger,
107+
logger: this.logger,
114108
createTemporaryDirectory: async () =>
115109
await fs.mkdtemp(`${workspacePath}_step-${0}-`),
116110
output(name: string, value: JsonValue) {

‎workspaces/orchestrator/yarn.lock‎

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,25 +3244,25 @@ __metadata:
32443244
languageName: node
32453245
linkType: hard
32463246

3247-
"@backstage/backend-plugin-api@npm:^1.0.0, @backstage/backend-plugin-api@npm:^1.0.1, @backstage/backend-plugin-api@npm:^1.0.2, @backstage/backend-plugin-api@npm:^1.1.1, @backstage/backend-plugin-api@npm:^1.2.0, @backstage/backend-plugin-api@npm:^1.2.1, @backstage/backend-plugin-api@npm:^1.3.0, @backstage/backend-plugin-api@npm:^1.3.1, @backstage/backend-plugin-api@npm:^1.4.1":
3248-
version: 1.4.1
3249-
resolution: "@backstage/backend-plugin-api@npm:1.4.1"
3247+
"@backstage/backend-plugin-api@npm:^1.0.0, @backstage/backend-plugin-api@npm:^1.0.1, @backstage/backend-plugin-api@npm:^1.0.2, @backstage/backend-plugin-api@npm:^1.1.1, @backstage/backend-plugin-api@npm:^1.2.0, @backstage/backend-plugin-api@npm:^1.2.1, @backstage/backend-plugin-api@npm:^1.3.0, @backstage/backend-plugin-api@npm:^1.3.1, @backstage/backend-plugin-api@npm:^1.4.0, @backstage/backend-plugin-api@npm:^1.4.1, @backstage/backend-plugin-api@npm:^1.4.3":
3248+
version: 1.4.3
3249+
resolution: "@backstage/backend-plugin-api@npm:1.4.3"
32503250
dependencies:
32513251
"@backstage/cli-common": ^0.1.15
32523252
"@backstage/config": ^1.3.3
32533253
"@backstage/errors": ^1.2.7
3254-
"@backstage/plugin-auth-node": ^0.6.5
3254+
"@backstage/plugin-auth-node": ^0.6.7
32553255
"@backstage/plugin-permission-common": ^0.9.1
3256-
"@backstage/plugin-permission-node": ^0.10.2
3257-
"@backstage/types": ^1.2.1
3256+
"@backstage/plugin-permission-node": ^0.10.4
3257+
"@backstage/types": ^1.2.2
32583258
"@types/express": ^4.17.6
32593259
"@types/json-schema": ^7.0.6
32603260
"@types/luxon": ^3.0.0
32613261
json-schema: ^0.4.0
32623262
knex: ^3.0.0
32633263
luxon: ^3.0.0
32643264
zod: ^3.22.4
3265-
checksum: 5adb68945bbdc8323dff2e8bae6ecaba73c4ee02b1f1afbc3b5ad53374f3e2c4473ed79f0aac951205334aee56f2b98eb1bcc091b8d28c390a0288a25d72feb6
3265+
checksum: 29eb069677972d462e41ecb57bc6c930eff26af4a791069fb42568166a52d143abacdc248701708fca889043e7b4ebdf1dee6ba28d99d785706e6e5820fb74e3
32663266
languageName: node
32673267
linkType: hard
32683268

@@ -3326,15 +3326,15 @@ __metadata:
33263326
languageName: node
33273327
linkType: hard
33283328

3329-
"@backstage/catalog-client@npm:^1.10.0, @backstage/catalog-client@npm:^1.10.2, @backstage/catalog-client@npm:^1.7.1, @backstage/catalog-client@npm:^1.9.1":
3330-
version: 1.10.2
3331-
resolution: "@backstage/catalog-client@npm:1.10.2"
3329+
"@backstage/catalog-client@npm:^1.10.0, @backstage/catalog-client@npm:^1.10.2, @backstage/catalog-client@npm:^1.12.0, @backstage/catalog-client@npm:^1.7.1, @backstage/catalog-client@npm:^1.9.1":
3330+
version: 1.12.0
3331+
resolution: "@backstage/catalog-client@npm:1.12.0"
33323332
dependencies:
33333333
"@backstage/catalog-model": ^1.7.5
33343334
"@backstage/errors": ^1.2.7
33353335
cross-fetch: ^4.0.0
33363336
uri-template: ^2.0.0
3337-
checksum: 43745b13c70b2fc0b8f82a4e0074a1af7efc32b1671b3fb8e7024e7aea016f156737a567efa5505d03117f71a618ad5243fa73005cf8bc1fe0aec11f19b4bf3b
3337+
checksum: ec5a48a07ff1b0b24ccb0cfb7552580ac0963b1a50dedf69c887aee4d62d99a02768b1b128b090b7d18cadd690426384e36f7db5240b5e076c2b9df41dea26c0
33383338
languageName: node
33393339
linkType: hard
33403340

@@ -4178,16 +4178,16 @@ __metadata:
41784178
languageName: node
41794179
linkType: hard
41804180

4181-
"@backstage/plugin-auth-node@npm:^0.6.0, @backstage/plugin-auth-node@npm:^0.6.1, @backstage/plugin-auth-node@npm:^0.6.2, @backstage/plugin-auth-node@npm:^0.6.3, @backstage/plugin-auth-node@npm:^0.6.5":
4182-
version: 0.6.5
4183-
resolution: "@backstage/plugin-auth-node@npm:0.6.5"
4181+
"@backstage/plugin-auth-node@npm:^0.6.0, @backstage/plugin-auth-node@npm:^0.6.1, @backstage/plugin-auth-node@npm:^0.6.2, @backstage/plugin-auth-node@npm:^0.6.3, @backstage/plugin-auth-node@npm:^0.6.5, @backstage/plugin-auth-node@npm:^0.6.7":
4182+
version: 0.6.7
4183+
resolution: "@backstage/plugin-auth-node@npm:0.6.7"
41844184
dependencies:
4185-
"@backstage/backend-plugin-api": ^1.4.1
4186-
"@backstage/catalog-client": ^1.10.2
4185+
"@backstage/backend-plugin-api": ^1.4.3
4186+
"@backstage/catalog-client": ^1.12.0
41874187
"@backstage/catalog-model": ^1.7.5
41884188
"@backstage/config": ^1.3.3
41894189
"@backstage/errors": ^1.2.7
4190-
"@backstage/types": ^1.2.1
4190+
"@backstage/types": ^1.2.2
41914191
"@types/express": ^4.17.6
41924192
"@types/passport": ^1.0.3
41934193
express: ^4.17.1
@@ -4197,7 +4197,7 @@ __metadata:
41974197
zod: ^3.22.4
41984198
zod-to-json-schema: ^3.21.4
41994199
zod-validation-error: ^3.4.0
4200-
checksum: 04c3140ef4d40579eda27069a23516f13156614a2d71a15b66eb99c240df8b9e992dda8f026236becdbec366196bcd3a068527e70b5aa71c4d20a92d59f5b9b2
4200+
checksum: 8d4357bdd835583e75ab883b4459c34eccb2868c7887abdfc0b4a0f4ab32ef1f45c4be910e531e222bf1785bf72697393f94a352a0da4a190678bb1e32922aa0
42014201
languageName: node
42024202
linkType: hard
42034203

@@ -4808,21 +4808,21 @@ __metadata:
48084808
languageName: node
48094809
linkType: hard
48104810

4811-
"@backstage/plugin-permission-node@npm:^0.10.0, @backstage/plugin-permission-node@npm:^0.10.2":
4812-
version: 0.10.2
4813-
resolution: "@backstage/plugin-permission-node@npm:0.10.2"
4811+
"@backstage/plugin-permission-node@npm:^0.10.0, @backstage/plugin-permission-node@npm:^0.10.2, @backstage/plugin-permission-node@npm:^0.10.4":
4812+
version: 0.10.4
4813+
resolution: "@backstage/plugin-permission-node@npm:0.10.4"
48144814
dependencies:
4815-
"@backstage/backend-plugin-api": ^1.4.1
4815+
"@backstage/backend-plugin-api": ^1.4.3
48164816
"@backstage/config": ^1.3.3
48174817
"@backstage/errors": ^1.2.7
4818-
"@backstage/plugin-auth-node": ^0.6.5
4818+
"@backstage/plugin-auth-node": ^0.6.7
48194819
"@backstage/plugin-permission-common": ^0.9.1
48204820
"@types/express": ^4.17.6
48214821
express: ^4.17.1
48224822
express-promise-router: ^4.1.0
48234823
zod: ^3.22.4
48244824
zod-to-json-schema: ^3.20.4
4825-
checksum: 70edf66456a0c1e798e8da6735c3d089dda61b8d1a7c73e1bd58517b2c2bd4ccb2734cbf36a0010f87dc5781bc0bd824c31a9ed1323f053c80b71ef966656d10
4825+
checksum: fc29a4168a2f04f539383f578f2fe930ea284568f6b1c804a39801611a3f39c60bc7a3a1c35ed95dcf7a9fd150baadf1f569ac153b3b02b0f727534337c1a5ca
48264826
languageName: node
48274827
linkType: hard
48284828

@@ -5189,6 +5189,33 @@ __metadata:
51895189
languageName: node
51905190
linkType: hard
51915191

5192+
"@backstage/plugin-scaffolder-node@npm:^0.9.0":
5193+
version: 0.9.0
5194+
resolution: "@backstage/plugin-scaffolder-node@npm:0.9.0"
5195+
dependencies:
5196+
"@backstage/backend-plugin-api": ^1.4.0
5197+
"@backstage/catalog-model": ^1.7.4
5198+
"@backstage/errors": ^1.2.7
5199+
"@backstage/integration": ^1.17.0
5200+
"@backstage/plugin-scaffolder-common": ^1.5.11
5201+
"@backstage/types": ^1.2.1
5202+
"@isomorphic-git/pgp-plugin": ^0.0.7
5203+
concat-stream: ^2.0.0
5204+
fs-extra: ^11.2.0
5205+
globby: ^11.0.0
5206+
isomorphic-git: ^1.23.0
5207+
jsonschema: ^1.5.0
5208+
lodash: ^4.17.21
5209+
p-limit: ^3.1.0
5210+
tar: ^6.1.12
5211+
winston: ^3.2.1
5212+
winston-transport: ^4.7.0
5213+
zod: ^3.22.4
5214+
zod-to-json-schema: ^3.20.4
5215+
checksum: 90efbcdc6cb7a3dedcd3f24a0ef18be5069be6dc4ed4640c686b5e3ae7929db11400d99643edf85085b660aeb3cdf800067734374c9b7bb78b111743e3b66d78
5216+
languageName: node
5217+
linkType: hard
5218+
51925219
"@backstage/plugin-scaffolder-react@npm:^1.18.0":
51935220
version: 1.18.0
51945221
resolution: "@backstage/plugin-scaffolder-react@npm:1.18.0"
@@ -5901,10 +5928,10 @@ __metadata:
59015928
languageName: node
59025929
linkType: hard
59035930

5904-
"@backstage/types@npm:^1.1.1, @backstage/types@npm:^1.2.0, @backstage/types@npm:^1.2.1":
5905-
version: 1.2.1
5906-
resolution: "@backstage/types@npm:1.2.1"
5907-
checksum: 4cf2f2fd5ca6e5f4716c5511ca00cdc8502387976a796098fec9cfd2aea6c6d077c13a46da43b1a7ff1c05fd7b208e7a45b51bbbd024319e9e7a053254fd2222
5931+
"@backstage/types@npm:^1.1.1, @backstage/types@npm:^1.2.0, @backstage/types@npm:^1.2.1, @backstage/types@npm:^1.2.2":
5932+
version: 1.2.2
5933+
resolution: "@backstage/types@npm:1.2.2"
5934+
checksum: 12aa576ab6d25db6709b12e25ae69887c4e886f71d5db527c0bbc019d761140fcbc3438b42a32328c4f255514dd23a776c3357f7c21965919ded058d453c67a2
59085935
languageName: node
59095936
linkType: hard
59105937

@@ -11261,7 +11288,6 @@ __metadata:
1126111288
resolution: "@red-hat-developer-hub/backstage-plugin-orchestrator-backend@workspace:plugins/orchestrator-backend"
1126211289
dependencies:
1126311290
"@backstage-community/plugin-rbac-common": ^1.12.1
11264-
"@backstage/backend-common": ^0.25.0
1126511291
"@backstage/backend-defaults": ^0.10.0
1126611292
"@backstage/backend-plugin-api": ^1.3.1
1126711293
"@backstage/backend-tasks": ^0.6.1
@@ -11275,7 +11301,7 @@ __metadata:
1127511301
"@backstage/plugin-permission-common": ^0.9.0
1127611302
"@backstage/plugin-permission-node": ^0.10.0
1127711303
"@backstage/plugin-scaffolder-backend": ^1.33.0
11278-
"@backstage/plugin-scaffolder-node": ^0.8.2
11304+
"@backstage/plugin-scaffolder-node": ^0.9.0
1127911305
"@janus-idp/backstage-plugin-audit-log-node": ^1.7.1
1128011306
"@janus-idp/cli": 3.6.1
1128111307
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^"

0 commit comments

Comments
 (0)