kiali: Upgrade backstage to 1.35.0 (#2508)

Signed-off-by: Alberto Gutierrez <[email protected]>

workspaces/kiali/.changeset/little-panthers-hide.md

@@ -0,0 +1,6 @@
+---
+'@backstage-community/plugin-kiali-backend': patch
+'@backstage-community/plugin-kiali': patch
+---
+
+Upgrade backstage to 1.35.0 and remove @spotify/prettier-config

workspaces/kiali/backstage.json

@@ -1 +1,3 @@
-{ "version": "1.32.2" }
+{
+  "version": "1.35.0"
+}

workspaces/kiali/package.json

@@ -37,12 +37,11 @@
     "directory": "workspaces/kiali"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.28.0",
+    "@backstage/cli": "^0.29.5",
     "@backstage/e2e-test-utils": "^0.1.1",
-    "@backstage/repo-tools": "^0.10.0",
+    "@backstage/repo-tools": "^0.12.1",
     "@changesets/cli": "^2.27.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@spotify/prettier-config": "^12.0.0",
     "@types/deep-freeze": "^0.1.5",
     "concurrently": "^8.2.2",
     "knip": "^5.27.4",
@@ -54,7 +53,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18"
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "lint-staged": {
     "*.{js,jsx,ts,tsx,mjs,cjs}": [
       "eslint --fix",

workspaces/kiali/packages/app/package.json

@@ -20,30 +20,30 @@
   },
   "dependencies": {
     "@backstage-community/plugin-kiali": "workspace:^",
-    "@backstage/app-defaults": "^1.5.12",
-    "@backstage/catalog-model": "^1.7.0",
-    "@backstage/cli": "^0.28.0",
-    "@backstage/core-app-api": "^1.15.1",
-    "@backstage/core-components": "^0.15.1",
-    "@backstage/core-plugin-api": "^1.10.0",
-    "@backstage/integration-react": "^1.2.0",
-    "@backstage/plugin-api-docs": "^0.11.11",
-    "@backstage/plugin-catalog": "^1.24.0",
-    "@backstage/plugin-catalog-common": "^1.1.0",
-    "@backstage/plugin-catalog-graph": "^0.4.11",
-    "@backstage/plugin-catalog-import": "^0.12.5",
-    "@backstage/plugin-catalog-react": "^1.14.0",
-    "@backstage/plugin-kubernetes": "^0.11.16",
-    "@backstage/plugin-org": "^0.6.31",
-    "@backstage/plugin-permission-react": "^0.4.27",
-    "@backstage/plugin-scaffolder": "^1.26.0",
-    "@backstage/plugin-search": "^1.4.18",
-    "@backstage/plugin-search-react": "^1.8.1",
-    "@backstage/plugin-techdocs": "^1.11.0",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.16",
-    "@backstage/plugin-techdocs-react": "^1.2.9",
-    "@backstage/plugin-user-settings": "^0.8.14",
-    "@backstage/theme": "^0.6.0",
+    "@backstage/app-defaults": "^1.5.16",
+    "@backstage/catalog-model": "^1.7.3",
+    "@backstage/cli": "^0.29.5",
+    "@backstage/core-app-api": "^1.15.4",
+    "@backstage/core-components": "^0.16.3",
+    "@backstage/core-plugin-api": "^1.10.3",
+    "@backstage/integration-react": "^1.2.3",
+    "@backstage/plugin-api-docs": "^0.12.3",
+    "@backstage/plugin-catalog": "^1.26.1",
+    "@backstage/plugin-catalog-common": "^1.1.3",
+    "@backstage/plugin-catalog-graph": "^0.4.15",
+    "@backstage/plugin-catalog-import": "^0.12.9",
+    "@backstage/plugin-catalog-react": "^1.15.1",
+    "@backstage/plugin-kubernetes": "^0.12.3",
+    "@backstage/plugin-org": "^0.6.35",
+    "@backstage/plugin-permission-react": "^0.4.30",
+    "@backstage/plugin-scaffolder": "^1.27.4",
+    "@backstage/plugin-search": "^1.4.22",
+    "@backstage/plugin-search-react": "^1.8.5",
+    "@backstage/plugin-techdocs": "^1.12.1",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.20",
+    "@backstage/plugin-techdocs-react": "^1.2.13",
+    "@backstage/plugin-user-settings": "^0.8.18",
+    "@backstage/theme": "^0.6.3",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "react": "^18.0.2",
@@ -52,7 +52,7 @@
     "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.7.0",
+    "@backstage/test-utils": "^1.7.4",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",

workspaces/kiali/packages/backend/package.json

@@ -22,36 +22,37 @@
   },
   "dependencies": {
     "@backstage-community/plugin-kiali-backend": "workspace:^",
-    "@backstage/backend-defaults": "^0.5.1",
-    "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.76",
-    "@backstage/plugin-auth-backend": "^0.23.1",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.2.1",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.1",
-    "@backstage/plugin-auth-node": "^0.5.3",
-    "@backstage/plugin-catalog-backend": "^1.27.0",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.1.2",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.1",
-    "@backstage/plugin-kubernetes-backend": "^0.18.7",
-    "@backstage/plugin-permission-backend": "^0.5.50",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.1",
-    "@backstage/plugin-permission-common": "^0.8.1",
-    "@backstage/plugin-permission-node": "^0.8.4",
-    "@backstage/plugin-proxy-backend": "^0.5.7",
-    "@backstage/plugin-scaffolder-backend": "^1.26.0",
-    "@backstage/plugin-search-backend": "^1.6.0",
-    "@backstage/plugin-search-backend-module-catalog": "^0.2.3",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.36",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.3.0",
-    "@backstage/plugin-search-backend-node": "^1.3.3",
-    "@backstage/plugin-techdocs-backend": "^1.11.0",
+    "@backstage/backend-defaults": "^0.7.0",
+    "@backstage/config": "^1.3.2",
+    "@backstage/plugin-app-backend": "^0.4.4",
+    "@backstage/plugin-auth-backend": "^0.24.2",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.2.4",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.4",
+    "@backstage/plugin-auth-node": "^0.5.6",
+    "@backstage/plugin-catalog-backend": "^1.30.0",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.1.6",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.4",
+    "@backstage/plugin-kubernetes-backend": "^0.19.2",
+    "@backstage/plugin-permission-backend": "^0.5.53",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.4",
+    "@backstage/plugin-permission-common": "^0.8.4",
+    "@backstage/plugin-permission-node": "^0.8.7",
+    "@backstage/plugin-proxy-backend": "^0.5.10",
+    "@backstage/plugin-scaffolder-backend": "^1.29.0",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.5.5",
+    "@backstage/plugin-search-backend": "^1.8.1",
+    "@backstage/plugin-search-backend-module-catalog": "^0.3.0",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.40",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.3.5",
+    "@backstage/plugin-search-backend-node": "^1.3.7",
+    "@backstage/plugin-techdocs-backend": "^1.11.5",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "node-gyp": "^10.0.0",
     "pg": "^8.11.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.28.0"
+    "@backstage/cli": "^0.29.5"
   },
   "files": [
     "dist"

workspaces/kiali/packages/backend/src/index.ts

@@ -18,10 +18,11 @@ import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-app-backend/alpha'));
-backend.add(import('@backstage/plugin-proxy-backend/alpha'));
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
+backend.add(import('@backstage/plugin-proxy-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 
 // auth plugin
 backend.add(import('@backstage/plugin-auth-backend'));
@@ -46,18 +47,18 @@ backend.add(
 );
 
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 // search engine
 // See https://backstage.io/docs/features/search/search-engines
-backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-pg'));
 
 // search collators
-backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 
 // kubernetes
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-kubernetes-backend'));
 
 // kiali
 backend.add(import('@backstage-community/plugin-kiali-backend'));

workspaces/kiali/plugins/kiali-backend/package.json

@@ -42,22 +42,22 @@
   },
   "configSchema": "config.d.ts",
   "dependencies": {
-    "@backstage/backend-defaults": "^0.5.0",
-    "@backstage/backend-plugin-api": "^1.0.0",
-    "@backstage/catalog-client": "^1.7.0",
-    "@backstage/catalog-model": "^1.7.0",
-    "@backstage/config": "^1.2.0",
-    "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-auth-node": "^0.5.2",
+    "@backstage/backend-defaults": "^0.7.0",
+    "@backstage/backend-plugin-api": "^1.1.1",
+    "@backstage/catalog-client": "^1.9.1",
+    "@backstage/catalog-model": "^1.7.3",
+    "@backstage/config": "^1.3.2",
+    "@backstage/errors": "^1.2.7",
+    "@backstage/plugin-auth-node": "^0.5.6",
     "axios": "^1.7.4",
     "express": "^4.18.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.0.0",
-    "@backstage/cli": "0.27.1",
+    "@backstage/backend-test-utils": "^1.2.1",
+    "@backstage/cli": "^0.29.5",
     "@types/express": "4.17.21",
     "@types/supertest": "2.0.16",
     "msw": "1.3.5",

workspaces/kiali/plugins/kiali-backend/src/clients/Auth.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import moment from 'moment';
-
 import { KialiDetails } from '../service/config';
 
 export const MILLISECONDS = 1000;

workspaces/kiali/plugins/kiali-backend/src/clients/KialiAPIConnector.test.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { mockServices } from '@backstage/backend-test-utils';
-
 import supported from '../kiali_supported.json';
 import { KIALI_CORE_VERSION, KialiApiImpl } from './KialiAPIConnector';
 

workspaces/kiali/plugins/kiali-backend/src/clients/KialiAPIConnector.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import type { LoggerService } from '@backstage/backend-plugin-api';
-
 import supported from '../kiali_supported.json';
 import { KialiDetails } from '../service/config';
 import { KialiFetcher, KialiValidations, ValidationCategory } from './fetch';

workspaces/kiali/plugins/kiali-backend/src/clients/fetch.test.ts

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 import { mockServices } from '@backstage/backend-test-utils';
-
 import { AxiosError } from 'axios';
-
 import { AuthStrategy } from './Auth';
 import { KialiFetcher, ValidationCategory } from './fetch';
 

workspaces/kiali/plugins/kiali-backend/src/clients/fetch.ts

@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { LoggerService } from '@backstage/backend-plugin-api';
-
-import axios, { AxiosError, AxiosRequestConfig } from 'axios';
-
 import fs from 'fs';
 import https from 'https';
-
+import type { LoggerService } from '@backstage/backend-plugin-api';
+import axios, { AxiosError, AxiosRequestConfig } from 'axios';
 import { KialiDetails } from '../service/config';
 import {
   AuthInfo,

workspaces/kiali/plugins/kiali-backend/src/plugin.ts

@@ -17,7 +17,6 @@ import {
   coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-
 import { createRouter } from './service/router';
 
 export const kialiPlugin = createBackendPlugin({