chore: update to backstage 1.30.1 (#228)

Signed-off-by: Heikki Hellgren <[email protected]>
awslabs · Aug 29, 2024 · c5ef14c · c5ef14c
1 parent 1624f6b
commit c5ef14c
Show file tree

Hide file tree

Showing 23 changed files with 3,099 additions and 1,462 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,6 @@ site
 
 # E2E test reports
 e2e-test-report/
+
+# IntelliJ IDEA
+.idea
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.25.0"
+  "version": "1.30.2"
 }
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2",
+    "@backstage/cli": "^0.27.0",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -19,31 +19,31 @@
     "@aws/aws-codepipeline-plugin-for-backstage": "workspace:^",
     "@aws/cost-insights-plugin-for-backstage": "workspace:^",
     "@backstage-community/plugin-cost-insights": "^0.12.25",
-    "@backstage/app-defaults": "^1.5.3",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/cli": "^0.26.2",
-    "@backstage/core-app-api": "^1.12.3",
-    "@backstage/core-components": "^0.14.3",
-    "@backstage/core-plugin-api": "^1.9.1",
-    "@backstage/integration-react": "^1.1.25",
-    "@backstage/plugin-api-docs": "^0.11.3",
-    "@backstage/plugin-catalog": "^1.18.2",
-    "@backstage/plugin-catalog-common": "^1.0.22",
-    "@backstage/plugin-catalog-graph": "^0.4.3",
-    "@backstage/plugin-catalog-import": "^0.10.9",
-    "@backstage/plugin-catalog-react": "^1.11.2",
-    "@backstage/plugin-github-actions": "^0.6.14",
-    "@backstage/plugin-org": "^0.6.23",
-    "@backstage/plugin-permission-react": "^0.4.21",
-    "@backstage/plugin-scaffolder": "^1.19.2",
-    "@backstage/plugin-search": "^1.4.9",
-    "@backstage/plugin-search-react": "^1.7.9",
-    "@backstage/plugin-tech-radar": "^0.7.2",
-    "@backstage/plugin-techdocs": "^1.10.3",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.8",
-    "@backstage/plugin-techdocs-react": "^1.2.2",
-    "@backstage/plugin-user-settings": "^0.8.4",
-    "@backstage/theme": "^0.5.2",
+    "@backstage-community/plugin-github-actions": "^0.6.16",
+    "@backstage-community/plugin-tech-radar": "^0.7.4",
+    "@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-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",
     "history": "^5.0.0",
@@ -54,7 +54,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.3",
+    "@backstage/test-utils": "^1.5.10",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -13,7 +13,7 @@ import {
 import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { orgPlugin } from '@backstage/plugin-org';
 import { SearchPage } from '@backstage/plugin-search';
-import { TechRadarPage } from '@backstage/plugin-tech-radar';
+import { TechRadarPage } from '@backstage-community/plugin-tech-radar';
 import {
   TechDocsIndexPage,
   techdocsPlugin,

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -21,28 +21,29 @@
     "@aws/aws-codepipeline-plugin-for-backstage-backend": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-scaffolder-actions": "workspace:^",
     "@aws/cost-insights-plugin-for-backstage-backend": "workspace:^",
-    "@backstage/backend-common": "^0.21.6",
-    "@backstage/backend-defaults": "^0.2.16",
-    "@backstage/backend-tasks": "^0.5.21",
-    "@backstage/catalog-client": "^1.6.3",
-    "@backstage/catalog-model": "^1.4.5",
+    "@backstage/backend-common": "^0.24.0",
+    "@backstage/backend-defaults": "^0.4.3",
+    "@backstage/backend-plugin-api": "^0.8.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.64",
-    "@backstage/plugin-auth-backend": "^0.22.3",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.2",
-    "@backstage/plugin-auth-node": "^0.4.11",
-    "@backstage/plugin-catalog-backend": "^1.21.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.14",
-    "@backstage/plugin-permission-common": "^0.7.13",
-    "@backstage/plugin-permission-node": "^0.7.27",
-    "@backstage/plugin-proxy-backend": "^0.4.14",
-    "@backstage/plugin-scaffolder-backend": "^1.22.3",
-    "@backstage/plugin-search-backend": "^1.5.6",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.21",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.25",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.1.21",
-    "@backstage/plugin-search-backend-node": "^1.2.20",
-    "@backstage/plugin-techdocs-backend": "^1.10.3",
+    "@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-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",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",
@@ -53,7 +54,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2",
+    "@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/types.ts b/packages/backend/src/types.ts
@@ -1,25 +1,23 @@
-import { Logger } from 'winston';
 import { Config } from '@backstage/config';
-import {
-  PluginCacheManager,
-  PluginDatabaseManager,
-  PluginEndpointDiscovery,
-  TokenManager,
-  UrlReader,
-} from '@backstage/backend-common';
-import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import { IdentityApi } from '@backstage/plugin-auth-node';
+import {
+  CacheService,
+  DatabaseService,
+  DiscoveryService,
+  LoggerService,
+  SchedulerService,
+  UrlReaderService,
+} from '@backstage/backend-plugin-api';
 
 export type PluginEnvironment = {
-  logger: Logger;
-  database: PluginDatabaseManager;
-  cache: PluginCacheManager;
+  logger: LoggerService;
+  database: DatabaseService;
+  cache: CacheService;
   config: Config;
-  reader: UrlReader;
-  discovery: PluginEndpointDiscovery;
-  tokenManager: TokenManager;
-  scheduler: PluginTaskScheduler;
+  reader: UrlReaderService;
+  discovery: DiscoveryService;
+  scheduler: SchedulerService;
   permissions: PermissionEvaluator;
   identity: IdentityApi;
 };
diff --git a/plugins/codebuild/backend/package.json b/plugins/codebuild/backend/package.json
@@ -32,13 +32,13 @@
     "@aws-sdk/util-arn-parser": "^3.495.0",
     "@aws/aws-codebuild-plugin-for-backstage-common": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-common": "workspace:^",
-    "@backstage/backend-common": "^0.21.6",
-    "@backstage/backend-plugin-api": "^0.6.16",
-    "@backstage/catalog-client": "^1.6.3",
-    "@backstage/catalog-model": "^1.4.5",
+    "@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/integration-aws-node": "^0.1.12",
-    "@backstage/plugin-catalog-node": "^1.11.0",
+    "@backstage/plugin-catalog-node": "^1.12.5",
     "@types/express": "*",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -47,11 +47,11 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-defaults": "^0.2.16",
-    "@backstage/backend-test-utils": "^0.3.6",
-    "@backstage/cli": "^0.26.2",
-    "@backstage/plugin-auth-backend": "^0.22.3",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.2",
+    "@backstage/backend-defaults": "^0.4.3",
+    "@backstage/backend-test-utils": "^0.5.0",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/plugin-auth-backend": "^0.22.10",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.9",
     "@types/supertest": "^2.0.12",
     "aws-sdk-client-mock": "^4.0.0",
     "msw": "^1.0.0",

diff --git a/plugins/codebuild/common/package.json b/plugins/codebuild/common/package.json
@@ -29,13 +29,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2"
+    "@backstage/cli": "^0.27.0"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
     "@aws-sdk/client-codebuild": "^3.511.0",
-    "@backstage/catalog-model": "^1.4.5"
+    "@backstage/catalog-model": "^1.6.0"
   }
 }
diff --git a/plugins/codebuild/frontend/package.json b/plugins/codebuild/frontend/package.json
@@ -32,11 +32,11 @@
     "@aws/aws-codebuild-plugin-for-backstage-common": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-common": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-react": "workspace:^",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/core-components": "^0.14.3",
-    "@backstage/core-plugin-api": "^1.9.1",
-    "@backstage/plugin-catalog-react": "^1.11.2",
-    "@backstage/theme": "^0.5.2",
+    "@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",
@@ -49,10 +49,10 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2",
-    "@backstage/core-app-api": "^1.12.3",
-    "@backstage/dev-utils": "^1.0.30",
-    "@backstage/test-utils": "^1.5.3",
+    "@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/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",

diff --git a/plugins/codepipeline/backend/package.json b/plugins/codepipeline/backend/package.json
@@ -32,13 +32,13 @@
     "@aws-sdk/util-arn-parser": "^3.495.0",
     "@aws/aws-codepipeline-plugin-for-backstage-common": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-common": "workspace:^",
-    "@backstage/backend-common": "^0.21.6",
-    "@backstage/backend-plugin-api": "^0.6.16",
-    "@backstage/catalog-client": "^1.6.3",
-    "@backstage/catalog-model": "^1.4.5",
+    "@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/integration-aws-node": "^0.1.12",
-    "@backstage/plugin-catalog-node": "^1.11.0",
+    "@backstage/plugin-catalog-node": "^1.12.5",
     "@types/express": "*",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -47,11 +47,11 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-defaults": "^0.2.16",
-    "@backstage/backend-test-utils": "^0.3.6",
-    "@backstage/cli": "^0.26.2",
-    "@backstage/plugin-auth-backend": "^0.22.3",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.2",
+    "@backstage/backend-defaults": "^0.4.3",
+    "@backstage/backend-test-utils": "^0.5.0",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/plugin-auth-backend": "^0.22.10",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.9",
     "@types/supertest": "^2.0.12",
     "aws-sdk-client-mock": "^4.0.0",
     "msw": "^1.0.0",

diff --git a/plugins/codepipeline/common/package.json b/plugins/codepipeline/common/package.json
@@ -29,13 +29,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2"
+    "@backstage/cli": "^0.27.0"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
     "@aws-sdk/client-codepipeline": "^3.511.0",
-    "@backstage/catalog-model": "^1.4.5"
+    "@backstage/catalog-model": "^1.6.0"
   }
 }
diff --git a/plugins/codepipeline/frontend/package.json b/plugins/codepipeline/frontend/package.json
@@ -33,11 +33,11 @@
     "@aws/aws-codepipeline-plugin-for-backstage-common": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-common": "workspace:^",
     "@aws/aws-core-plugin-for-backstage-react": "workspace:^",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/core-components": "^0.14.3",
-    "@backstage/core-plugin-api": "^1.9.1",
-    "@backstage/plugin-catalog-react": "^1.11.2",
-    "@backstage/theme": "^0.5.2",
+    "@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",
@@ -50,10 +50,10 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2",
-    "@backstage/core-app-api": "^1.12.3",
-    "@backstage/dev-utils": "^1.0.30",
-    "@backstage/test-utils": "^1.5.3",
+    "@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/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",

diff --git a/plugins/core/common/package.json b/plugins/core/common/package.json
@@ -29,8 +29,8 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.21.6",
-    "@backstage/cli": "^0.26.2",
+    "@backstage/backend-common": "^0.24.0",
+    "@backstage/cli": "^0.27.0",
     "aws-sdk-client-mock": "^4.0.0"
   },
   "files": [
@@ -41,7 +41,7 @@
     "@aws-sdk/client-resource-explorer-2": "^3.511.0",
     "@aws-sdk/client-resource-groups-tagging-api": "^3.511.0",
     "@aws-sdk/types": "^3.511.0",
-    "@backstage/catalog-model": "^1.4.5",
+    "@backstage/catalog-model": "^1.6.0",
     "@backstage/config": "^1.2.0",
     "@backstage/integration-aws-node": "^0.1.12",
     "winston": "^3.11.0"