feat(deps): update to backstage 1.31 (janus-idp#2335)

* feat(deps): update to backstage 1.31 Signed-off-by: Paul Schultz <pschultz@pobox.com> * update todo items Signed-off-by: Paul Schultz <pschultz@pobox.com> * update yarn lockfile Signed-off-by: Paul Schultz <pschultz@pobox.com> * fix(rbac): make working rbac-backend with newer APIs (janus-idp#2359) * fix(rbac): make working rbac-backend with newer APIs Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> * fit(rbac): fix unit tests Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> * fix(rbac): fix lint Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> * fix(orchestrator): fix lint Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> * fix(rbac): update error type, when httpAuth is not availiable Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> --------- Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> * add changeset Signed-off-by: Paul Schultz <pschultz@pobox.com> --------- Signed-off-by: Paul Schultz <pschultz@pobox.com> Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com> Co-authored-by: Oleksandr Andriienko <oandriie@redhat.com>
04kash · Oct 23, 2024 · 32e6069 · 32e6069
1 parent d67a440
commit 32e6069
Show file tree

Hide file tree

Showing 94 changed files with 2,376 additions and 2,389 deletions.
diff --git a/.changeset/two-dots-trade.md b/.changeset/two-dots-trade.md
@@ -0,0 +1,49 @@
+---
+"@janus-idp/backstage-plugin-orchestrator-swf-editor-envelope": minor
+"@janus-idp/backstage-scaffolder-backend-module-annotator": minor
+"@janus-idp/backstage-plugin-analytics-provider-segment": minor
+"@janus-idp/backstage-plugin-openshift-image-registry": minor
+"@janus-idp/backstage-plugin-rbac-backend-module-test": minor
+"@janus-idp/backstage-plugin-analytics-module-matomo": minor
+"@janus-idp/backstage-plugin-orchestrator-form-react": minor
+"@janus-idp/backstage-plugin-orchestrator-form-api": minor
+"@janus-idp/backstage-plugin-orchestrator-backend": minor
+"@janus-idp/backstage-plugin-bulk-import-backend": minor
+"@janus-idp/backstage-plugin-orchestrator-common": minor
+"@janus-idp/backstage-plugin-bulk-import-common": minor
+"@janus-idp/backstage-scaffolder-backend-module-kubernetes": minor
+"@janus-idp/backstage-plugin-lightspeed-backend": minor
+"@janus-idp/backstage-scaffolder-backend-module-servicenow": minor
+"@janus-idp/backstage-plugin-jfrog-artifactory": minor
+"@janus-idp/backstage-scaffolder-backend-module-sonarqube": minor
+"@janus-idp/backstage-plugin-keycloak-backend": minor
+"@janus-idp/backstage-plugin-topology-common": minor
+"@janus-idp/backstage-plugin-audit-log-node": minor
+"@janus-idp/backstage-plugin-matomo-backend": minor
+"@janus-idp/backstage-plugin-kiali-backend": minor
+"@janus-idp/backstage-scaffolder-backend-module-regex": minor
+"@janus-idp/backstage-plugin-tekton-common": minor
+"@janus-idp/backstage-plugin-orchestrator": minor
+"@janus-idp/backstage-scaffolder-backend-module-quay": minor
+"@janus-idp/backstage-plugin-rbac-backend": minor
+"@janus-idp/shared-react": minor
+"@janus-idp/backstage-plugin-web-terminal": minor
+"@janus-idp/backstage-plugin-aap-backend": minor
+"@janus-idp/backstage-plugin-bulk-import": minor
+"@janus-idp/backstage-plugin-ocm-backend": minor
+"@janus-idp/backstage-plugin-quay-common": minor
+"@janus-idp/backstage-plugin-rbac-common": minor
+"@janus-idp/backstage-plugin-lightspeed": minor
+"@janus-idp/backstage-plugin-ocm-common": minor
+"@janus-idp/backstage-plugin-rbac-node": minor
+"@janus-idp/backstage-plugin-topology": minor
+"@janus-idp/backstage-plugin-matomo": minor
+"@janus-idp/backstage-plugin-tekton": minor
+"@janus-idp/backstage-plugin-kiali": minor
+"@janus-idp/cli": minor
+"@janus-idp/backstage-plugin-quay": minor
+"@janus-idp/backstage-plugin-rbac": minor
+"@janus-idp/backstage-plugin-ocm": minor
+---
+
+feat(deps): update to backstage 1.31
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.29.2"
+  "version": "1.31.3"
 }
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "0.26.11",
+    "@backstage/cli": "0.27.1",
     "@ianvs/prettier-plugin-sort-imports": "4.2.1",
     "@janus-idp/cli": "*",
     "@spotify/prettier-config": "15.0.0",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -26,27 +26,27 @@
     "lint:fix": "backstage-cli package lint --fix"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.9",
-    "@backstage/catalog-model": "^1.5.0",
-    "@backstage/core-app-api": "^1.14.1",
-    "@backstage/core-components": "^0.14.9",
-    "@backstage/core-plugin-api": "^1.9.3",
-    "@backstage/integration-react": "^1.1.29",
-    "@backstage/plugin-api-docs": "^0.11.7",
-    "@backstage/plugin-catalog": "^1.21.1",
-    "@backstage/plugin-catalog-common": "^1.0.25",
-    "@backstage/plugin-catalog-graph": "^0.4.7",
-    "@backstage/plugin-catalog-import": "^0.12.1",
-    "@backstage/plugin-catalog-react": "^1.12.2",
-    "@backstage/plugin-org": "^0.6.27",
-    "@backstage/plugin-permission-react": "^0.4.24",
-    "@backstage/plugin-scaffolder": "^1.23.0",
-    "@backstage/plugin-search": "^1.4.14",
-    "@backstage/plugin-search-react": "^1.7.13",
-    "@backstage/plugin-techdocs": "^1.10.7",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.12",
-    "@backstage/plugin-techdocs-react": "^1.2.6",
-    "@backstage/plugin-user-settings": "^0.8.10",
+    "@backstage/app-defaults": "^1.5.11",
+    "@backstage/catalog-model": "^1.7.0",
+    "@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.32",
+    "@backstage/plugin-api-docs": "^0.11.10",
+    "@backstage/plugin-catalog": "^1.23.1",
+    "@backstage/plugin-catalog-common": "^1.1.0",
+    "@backstage/plugin-catalog-graph": "^0.4.10",
+    "@backstage/plugin-catalog-import": "^0.12.4",
+    "@backstage/plugin-catalog-react": "^1.13.1",
+    "@backstage/plugin-org": "^0.6.30",
+    "@backstage/plugin-permission-react": "^0.4.26",
+    "@backstage/plugin-scaffolder": "^1.25.1",
+    "@backstage/plugin-search": "^1.4.17",
+    "@backstage/plugin-search-react": "^1.8.0",
+    "@backstage/plugin-techdocs": "^1.10.10",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.15",
+    "@backstage/plugin-techdocs-react": "^1.2.8",
+    "@backstage/plugin-user-settings": "^0.8.13",
     "@emotion/react": "^11.11.4",
     "@mui/icons-material": "^5.15.16",
     "@mui/material": "^5.15.16",
@@ -60,8 +60,8 @@
   },
   "devDependencies": {
     "prettier": "3.3.3",
-    "@backstage/cli": "0.26.11",
-    "@backstage/test-utils": "1.5.9",
+    "@backstage/cli": "0.27.1",
+    "@backstage/test-utils": "1.6.0",
     "@testing-library/dom": "9.3.4",
     "@testing-library/jest-dom": "6.4.8",
     "@testing-library/react": "14.3.1",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -19,33 +19,33 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
-    "@backstage/backend-app-api": "^0.8.0",
-    "@backstage/backend-defaults": "^0.4.1",
-    "@backstage/backend-dynamic-feature-service": "^0.2.15",
-    "@backstage/backend-plugin-api": "^0.7.0",
-    "@backstage/cli-node": "^0.2.7",
-    "@backstage/config-loader": "^1.8.1",
-    "@backstage/plugin-app-backend": "^0.3.71",
-    "@backstage/plugin-auth-backend": "^0.22.9",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.8",
-    "@backstage/plugin-catalog-backend": "^1.24.0",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.0.1",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.20",
-    "@backstage/plugin-proxy-backend": "^0.5.3",
-    "@backstage/plugin-scaffolder-backend": "^1.23.0",
-    "@backstage/plugin-search-backend": "^1.5.14",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.28",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.32",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.1.27",
-    "@backstage/plugin-techdocs-backend": "^1.10.9",
+    "@backstage/backend-app-api": "^1.0.0",
+    "@backstage/backend-defaults": "^0.5.0",
+    "@backstage/backend-dynamic-feature-service": "^0.4.1",
+    "@backstage/backend-plugin-api": "^1.0.0",
+    "@backstage/cli-node": "^0.2.8",
+    "@backstage/config-loader": "^1.9.1",
+    "@backstage/plugin-app-backend": "^0.3.75",
+    "@backstage/plugin-auth-backend": "^0.23.0",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.0",
+    "@backstage/plugin-catalog-backend": "^1.26.1",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.1.1",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.0",
+    "@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-techdocs-backend": "^1.10.13",
     "@janus-idp/backstage-plugin-rbac-backend": "*",
     "@manypkg/get-packages": "^1.1.3",
     "app": "*",
     "winston": "^3.11.0"
   },
   "devDependencies": {
     "prettier": "3.3.3",
-    "@backstage/cli": "0.26.11"
+    "@backstage/cli": "0.27.1"
   },
   "files": [
     "dist"

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -1,5 +1,5 @@
 import { createBackend } from '@backstage/backend-defaults';
-import { dynamicPluginsSchemasServiceFactory } from '@backstage/backend-dynamic-feature-service';
+import { dynamicPluginsSchemasServiceFactoryWithOptions } from '@backstage/backend-dynamic-feature-service';
 import { PackageRoles } from '@backstage/cli-node';
 
 import * as path from 'path';
@@ -9,7 +9,7 @@ import { customLogger } from './logger/customLogger';
 const backend = createBackend();
 
 backend.add(
-  dynamicPluginsSchemasServiceFactory({
+  dynamicPluginsSchemasServiceFactoryWithOptions({
     schemaLocator(pluginPackage) {
       const platform = PackageRoles.getRoleInfo(
         pluginPackage.manifest.backstage.role,
@@ -21,7 +21,7 @@ backend.add(
     },
   }),
 );
-backend.add(customLogger());
+backend.add(customLogger);
 
 backend.add(import('@backstage/plugin-app-backend/alpha'));
 backend.add(import('@backstage/plugin-proxy-backend/alpha'));

diff --git a/packages/backend/src/logger/customLogger.ts b/packages/backend/src/logger/customLogger.ts
@@ -1,7 +1,5 @@
-import {
-  createConfigSecretEnumerator,
-  WinstonLogger,
-} from '@backstage/backend-app-api';
+import { createConfigSecretEnumerator } from '@backstage/backend-defaults/rootConfig';
+import { WinstonLogger } from '@backstage/backend-defaults/rootLogger';
 import { DynamicPluginsSchemasService } from '@backstage/backend-dynamic-feature-service';
 import {
   coreServices,

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "@backstage/cli-common": "^0.1.14",
-    "@backstage/cli-node": "^0.2.7",
+    "@backstage/cli-node": "^0.2.8",
     "@backstage/config": "^1.2.0",
-    "@backstage/config-loader": "^1.8.1",
+    "@backstage/config-loader": "^1.9.1",
     "@backstage/errors": "^1.2.4",
-    "@backstage/eslint-plugin": "^0.1.8",
+    "@backstage/eslint-plugin": "^0.1.9",
     "@backstage/types": "^1.1.1",
     "@manypkg/get-packages": "^1.1.3",
     "@openshift/dynamic-plugin-sdk-webpack": "^3.0.0",
@@ -90,8 +90,8 @@
   },
   "devDependencies": {
     "prettier": "3.3.3",
-    "@backstage/cli": "0.26.11",
-    "@backstage/core-plugin-api": "1.9.3",
+    "@backstage/cli": "0.27.1",
+    "@backstage/core-plugin-api": "1.9.4",
     "@types/fs-extra": "9.0.13",
     "@types/mock-fs": "4.13.4",
     "@types/node": "18.19.34",

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "storybook",
+  "name": "storybook-tests",
   "version": "0.0.0",
   "license": "Apache-2.0",
   "private": true,
@@ -43,11 +43,11 @@
     "storybook-dark-mode": "^3.0.1"
   },
   "peerDependencies": {
-    "@backstage/cli": "^0.26.11",
-    "@backstage/core-app-api": "^1.14.1",
-    "@backstage/core-components": "^0.14.9",
-    "@backstage/core-plugin-api": "^1.9.3",
-    "@backstage/test-utils": "^1.5.9",
-    "@backstage/theme": "^0.5.6"
+    "@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/test-utils": "^1.6.0",
+    "@backstage/theme": "^0.5.7"
   }
 }
diff --git a/plugins/aap-backend/dist-dynamic/package.json b/plugins/aap-backend/dist-dynamic/package.json
@@ -9,7 +9,7 @@
   },
   "backstage": {
     "role": "backend-plugin-module",
-    "supported-versions": "1.28.4",
+    "supported-versions": "1.31.3",
     "pluginId": "catalog",
     "pluginPackage": "@backstage/plugin-catalog-backend"
   },
@@ -48,10 +48,10 @@
   "author": "Red Hat",
   "bundleDependencies": true,
   "peerDependencies": {
-    "@backstage/backend-plugin-api": "^0.7.0",
-    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/backend-plugin-api": "^1.0.0",
+    "@backstage/catalog-model": "^1.7.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-catalog-node": "^1.12.4"
+    "@backstage/plugin-catalog-node": "^1.13.0"
   },
   "overrides": {
     "@aws-sdk/util-utf8-browser": {

diff --git a/plugins/aap-backend/package.json b/plugins/aap-backend/package.json
@@ -9,7 +9,7 @@
   },
   "backstage": {
     "role": "backend-plugin-module",
-    "supported-versions": "1.28.4",
+    "supported-versions": "1.31.3",
     "pluginId": "catalog",
     "pluginPackage": "@backstage/plugin-catalog-backend"
   },
@@ -40,18 +40,18 @@
     "prettier:fix": "prettier --ignore-unknown --write ."
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "^0.7.0",
-    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/backend-plugin-api": "^1.0.0",
+    "@backstage/catalog-model": "^1.7.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-catalog-node": "^1.12.4"
+    "@backstage/plugin-catalog-node": "^1.13.0"
   },
   "devDependencies": {
     "prettier": "3.3.3",
-    "@backstage/backend-defaults": "0.4.1",
+    "@backstage/backend-defaults": "0.5.0",
     "@backstage/config": "1.2.0",
-    "@backstage/backend-test-utils": "0.4.4",
-    "@backstage/cli": "0.26.11",
-    "@backstage/plugin-catalog-backend": "1.24.0",
+    "@backstage/backend-test-utils": "1.0.0",
+    "@backstage/cli": "0.27.1",
+    "@backstage/plugin-catalog-backend": "1.26.1",
     "@janus-idp/cli": "1.15.2",
     "@types/supertest": "2.0.16",
     "msw": "1.3.3",

diff --git a/plugins/analytics-module-matomo/package.json b/plugins/analytics-module-matomo/package.json
@@ -11,7 +11,7 @@
   },
   "backstage": {
     "role": "frontend-plugin",
-    "supported-versions": "1.28.4",
+    "supported-versions": "1.31.3",
     "pluginId": "analytics-module-matomo",
     "pluginPackage": "@janus-idp/backstage-plugin-analytics-module-matomo",
     "pluginPackages": [
@@ -34,17 +34,17 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-plugin-api": "^1.9.3"
+    "@backstage/core-plugin-api": "^1.9.4"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
     "prettier": "3.3.3",
-    "@backstage/cli": "0.26.11",
-    "@backstage/core-app-api": "1.14.1",
-    "@backstage/dev-utils": "1.0.36",
-    "@backstage/test-utils": "1.5.9",
+    "@backstage/cli": "0.27.1",
+    "@backstage/core-app-api": "1.15.0",
+    "@backstage/dev-utils": "1.1.1",
+    "@backstage/test-utils": "1.6.0",
     "@janus-idp/cli": "1.15.2",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.4.8",

diff --git a/plugins/analytics-provider-segment/package.json b/plugins/analytics-provider-segment/package.json
@@ -11,7 +11,7 @@
   },
   "backstage": {
     "role": "frontend-plugin",
-    "supported-versions": "1.28.4",
+    "supported-versions": "1.31.3",
     "pluginId": "analytics-provider-segment",
     "pluginPackage": "@janus-idp/backstage-plugin-analytics-provider-segment",
     "pluginPackages": [
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@backstage/config": "^1.2.0",
-    "@backstage/core-components": "^0.14.9",
-    "@backstage/core-plugin-api": "^1.9.3",
-    "@backstage/theme": "^0.5.6",
+    "@backstage/core-components": "^0.15.0",
+    "@backstage/core-plugin-api": "^1.9.4",
+    "@backstage/theme": "^0.5.7",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "4.0.0-alpha.61",
@@ -52,10 +52,10 @@
   },
   "devDependencies": {
     "prettier": "3.3.3",
-    "@backstage/cli": "0.26.11",
-    "@backstage/core-app-api": "1.14.1",
-    "@backstage/dev-utils": "1.0.36",
-    "@backstage/test-utils": "1.5.9",
+    "@backstage/cli": "0.27.1",
+    "@backstage/core-app-api": "1.15.0",
+    "@backstage/dev-utils": "1.1.1",
+    "@backstage/test-utils": "1.6.0",
     "@janus-idp/cli": "1.15.2",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/dom": "9.3.4",