chore: update backstage to 1.31.1

.changeset/brave-houses-hammer.md

@@ -0,0 +1,19 @@
+---
+'@dweber019/backstage-plugin-api-docs-module-wsdl-backend': patch
+'@dweber019/backstage-plugin-api-docs-spectral-linter': patch
+'@dweber019/backstage-plugin-missing-entity-backend': patch
+'@dweber019/backstage-plugin-missing-entity-common': patch
+'@dweber019/backstage-plugin-api-docs-module-wsdl': patch
+'@dweber019/backstage-plugin-accentuate-backend': patch
+'@dweber019/backstage-plugin-accentuate-common': patch
+'@dweber019/backstage-plugin-endoflife-backend': patch
+'@dweber019/backstage-plugin-relations-backend': patch
+'@dweber019/backstage-plugin-missing-entity': patch
+'@dweber019/backstage-plugin-simple-icons': patch
+'@dweber019/backstage-plugin-accentuate': patch
+'@dweber019/backstage-plugin-endoflife': patch
+'@dweber019/backstage-plugin-relations': patch
+'@dweber019/backstage-plugin-tips': patch
+---
+
+Update backstage to 1.31.1.

.changeset/purple-lobsters-appear.md

@@ -0,0 +1,6 @@
+---
+'@dweber019/backstage-plugin-api-docs-module-wsdl-backend': major
+'@dweber019/backstage-plugin-accentuate-backend': major
+---
+
+BREAKING: The deprecated identity and token manager services have been removed from route configurations.

.yarnrc.yml

@@ -1,11 +1,11 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 httpTimeout: 300000
 
 nodeLinker: node-modules
 
 npmRegistryServer: "https://registry.npmjs.org/"
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-yarnPath: .yarn/releases/yarn-3.2.4.cjs
+yarnPath: .yarn/releases/yarn-4.4.1.cjs

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.30.2"
+  "version": "1.31.1"
 }

package.json

@@ -12,7 +12,7 @@
     "node": "18 || 20"
   },
   "scripts": {
-    "dev": "concurrently \"yarn start\" \"yarn start-backend\"",
+    "dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
     "start": "yarn workspace app start",
     "start-backend": "yarn workspace backend start",
     "build:backend": "yarn workspace backend build",
@@ -44,7 +44,7 @@
     "@changesets/cli": "^2.18.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
+    "@backstage/cli": "^0.27.1",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
@@ -70,7 +70,7 @@
       "prettier --write"
     ]
   },
-  "packageManager": "yarn@3.2.4",
+  "packageManager": "yarn@4.4.1",
   "jest": {
     "testPathIgnorePatterns": [
       "packages"

packages/app/package.json

@@ -12,30 +12,30 @@
   },
   "bundled": true,
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.10",
-    "@backstage/catalog-model": "^1.6.0",
-    "@backstage/cli": "^0.27.0",
-    "@backstage/core-app-api": "^1.14.2",
-    "@backstage/core-components": "^0.14.10",
-    "@backstage/core-plugin-api": "^1.9.3",
-    "@backstage/integration-react": "^1.1.30",
-    "@backstage/plugin-api-docs": "^0.11.8",
-    "@backstage/plugin-catalog": "^1.22.0",
-    "@backstage/plugin-catalog-common": "^1.0.26",
-    "@backstage/plugin-catalog-graph": "^0.4.8",
-    "@backstage/plugin-catalog-import": "^0.12.2",
-    "@backstage/plugin-catalog-react": "^1.12.3",
-    "@backstage/plugin-notifications": "^0.3.0",
-    "@backstage/plugin-org": "^0.6.28",
-    "@backstage/plugin-permission-react": "^0.4.25",
-    "@backstage/plugin-scaffolder": "^1.24.0",
-    "@backstage/plugin-search": "^1.4.15",
-    "@backstage/plugin-search-react": "^1.7.14",
-    "@backstage/plugin-techdocs": "^1.10.8",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.13",
-    "@backstage/plugin-techdocs-react": "^1.2.7",
-    "@backstage/plugin-user-settings": "^0.8.11",
-    "@backstage/theme": "^0.5.6",
+    "@backstage/app-defaults": "^1.5.11",
+    "@backstage/catalog-model": "^1.7.0",
+    "@backstage/cli": "^0.27.1",
+    "@backstage/core-app-api": "^1.15.0",
+    "@backstage/core-components": "^0.15.0",
+    "@backstage/core-plugin-api": "^1.9.4",
+    "@backstage/integration-react": "^1.1.31",
+    "@backstage/plugin-api-docs": "^0.11.9",
+    "@backstage/plugin-catalog": "^1.23.0",
+    "@backstage/plugin-catalog-common": "^1.1.0",
+    "@backstage/plugin-catalog-graph": "^0.4.9",
+    "@backstage/plugin-catalog-import": "^0.12.3",
+    "@backstage/plugin-catalog-react": "^1.13.0",
+    "@backstage/plugin-notifications": "^0.3.1",
+    "@backstage/plugin-org": "^0.6.29",
+    "@backstage/plugin-permission-react": "^0.4.26",
+    "@backstage/plugin-scaffolder": "^1.25.0",
+    "@backstage/plugin-search": "^1.4.16",
+    "@backstage/plugin-search-react": "^1.8.0",
+    "@backstage/plugin-techdocs": "^1.10.9",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.14",
+    "@backstage/plugin-techdocs-react": "^1.2.8",
+    "@backstage/plugin-user-settings": "^0.8.12",
+    "@backstage/theme": "^0.5.7",
     "@dweber019/backstage-plugin-accentuate": "^0.0.9",
     "@dweber019/backstage-plugin-api-docs-module-wsdl": "^0.0.15",
     "@dweber019/backstage-plugin-api-docs-spectral-linter": "^0.4.5",
@@ -54,7 +54,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.10",
+    "@backstage/test-utils": "^1.6.0",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",

packages/backend/package.json

@@ -24,32 +24,32 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.24.0",
-    "@backstage/backend-defaults": "^0.4.3",
-    "@backstage/backend-tasks": "^0.6.0",
-    "@backstage/catalog-client": "^1.6.6",
-    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/backend-common": "^0.25.0",
+    "@backstage/backend-defaults": "^0.5.0",
+    "@backstage/backend-tasks": "^0.6.1",
+    "@backstage/catalog-client": "^1.7.0",
+    "@backstage/catalog-model": "^1.7.0",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.72",
-    "@backstage/plugin-auth-backend": "^0.22.10",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.9",
-    "@backstage/plugin-auth-node": "^0.5.0",
-    "@backstage/plugin-catalog-backend": "^1.25.0",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.0.2",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.21",
-    "@backstage/plugin-notifications-backend": "^0.3.5",
-    "@backstage/plugin-permission-backend": "^0.5.47",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.20",
+    "@backstage/plugin-app-backend": "^0.3.74",
+    "@backstage/plugin-auth-backend": "^0.23.0",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.0",
+    "@backstage/plugin-auth-node": "^0.5.2",
+    "@backstage/plugin-catalog-backend": "^1.26.0",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.1.0",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.0",
+    "@backstage/plugin-notifications-backend": "^0.4.0",
+    "@backstage/plugin-permission-backend": "^0.5.49",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.0",
     "@backstage/plugin-permission-common": "^0.8.1",
-    "@backstage/plugin-permission-node": "^0.8.1",
-    "@backstage/plugin-proxy-backend": "^0.5.4",
-    "@backstage/plugin-scaffolder-backend": "^1.24.0",
-    "@backstage/plugin-search-backend": "^1.5.15",
-    "@backstage/plugin-search-backend-module-catalog": "^0.2.0",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.33",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.2.0",
-    "@backstage/plugin-search-backend-node": "^1.3.0",
-    "@backstage/plugin-techdocs-backend": "^1.10.11",
+    "@backstage/plugin-permission-node": "^0.8.3",
+    "@backstage/plugin-proxy-backend": "^0.5.6",
+    "@backstage/plugin-scaffolder-backend": "^1.25.0",
+    "@backstage/plugin-search-backend": "^1.5.17",
+    "@backstage/plugin-search-backend-module-catalog": "^0.2.2",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.35",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.2.2",
+    "@backstage/plugin-search-backend-node": "^1.3.2",
+    "@backstage/plugin-techdocs-backend": "^1.10.13",
     "@dweber019/backstage-plugin-accentuate-backend": "^0.0.8",
     "@dweber019/backstage-plugin-api-docs-module-wsdl-backend": "^0.0.15",
     "@dweber019/backstage-plugin-endoflife-backend": "^0.0.10",
@@ -64,7 +64,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
+    "@backstage/cli": "^0.27.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
     "@types/luxon": "^2.0.4"

plugins/accentuate-backend/package.json

@@ -34,13 +34,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-defaults": "^0.4.3",
-    "@backstage/backend-plugin-api": "^0.8.0",
-    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/backend-defaults": "^0.5.0",
+    "@backstage/backend-plugin-api": "^1.0.0",
+    "@backstage/catalog-model": "^1.7.0",
     "@backstage/config": "^1.2.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-auth-node": "^0.5.0",
-    "@backstage/plugin-catalog-node": "^1.12.5",
+    "@backstage/plugin-auth-node": "^0.5.2",
+    "@backstage/plugin-catalog-node": "^1.13.0",
     "@backstage/types": "^1.1.1",
     "@dweber019/backstage-plugin-accentuate-common": "^0.0.7",
     "@types/express": "^4.17.6",
@@ -54,9 +54,9 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.5.1",
-    "@backstage/cli": "^0.27.0",
-    "@backstage/test-utils": "^1.5.10",
+    "@backstage/backend-test-utils": "^1.0.0",
+    "@backstage/cli": "^0.27.1",
+    "@backstage/test-utils": "^1.6.0",
     "@types/supertest": "^6.0.0",
     "msw": "^1.0.0",
     "supertest": "^7.0.0"

plugins/accentuate-backend/src/plugin.ts

@@ -18,16 +18,18 @@ export const accentuatePlugin = createBackendPlugin({
         logger: coreServices.logger,
         config: coreServices.rootConfig,
         database: coreServices.database,
-        identity: coreServices.identity,
+        userInfo: coreServices.userInfo,
         httpRouter: coreServices.httpRouter,
+        httpAuth: coreServices.httpAuth,
       },
-      async init({ logger, config, database, identity, httpRouter }) {
+      async init({ logger, config, database, httpAuth, httpRouter, userInfo }) {
         httpRouter.use(
           await createRouterFromConfig({
             logger,
             config,
             database,
-            identity,
+            userInfo,
+            httpAuth,
           }),
         );
         httpRouter.addAuthPolicy({

plugins/accentuate-backend/src/service/router.ts

@@ -4,24 +4,24 @@ import { AccentuateBackendDatabase } from '../db';
 import { AccentuateBackendClient, AccentuateBackendApi } from '../api';
 import { Config } from '@backstage/config';
 import { InputError } from '@backstage/errors';
-import { IdentityApi } from '@backstage/plugin-auth-node';
 import { AccentuateInput } from '@dweber019/backstage-plugin-accentuate-common';
-import { DatabaseService, LoggerService } from '@backstage/backend-plugin-api';
+import { DatabaseService, HttpAuthService, LoggerService, UserInfoService } from '@backstage/backend-plugin-api';
 
 /** @public */
 export interface RouterOptions {
   accentuateBackendApi?: AccentuateBackendApi;
   logger: LoggerService;
   database: DatabaseService;
-  identity: IdentityApi;
+  userInfo: UserInfoService;
+  httpAuth: HttpAuthService;
   config?: Config;
 }
 
 /** @public */
 export async function createRouter(
   routerOptions: RouterOptions,
 ): Promise<express.Router> {
-  const { logger, database, identity } = routerOptions;
+  const { logger, database, httpAuth, userInfo } = routerOptions;
 
   const accentuateBackendStore = await AccentuateBackendDatabase.create(
     await database.getClient(),
@@ -50,7 +50,8 @@ export async function createRouter(
   });
 
   router.put('/', async (req, res) => {
-    const identityResponse = await identity.getIdentity({ request: req });
+    const credentials = await httpAuth.credentials(req);
+    const info = await userInfo.getUserInfo(credentials);
 
     const accentuateInput = req.body as AccentuateInput;
     if (
@@ -64,7 +65,7 @@ export async function createRouter(
       const accentuateResponse = await accentuateBackendClient.update(
         accentuateInput.entityRef,
         accentuateInput.data,
-        identityResponse ? identityResponse.identity.userEntityRef : 'unknown',
+        info ? info.userEntityRef : 'unknown',
       );
       res.status(200).json(accentuateResponse);
     }

plugins/accentuate-common/package.json

@@ -36,11 +36,11 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/catalog-model": "^1.7.0",
     "@backstage/types": "^1.1.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0"
+    "@backstage/cli": "^0.27.1"
   },
   "files": [
     "dist"

plugins/accentuate/package.json

@@ -35,12 +35,12 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.6.0",
-    "@backstage/core-components": "^0.14.10",
-    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/catalog-model": "^1.7.0",
+    "@backstage/core-components": "^0.15.0",
+    "@backstage/core-plugin-api": "^1.9.4",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-catalog": "^1.22.0",
-    "@backstage/plugin-catalog-react": "^1.12.3",
+    "@backstage/plugin-catalog": "^1.23.0",
+    "@backstage/plugin-catalog-react": "^1.13.0",
     "@backstage/types": "^1.1.1",
     "@dweber019/backstage-plugin-accentuate-common": "^0.0.7",
     "@material-ui/core": "^4.12.2",
@@ -58,9 +58,9 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
-    "@backstage/dev-utils": "^1.0.37",
-    "@backstage/test-utils": "^1.5.10",
+    "@backstage/cli": "^0.27.1",
+    "@backstage/dev-utils": "^1.1.0",
+    "@backstage/test-utils": "^1.6.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^15.0.0",
     "@testing-library/user-event": "^14.0.0",

plugins/api-docs-module-wsdl-backend/package.json

@@ -34,10 +34,10 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.24.0",
-    "@backstage/backend-plugin-api": "^0.8.0",
-    "@backstage/catalog-client": "^1.6.6",
-    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/backend-common": "^0.25.0",
+    "@backstage/backend-plugin-api": "^1.0.0",
+    "@backstage/catalog-client": "^1.7.0",
+    "@backstage/catalog-model": "^1.7.0",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.1.5",
     "express": "^4.18.1",
@@ -49,7 +49,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
+    "@backstage/cli": "^0.27.1",
     "@types/supertest": "^6.0.0",
     "msw": "^1.0.0",
     "supertest": "^7.0.0"