update backstage
Some checks are pending
Create and publish a Docker image / docker (push) Waiting to run

This commit is contained in:
Christopher Hase 2025-02-25 15:36:24 +01:00
parent 1632253c86
commit ebfaf0a663
10 changed files with 4932 additions and 2984 deletions

View file

@ -86,7 +86,7 @@ WORKDIR /app
COPY --from=build --chown=node:node /app/yarn.lock /app/package.json /app/packages/backend/dist/skeleton/ ./
RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
yarn install --production --network-timeout 600000
yarn install --ignore-engines --production --network-timeout 600000
#yarn install --frozen-lockfile --production --network-timeout 600000

View file

@ -1,3 +1,3 @@
{
"version": "1.28.4"
"version": "1.36.1"
}

View file

@ -31,7 +31,7 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.26.10",
"@backstage/cli": "^0.30.0",
"@backstage/e2e-test-utils": "^0.1.1",
"@playwright/test": "^1.32.3",
"@spotify/prettier-config": "^12.0.0",

View file

@ -16,31 +16,31 @@
"dependencies": {
"@backstage-community/plugin-github-actions": "^0.6.16",
"@backstage-community/plugin-tech-radar": "^0.7.4",
"@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",
"@backstage/app-defaults": "^1.5.17",
"@backstage/catalog-model": "^1.7.3",
"@backstage/cli": "^0.30.0",
"@backstage/core-app-api": "^1.15.5",
"@backstage/core-components": "^0.16.4",
"@backstage/core-plugin-api": "^1.10.4",
"@backstage/integration-react": "^1.2.4",
"@backstage/plugin-api-docs": "^0.12.4",
"@backstage/plugin-catalog": "^1.27.0",
"@backstage/plugin-catalog-common": "^1.1.3",
"@backstage/plugin-catalog-graph": "^0.4.16",
"@backstage/plugin-catalog-import": "^0.12.10",
"@backstage/plugin-catalog-react": "^1.15.2",
"@backstage/plugin-home": "^0.8.5",
"@backstage/plugin-kubernetes": "^0.12.4",
"@backstage/plugin-org": "^0.6.36",
"@backstage/plugin-permission-react": "^0.4.31",
"@backstage/plugin-scaffolder": "^1.28.0",
"@backstage/plugin-search": "^1.4.23",
"@backstage/plugin-search-react": "^1.8.6",
"@backstage/plugin-techdocs": "^1.12.3",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21",
"@backstage/plugin-techdocs-react": "^1.2.14",
"@backstage/plugin-user-settings": "^0.8.19",
"@backstage/theme": "^0.6.4",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@roadiehq/backstage-plugin-argo-cd": "^2.5.1",
@ -52,7 +52,7 @@
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.5.7",
"@backstage/test-utils": "^1.7.5",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^9.0.0",
"@testing-library/jest-dom": "^6.0.0",

View file

@ -16,37 +16,37 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@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.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",
"@backstage/backend-common": "^0.25.0",
"@backstage/backend-defaults": "^0.8.1",
"@backstage/backend-plugin-api": "^1.2.0",
"@backstage/backend-tasks": "^0.6.1",
"@backstage/catalog-client": "^1.9.1",
"@backstage/catalog-model": "^1.7.3",
"@backstage/config": "^1.3.2",
"@backstage/errors": "^1.2.7",
"@backstage/integration": "^1.16.1",
"@backstage/plugin-app-backend": "^0.4.5",
"@backstage/plugin-auth-backend": "^0.24.3",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5",
"@backstage/plugin-auth-backend-module-oidc-provider": "^0.4.0",
"@backstage/plugin-auth-node": "^0.6.0",
"@backstage/plugin-catalog-backend": "^1.31.0",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.5",
"@backstage/plugin-kubernetes-backend": "^0.19.3",
"@backstage/plugin-permission-common": "^0.8.4",
"@backstage/plugin-permission-node": "^0.8.8",
"@backstage/plugin-proxy-backend": "^0.5.11",
"@backstage/plugin-scaffolder-backend": "^1.30.0",
"@backstage/plugin-scaffolder-backend-module-gitea": "^0.2.6",
"@backstage/plugin-scaffolder-backend-module-github": "^0.6.0",
"@backstage/plugin-scaffolder-node": "^0.7.0",
"@backstage/plugin-search-backend": "^1.8.2",
"@backstage/plugin-search-backend-module-catalog": "^0.3.1",
"@backstage/plugin-search-backend-module-pg": "^0.5.41",
"@backstage/plugin-search-backend-module-techdocs": "^0.3.6",
"@backstage/plugin-search-backend-node": "^1.3.8",
"@backstage/plugin-techdocs-backend": "^1.11.6",
"@backstage/types": "^1.2.1",
"@kubernetes/client-node": "~0.20.0",
"@roadiehq/backstage-plugin-argo-cd-backend": "3.0.2",
"@roadiehq/scaffolder-backend-module-http-request": "^4.3.5",
@ -62,7 +62,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.26.10",
"@backstage/cli": "^0.30.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",

View file

@ -1,16 +1,24 @@
import { legacyPlugin } from '@backstage/backend-common';
//import { createBackend } from '@backstage/backend-defaults/dist';
import { createBackend } from '@backstage/backend-defaults';
//import { authModuleKeycloakOIDCProvider } from './plugins/auth';
import { cnoeScaffolderActions } from './plugins/scaffolder';
import { legacyPlugin } from '@backstage/backend-common';
const backend = createBackend();
// core plugins
backend.add(import('@backstage/plugin-app-backend/alpha'));
backend.add(import('@backstage/plugin-catalog-backend/alpha'));
backend.add(import('@backstage/plugin-proxy-backend/alpha'));
//backend.add(import('@backstage/plugin-app-backend/alpha'));
backend.add(import('@backstage/plugin-app-backend'));
//backend.add(import('@backstage/plugin-catalog-backend/dist/alpha'));
backend.add(import('@backstage/plugin-catalog-backend'));
//backend.add(import('@backstage/plugin-proxy-backend/dist/alpha'));
backend.add(import('@backstage/plugin-proxy-backend'));
backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
// auth plugins
//backend.add(import('@backstage/plugin-auth-backend/dist'));
backend.add(import('@backstage/plugin-auth-backend'));
backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
// scaffolder plugins
@ -21,10 +29,13 @@ backend.add(
backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
// search plugins
backend.add(import('@backstage/plugin-search-backend/alpha'));
backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
//backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
//backend.add(import('@backstage/plugin-search-backend-module-catalog/dist')); //TODO: correct?
backend.add(import('@backstage/plugin-search-backend-module-catalog'));
backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
// other @backstage plugins
backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
//backend.add(import('@backstage/plugin-kubernetes-backend/dist/alpha'));
backend.add(import('@backstage/plugin-kubernetes-backend'));
// non-core plugins
// roadie plugins
//backend.add(import('@roadiehq/scaffolder-backend-module-utils/new-backend')); //TODO: incompatible? why??
@ -35,6 +46,5 @@ backend.add(
// cnoe plugins
//backend.add(authModuleKeycloakOIDCProvider);
backend.add(cnoeScaffolderActions);
//backend.add(import('@internal/backstage-plugin-terraform-backend'));
backend.start();

View file

@ -5,7 +5,8 @@ import { Logger } from 'winston';
import { ArgoService } from '@roadiehq/backstage-plugin-argo-cd-backend';
import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';
//import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend'; //TODO: warum wird Fehler geworfen bei 'yarn run start-backend' ?
import createRouter from '@roadiehq/backstage-plugin-argo-cd-backend';
import { PluginEnvironment } from '../types';
export default async function createPlugin({

View file

@ -5,9 +5,9 @@ import {
PluginDatabaseManager,
PluginEndpointDiscovery,
TokenManager,
UrlReader,
} from '@backstage/backend-common';
import { PluginTaskScheduler } from '@backstage/backend-tasks';
//UrlReader,
} from '@backstage/backend-common/dist'; //TODO: deprecated
import { PluginTaskScheduler } from '@backstage/backend-tasks/dist';
import { PermissionEvaluator } from '@backstage/plugin-permission-common';
import { IdentityApi } from '@backstage/plugin-auth-node';
@ -16,7 +16,7 @@ export type PluginEnvironment = {
database: PluginDatabaseManager;
cache: PluginCacheManager;
config: Config;
reader: UrlReader;
//reader: UrlReader;
discovery: PluginEndpointDiscovery;
tokenManager: TokenManager;
scheduler: PluginTaskScheduler;

View file

@ -6,6 +6,7 @@
"exclude": ["node_modules"],
"compilerOptions": {
"outDir": "dist-types",
"rootDir": "."
"rootDir": ".",
"skipLibCheck": true
}
}

7756
yarn.lock

File diff suppressed because it is too large Load diff