chore: bump backstage dependencies from 1.22 -> 1.30 (#60)

* bump backstage 1.22 -> 1.30 * fix breaking change in 1.30 removing setupRequestMockHandlers setupRequestMockHandlers is removed; use registerMswTestHooks instead. * temporarily fix scaffolder type issue * fix broken tests in entityscaffoldercontent * more reader fixes * fix lodash tsc issue
seatgeek · Aug 24, 2024 · 9321090 · 9321090
1 parent f4e20db
commit 9321090
Show file tree

Hide file tree

Showing 19 changed files with 4,008 additions and 2,229 deletions.
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.22.2"
+  "version": "1.30.2"
 }
diff --git a/package.json b/package.json
@@ -35,8 +35,8 @@
     "yarn": "1.22.21"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.1",
-    "@backstage/e2e-test-utils": "^0.1.0",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@qiwi/multi-semantic-release": "^7.1.1",
     "@semantic-release/exec": "^6.0.3",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,30 +14,30 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.7",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/cli": "^0.25.1",
-    "@backstage/core-app-api": "^1.11.3",
-    "@backstage/core-components": "^0.13.10",
-    "@backstage/core-plugin-api": "^1.8.2",
-    "@backstage/integration-react": "^1.1.23",
-    "@backstage/plugin-api-docs": "^0.10.3",
-    "@backstage/plugin-catalog": "^1.16.1",
-    "@backstage/plugin-catalog-common": "^1.0.20",
-    "@backstage/plugin-catalog-graph": "^0.3.3",
-    "@backstage/plugin-catalog-import": "^0.10.5",
-    "@backstage/plugin-catalog-react": "^1.9.3",
-    "@backstage/plugin-github-actions": "^0.6.10",
-    "@backstage/plugin-org": "^0.6.19",
-    "@backstage/plugin-permission-react": "^0.4.19",
-    "@backstage/plugin-scaffolder": "^1.17.1",
-    "@backstage/plugin-search": "^1.4.5",
-    "@backstage/plugin-search-react": "^1.7.5",
-    "@backstage/plugin-techdocs": "^1.9.3",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.4",
-    "@backstage/plugin-techdocs-react": "^1.1.15",
-    "@backstage/plugin-user-settings": "^0.8.0",
-    "@backstage/theme": "^0.5.0",
+    "@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-github-actions": "^0.6.16",
+    "@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",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@seatgeek/backstage-plugin-awards": "link:*",
@@ -50,7 +50,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.4.7",
+    "@backstage/test-utils": "^1.5.10",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^8.0.0",
     "@testing-library/jest-dom": "^5.10.1",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,26 +16,26 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.20.1",
-    "@backstage/backend-tasks": "^0.5.14",
-    "@backstage/catalog-client": "^1.5.2",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/config": "^1.1.1",
-    "@backstage/plugin-app-backend": "^0.3.57",
-    "@backstage/plugin-auth-backend": "^0.20.3",
-    "@backstage/plugin-auth-node": "^0.4.3",
-    "@backstage/plugin-catalog-backend": "^1.16.2",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.6",
-    "@backstage/plugin-permission-common": "^0.7.12",
-    "@backstage/plugin-permission-node": "^0.7.20",
-    "@backstage/plugin-proxy-backend": "^0.4.7",
-    "@backstage/plugin-scaffolder-backend": "^1.20.0",
-    "@backstage/plugin-search-backend": "^1.4.9",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.13",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.18",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.1.13",
-    "@backstage/plugin-search-backend-node": "^1.2.13",
-    "@backstage/plugin-techdocs-backend": "^1.9.2",
+    "@backstage/backend-common": "^0.24.0",
+    "@backstage/backend-tasks": "^0.6.0",
+    "@backstage/catalog-client": "^1.6.6",
+    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/config": "^1.2.0",
+    "@backstage/plugin-app-backend": "^0.3.72",
+    "@backstage/plugin-auth-backend": "^0.22.10",
+    "@backstage/plugin-auth-node": "^0.5.0",
+    "@backstage/plugin-catalog-backend": "^1.25.0",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.21",
+    "@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",
     "@seatgeek/backstage-plugin-awards-backend": "link:*",
     "app": "*",
     "better-sqlite3": "^9.0.0",
@@ -47,7 +47,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.1",
+    "@backstage/cli": "^0.27.0",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -11,7 +11,6 @@ import {
   DatabaseManager,
   HostDiscovery,
   ServerTokenManager,
-  UrlReaders,
   createServiceBuilder,
   getRootLogger,
   loadBackendConfig,
@@ -35,7 +34,6 @@ import { PluginEnvironment } from './types';
 
 function makeCreateEnv(config: Config) {
   const root = getRootLogger();
-  const reader = UrlReaders.default({ logger: root, config });
   const discovery = HostDiscovery.fromConfig(config);
   const cacheManager = CacheManager.fromConfig(config);
   const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
@@ -50,8 +48,6 @@ function makeCreateEnv(config: Config) {
     tokenManager,
   });
 
-  root.info(`Created UrlReader ${reader}`);
-
   return (plugin: string): PluginEnvironment => {
     const logger = root.child({ type: 'plugin', plugin });
     const database = databaseManager.forPlugin(plugin);
@@ -62,10 +58,10 @@ function makeCreateEnv(config: Config) {
       database,
       cache,
       config,
-      reader,
       discovery,
       tokenManager,
       scheduler,
+      reader: undefined as any,
       permissions,
       identity,
     };

diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
@@ -3,7 +3,6 @@ import {
   PluginDatabaseManager,
   PluginEndpointDiscovery,
   TokenManager,
-  UrlReader,
 } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { Config } from '@backstage/config';
@@ -16,8 +15,8 @@ export type PluginEnvironment = {
   database: PluginDatabaseManager;
   cache: PluginCacheManager;
   config: Config;
-  reader: UrlReader;
   discovery: PluginEndpointDiscovery;
+  reader: any;
   tokenManager: TokenManager;
   scheduler: PluginTaskScheduler;
   permissions: PermissionEvaluator;

diff --git a/plugins/awards-backend/package.json b/plugins/awards-backend/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.521.0",
-    "@backstage/backend-common": "^0.20.1",
-    "@backstage/backend-plugin-api": "^0.6.9",
-    "@backstage/catalog-client": "^1.6.0",
-    "@backstage/catalog-model": "^1.4.4",
-    "@backstage/config": "^1.1.1",
-    "@backstage/errors": "^1.2.3",
-    "@backstage/plugin-auth-node": "^0.4.3",
+    "@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/config": "^1.2.0",
+    "@backstage/errors": "^1.2.4",
+    "@backstage/plugin-auth-node": "^0.5.0",
     "@seatgeek/backstage-plugin-awards-common": "link:*",
     "@slack/webhook": "^7.0.2",
     "@tweedegolf/sab-adapter-amazon-s3": "^1.0.13",
@@ -50,7 +50,8 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.1",
+    "@backstage/cli": "^0.27.0",
+    "@types/lodash": "^4.17.7",
     "@types/supertest": "^2.0.12",
     "better-sqlite3": "^9.1.1",
     "msw": "^1.0.0",

diff --git a/plugins/awards-common/package.json b/plugins/awards-common/package.json
@@ -21,8 +21,8 @@
     "role": "backend-plugin"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.20.1",
-    "@backstage/config": "^1.1.1",
+    "@backstage/backend-common": "^0.24.0",
+    "@backstage/config": "^1.2.0",
     "@types/express": "*",
     "@types/uuid": "^9.0.6",
     "express": "^4.17.1",
@@ -32,7 +32,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.1",
+    "@backstage/cli": "^0.27.0",
     "@types/supertest": "^2.0.12",
     "msw": "^1.0.0",
     "supertest": "^6.2.4"

diff --git a/plugins/awards/package.json b/plugins/awards/package.json
@@ -23,11 +23,11 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/core-components": "^0.13.10",
-    "@backstage/core-plugin-api": "^1.8.2",
-    "@backstage/plugin-catalog-react": "^1.9.3",
-    "@backstage/theme": "^0.5.0",
+    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/core-components": "^0.14.10",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/plugin-catalog-react": "^1.12.3",
+    "@backstage/theme": "^0.5.6",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
@@ -37,13 +37,14 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.1",
-    "@backstage/core-app-api": "^1.11.3",
-    "@backstage/dev-utils": "^1.0.26",
-    "@backstage/test-utils": "^1.4.7",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/core-app-api": "^1.14.2",
+    "@backstage/dev-utils": "^1.0.37",
+    "@backstage/test-utils": "^1.5.10",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
+    "@types/lodash": "^4.17.7",
     "msw": "^1.0.0",
     "uuid": "^9.0.1"
   },

diff --git a/plugins/aws-catalog-backend/package.json b/plugins/aws-catalog-backend/package.json
@@ -24,11 +24,11 @@
   "dependencies": {
     "@aws-sdk/client-rds": "^3.499.0",
     "@aws-sdk/types": "^3.347.0",
-    "@backstage/backend-common": "^0.20.1",
-    "@backstage/backend-tasks": "^0.5.14",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/config": "^1.1.1",
-    "@backstage/plugin-catalog-node": "^1.6.1",
+    "@backstage/backend-common": "^0.24.0",
+    "@backstage/backend-tasks": "^0.6.0",
+    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/config": "^1.2.0",
+    "@backstage/plugin-catalog-node": "^1.12.5",
     "@seatgeek/backstage-plugin-aws-catalog-common": "link:*",
     "@types/express": "*",
     "express": "^4.17.1",
@@ -40,8 +40,9 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.2.10",
-    "@backstage/cli": "^0.25.1",
+    "@backstage/backend-test-utils": "^0.5.0",
+    "@backstage/cli": "^0.27.0",
+    "@types/lodash": "^4.17.7",
     "@types/supertest": "^2.0.12",
     "msw": "^1.0.0",
     "supertest": "^6.2.4"

diff --git a/plugins/aws-catalog-backend/src/RDSEntityProvider.test.ts b/plugins/aws-catalog-backend/src/RDSEntityProvider.test.ts
@@ -5,7 +5,7 @@
 import { DBInstance } from '@aws-sdk/client-rds';
 import { getVoidLogger } from '@backstage/backend-common';
 import { TaskInvocationDefinition, TaskRunner } from '@backstage/backend-tasks';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { registerMswTestHooks } from '@backstage/backend-test-utils';
 import { ResourceEntity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
@@ -55,7 +55,7 @@ const EXAMPLE_CREDENTIALS = {
 };
 
 describe('RDSEntityProvider', () => {
-  setupRequestMockHandlers(server);
+  registerMswTestHooks(server);
   afterEach(() => jest.resetAllMocks());
 
   it('no provider config', () => {

diff --git a/plugins/aws-catalog-common/package.json b/plugins/aws-catalog-common/package.json
@@ -29,7 +29,7 @@
     "link2aws": "^1.0.18"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.1"
+    "@backstage/cli": "^0.27.0"
   },
   "files": [
     "dist"

diff --git a/plugins/catalog-backend-module-okta/package.json b/plugins/catalog-backend-module-okta/package.json
@@ -22,12 +22,12 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.20.1",
-    "@backstage/backend-tasks": "^0.5.14",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/config": "^1.1.1",
-    "@backstage/integration": "^1.8.0",
-    "@backstage/plugin-catalog-node": "^1.6.1",
+    "@backstage/backend-common": "^0.24.0",
+    "@backstage/backend-tasks": "^0.6.0",
+    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/config": "^1.2.0",
+    "@backstage/integration": "^1.14.0",
+    "@backstage/plugin-catalog-node": "^1.12.5",
     "@okta/okta-sdk-nodejs": "^7.0.1",
     "@types/express": "*",
     "express": "^4.17.1",
@@ -39,8 +39,9 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.2.10",
-    "@backstage/cli": "^0.25.1",
+    "@backstage/backend-test-utils": "^0.5.0",
+    "@backstage/cli": "^0.27.0",
+    "@types/lodash": "^4.17.7",
     "@types/supertest": "^2.0.12",
     "@types/uuid": "^9.0.4",
     "msw": "^1.0.0",

diff --git a/plugins/catalog-backend-module-okta/src/OktaOrgDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-okta/src/OktaOrgDiscoveryEntityProvider.test.ts
@@ -4,7 +4,7 @@
  */
 import { getVoidLogger } from '@backstage/backend-common';
 import { TaskInvocationDefinition, TaskRunner } from '@backstage/backend-tasks';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { registerMswTestHooks } from '@backstage/backend-test-utils';
 import { GroupEntity, UserEntity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
@@ -69,7 +69,7 @@ const simpleGroupTransformer: OktaGroupTransformer = (
 };
 
 describe('GitlabOrgDiscoveryEntityProvider', () => {
-  setupRequestMockHandlers(server);
+  registerMswTestHooks(server);
   afterEach(() => jest.resetAllMocks());
 
   it('no provider config', () => {