bump backstage version to 1.28.4 (#29)

Signed-off-by: Manabu McCloskey <[email protected]>
cnoe-io · Aug 2, 2024 · db5d40f · db5d40f
1 parent 6f1e176
commit db5d40f
Show file tree

Hide file tree

Showing 14 changed files with 26,791 additions and 26,837 deletions.
diff --git a/app-config.yaml b/app-config.yaml
@@ -72,7 +72,6 @@ auth:
         metadataUrl: https://cnoe.localtest.me:8443/keycloak/realms/cnoe/.well-known/openid-configuration
         clientId: backstage
         clientSecret: ${KEYCLOAK_CLIENT_SECRET}
-        scope: 'openid profile email groups'
         prompt: auto
 
 scaffolder:

diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.26.5"
+  "version": "1.28.4"
 }
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
+    "@backstage/cli": "^0.26.10",
     "@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
@@ -14,33 +14,31 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.4",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/core-components": "^0.14.6",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/integration-react": "^1.1.26",
-    "@backstage/plugin-api-docs": "^0.11.4",
-    "@backstage/plugin-catalog": "^1.19.0",
-    "@backstage/plugin-catalog-common": "^1.0.22",
-    "@backstage/plugin-catalog-graph": "^0.4.4",
-    "@backstage/plugin-catalog-import": "^0.10.10",
-    "@backstage/plugin-catalog-react": "^1.11.3",
-    "@backstage/plugin-github-actions": "^0.6.16",
-    "@backstage/plugin-home": "^0.7.3",
-    "@backstage/plugin-kubernetes": "^0.11.9",
-    "@backstage/plugin-org": "^0.6.24",
-    "@backstage/plugin-permission-react": "^0.4.22",
-    "@backstage/plugin-scaffolder": "^1.19.3",
-    "@backstage/plugin-search": "^1.4.10",
-    "@backstage/plugin-search-react": "^1.7.10",
-    "@backstage/plugin-tech-radar": "^0.7.4",
-    "@backstage/plugin-techdocs": "^1.10.4",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.9",
-    "@backstage/plugin-techdocs-react": "^1.2.3",
-    "@backstage/plugin-user-settings": "^0.8.5",
-    "@backstage/theme": "^0.5.3",
+    "@backstage/app-defaults": "^1.5.7",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/core-app-api": "^1.13.0",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/integration-react": "^1.1.28",
+    "@backstage/plugin-api-docs": "^0.11.6",
+    "@backstage/plugin-catalog": "^1.21.0",
+    "@backstage/plugin-catalog-common": "^1.0.24",
+    "@backstage/plugin-catalog-graph": "^0.4.6",
+    "@backstage/plugin-catalog-import": "^0.12.0",
+    "@backstage/plugin-catalog-react": "^1.12.1",
+    "@backstage/plugin-home": "^0.7.6",
+    "@backstage/plugin-kubernetes": "^0.11.11",
+    "@backstage/plugin-org": "^0.6.26",
+    "@backstage/plugin-permission-react": "^0.4.23",
+    "@backstage/plugin-scaffolder": "^1.22.0",
+    "@backstage/plugin-search": "^1.4.13",
+    "@backstage/plugin-search-react": "^1.7.12",
+    "@backstage/plugin-techdocs": "^1.10.6",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.11",
+    "@backstage/plugin-techdocs-react": "^1.2.5",
+    "@backstage/plugin-user-settings": "^0.8.8",
+    "@backstage/theme": "^0.5.6",
     "@internal/plugin-apache-spark": "^0.1.0",
     "@internal/plugin-argo-workflows": "^0.1.0",
     "@internal/plugin-cnoe-ui": "^0.1.0",
@@ -53,10 +51,12 @@
     "react-dom": "^18.0.2",
     "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0",
-    "react-use": "^17.2.4"
+    "react-use": "^17.2.4",
+    "@backstage-community/plugin-github-actions": "^0.6.16",
+    "@backstage-community/plugin-tech-radar": "^0.7.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/test-utils": "^1.5.7",
     "@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/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -31,7 +31,7 @@ import {
 import {
   isGithubActionsAvailable,
   EntityGithubActionsContent,
-} from '@backstage/plugin-github-actions';
+} from '@backstage-community/plugin-github-actions';
 import {
   EntityUserProfileCard,
   EntityGroupProfileCard,

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,41 +16,41 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.7",
-    "@backstage/backend-defaults": "^0.2.18",
-    "@backstage/backend-plugin-api": "^0.6.18",
-    "@backstage/backend-tasks": "^0.5.22",
-    "@backstage/catalog-client": "^1.6.4",
-    "@backstage/catalog-model": "^1.4.5",
+    "@backstage/backend-common": "^0.23.2",
+    "@backstage/backend-defaults": "^0.4.0",
+    "@backstage/backend-plugin-api": "^0.7.0",
+    "@backstage/backend-tasks": "^0.5.26",
+    "@backstage/catalog-client": "^1.6.5",
+    "@backstage/catalog-model": "^1.5.0",
     "@backstage/config": "^1.2.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/integration": "^1.10.0",
-    "@backstage/plugin-app-backend": "^0.3.65",
-    "@backstage/plugin-auth-backend": "^0.22.5",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4",
-    "@backstage/plugin-auth-backend-module-oidc-provider": "^0.1.9",
-    "@backstage/plugin-auth-node": "^0.4.12",
-    "@backstage/plugin-catalog-backend": "^1.21.1",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.15",
-    "@backstage/plugin-kubernetes-backend": "^0.17.0",
-    "@backstage/plugin-permission-common": "^0.7.13",
-    "@backstage/plugin-permission-node": "^0.7.28",
-    "@backstage/plugin-proxy-backend": "^0.4.15",
-    "@backstage/plugin-scaffolder-backend": "^1.22.5",
-    "@backstage/plugin-scaffolder-backend-module-gitea": "^0.1.8",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.2.8",
-    "@backstage/plugin-scaffolder-node": "^0.4.4",
-    "@backstage/plugin-search-backend": "^1.5.7",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.23",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.26",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.1.22",
-    "@backstage/plugin-search-backend-node": "^1.2.21",
-    "@backstage/plugin-techdocs-backend": "^1.10.4",
+    "@backstage/integration": "^1.12.0",
+    "@backstage/plugin-app-backend": "^0.3.70",
+    "@backstage/plugin-auth-backend": "^0.22.8",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.7",
+    "@backstage/plugin-auth-backend-module-oidc-provider": "^0.2.2",
+    "@backstage/plugin-auth-node": "^0.4.16",
+    "@backstage/plugin-catalog-backend": "^1.23.2",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.19",
+    "@backstage/plugin-kubernetes-backend": "^0.18.2",
+    "@backstage/plugin-permission-common": "^0.8.0",
+    "@backstage/plugin-permission-node": "^0.8.0",
+    "@backstage/plugin-proxy-backend": "^0.5.2",
+    "@backstage/plugin-scaffolder-backend": "^1.22.11",
+    "@backstage/plugin-scaffolder-backend-module-gitea": "^0.1.11",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.4.0",
+    "@backstage/plugin-scaffolder-node": "^0.4.7",
+    "@backstage/plugin-search-backend": "^1.5.13",
+    "@backstage/plugin-search-backend-module-catalog": "^0.1.27",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.31",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.1.26",
+    "@backstage/plugin-search-backend-node": "^1.2.26",
+    "@backstage/plugin-techdocs-backend": "^1.10.8",
     "@backstage/types": "^1.1.1",
+    "@internal/backstage-plugin-terraform-backend": "^0.1.0",
     "@kubernetes/client-node": "~0.20.0",
     "@roadiehq/backstage-plugin-argo-cd-backend": "3.0.2",
     "@roadiehq/scaffolder-backend-module-utils": "^1.17.0",
-    "@internal/backstage-plugin-terraform-backend": "^0.1.0",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",
@@ -62,7 +62,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
+    "@backstage/cli": "^0.26.10",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

diff --git a/packages/backend/src/plugins/auth.ts b/packages/backend/src/plugins/auth.ts
@@ -43,6 +43,7 @@ export const authModuleKeycloakOIDCProvider = createBackendModule({
                   'Login failed, user profile does not contain a valid name',
                 );
               }
+              // should use users from catalog
               const userRef = stringifyEntityRef({
                 kind: 'User',
                 name: info.profile.displayName!,

diff --git a/plugins/apache-spark/package.json b/plugins/apache-spark/package.json
@@ -24,9 +24,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.14.6",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/theme": "^0.5.3",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/theme": "^0.5.6",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,10 +36,10 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/dev-utils": "^1.0.31",
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/core-app-api": "^1.13.0",
+    "@backstage/dev-utils": "^1.0.34",
+    "@backstage/test-utils": "^1.5.7",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",

diff --git a/plugins/argo-workflows/package.json b/plugins/argo-workflows/package.json
@@ -24,9 +24,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.14.6",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/theme": "^0.5.3",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/theme": "^0.5.6",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,10 +36,10 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/dev-utils": "^1.0.31",
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/core-app-api": "^1.13.0",
+    "@backstage/dev-utils": "^1.0.34",
+    "@backstage/test-utils": "^1.5.7",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",

diff --git a/plugins/cnoe-ui/package.json b/plugins/cnoe-ui/package.json
@@ -24,9 +24,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.14.6",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/theme": "^0.5.3",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.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",
@@ -36,10 +36,10 @@
     "react": "^17.0.0 || ^18.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/dev-utils": "^1.0.31",
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/core-app-api": "^1.13.0",
+    "@backstage/dev-utils": "^1.0.34",
+    "@backstage/test-utils": "^1.5.7",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",

diff --git a/plugins/terraform-backend/package.json b/plugins/terraform-backend/package.json
@@ -23,9 +23,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.22.0",
-    "@backstage/backend-defaults": "^0.2.18",
-    "@backstage/backend-plugin-api": "^0.6.18",
+    "@backstage/backend-common": "^0.23.2",
+    "@backstage/backend-defaults": "^0.4.0",
+    "@backstage/backend-plugin-api": "^0.7.0",
     "@backstage/config": "^1.2.0",
     "@types/express": "*",
     "express": "^4.17.1",
@@ -36,9 +36,9 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/plugin-auth-backend": "^0.22.5",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/plugin-auth-backend": "^0.22.8",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.7",
     "@types/supertest": "^2.0.12",
     "msw": "^1.0.0",
     "supertest": "^6.2.4"

diff --git a/plugins/terraform/package.json b/plugins/terraform/package.json
@@ -36,10 +36,10 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.6",
-    "@backstage/dev-utils": "^1.0.26",
-    "@backstage/test-utils": "^1.4.7",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/core-app-api": "^1.13.0",
+    "@backstage/dev-utils": "^1.0.34",
+    "@backstage/test-utils": "^1.5.7",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",