Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Backstage 1.25 #403

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Upgrade to Backstage 1.25 #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b2a949
Version bump
taras Apr 22, 2024
39c37e4
Fix the API provided by unprocessed entities
taras Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .changeset/odd-masks-begin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
'@frontside/backstage-plugin-graphql-backend-module-catalog': patch
'@frontside/backstage-plugin-incremental-ingestion-backend': patch
'@frontside/backstage-plugin-incremental-ingestion-github': patch
'@frontside/backstage-plugin-scaffolder-workflow': patch
'@frontside/backstage-plugin-effection-inspector-backend': patch
'@frontside/scaffolder-yaml-actions': patch
'@frontside/backstage-plugin-graphql-backend-node': patch
'@frontside/backstage-plugin-effection-inspector': patch
'@frontside/backstage-plugin-humanitec-backend': patch
'@frontside/backstage-ingestion-tests': patch
'@frontside/backstage-plugin-humanitec-common': patch
'@frontside/backstage-plugin-graphql-backend': patch
'@frontside/backstage-plugin-batch-loader': patch
'@internal/plugin-healthcheck': patch
'@frontside/backstage-plugin-humanitec': patch
'backend': patch
'app': patch
---

Upgraded to Backstage 1.25
2 changes: 1 addition & 1 deletion backstage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.20.3"
"version": "1.26.3"
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/cli": "^0.26.4",
"@changesets/cli": "^2.22.0",
"@spotify/prettier-config": "^12.0.0",
"concurrently": "^7.5.0",
Expand Down
56 changes: 28 additions & 28 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,29 @@
},
"bundled": true,
"dependencies": {
"@backstage/app-defaults": "^1.4.5",
"@backstage/catalog-model": "^1.4.3",
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.11.1",
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/integration-react": "^1.1.21",
"@backstage/plugin-api-docs": "^0.11.0",
"@backstage/plugin-catalog": "^1.15.1",
"@backstage/plugin-catalog-graph": "^0.4.0",
"@backstage/plugin-catalog-import": "^0.10.3",
"@backstage/plugin-catalog-react": "^1.9.1",
"@backstage/plugin-catalog-unprocessed-entities": "^0.1.5",
"@backstage/plugin-github-actions": "^0.6.8",
"@backstage/plugin-graphiql": "^0.3.0",
"@backstage/plugin-org": "^0.6.17",
"@backstage/plugin-scaffolder": "^1.16.1",
"@backstage/plugin-scaffolder-react": "^1.6.1",
"@backstage/plugin-search": "^1.4.3",
"@backstage/plugin-search-react": "^1.7.3",
"@backstage/plugin-tech-radar": "^0.6.10",
"@backstage/plugin-techdocs": "^1.9.1",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.2",
"@backstage/plugin-techdocs-react": "^1.1.13",
"@backstage/plugin-user-settings": "^0.8.1",
"@backstage/theme": "^0.5.1",
"@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.4",
"@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-graph": "^0.4.4",
"@backstage/plugin-catalog-import": "^0.10.10",
"@backstage/plugin-catalog-react": "^1.11.3",
"@backstage/plugin-catalog-unprocessed-entities": "^0.2.3",
"@backstage/plugin-org": "^0.6.24",
"@backstage/plugin-scaffolder": "^1.19.3",
"@backstage/plugin-scaffolder-react": "^1.8.4",
"@backstage/plugin-search": "^1.4.10",
"@backstage/plugin-search-react": "^1.7.10",
"@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/types": "^1.1.1",
"@frontside/backstage-plugin-effection-inspector": "^0.1.12",
"@frontside/backstage-plugin-humanitec": "^0.3.15",
Expand All @@ -47,10 +44,13 @@
"react-dom": "^18.2.0",
"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-graphiql": "^0.3.8",
"@backstage-community/plugin-tech-radar": "^0.7.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.5.0",
"@backstage/test-utils": "^1.5.4",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import { scaffolderPlugin } from '@backstage/plugin-scaffolder';
import { ScaffolderPage } from '@backstage/plugin-scaffolder';
import { SearchPage } from '@backstage/plugin-search';
import { TechRadarPage } from '@backstage/plugin-tech-radar';
import { TechRadarPage } from '@backstage-community/plugin-tech-radar';
import {
DefaultTechDocsHome,
TechDocsIndexPage,
Expand All @@ -36,7 +36,7 @@ import { createApp } from '@backstage/app-defaults';
import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
import { orgPlugin } from '@backstage/plugin-org';
import { InspectorPage } from '@frontside/backstage-plugin-effection-inspector';
import { GraphiQLPage } from '@backstage/plugin-graphiql';
import { GraphiQLPage } from '@backstage-community/plugin-graphiql';

import { SignInPage } from '@backstage/core-components';
import { auth0AuthApiRef } from './internal';
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/apis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import {
graphQlBrowseApiRef,
GraphQLEndpoints,
} from '@backstage/plugin-graphiql';
} from '@backstage-community/plugin-graphiql';
import { OAuth2 } from '@backstage/core-app-api';
import { auth0AuthApiRef } from './internal';

Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/Root/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { NavLink } from 'react-router-dom';
import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
import { SidebarSearchModal } from '@backstage/plugin-search'
import { SearchContextProvider } from '@backstage/plugin-search-react';
import { GraphiQLIcon } from '@backstage/plugin-graphiql';
import { GraphiQLIcon } from '@backstage-community/plugin-graphiql';
import {
Sidebar,
SidebarPage,
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/catalog/EntityPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import { EntityCatalogGraphCard } from '@backstage/plugin-catalog-graph';
import {
isGithubActionsAvailable,
EntityGithubActionsContent,
} from '@backstage/plugin-github-actions';
} from '@backstage-community/plugin-github-actions';
import {
EntityUserProfileCard,
EntityGroupProfileCard,
Expand Down
48 changes: 24 additions & 24 deletions packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@
"migrate:create": "knex migrate:make -x ts"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-tasks": "^0.5.12",
"@backstage/catalog-client": "^1.4.6",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/errors": "^1.2.3",
"@backstage/integration": "^1.7.2",
"@backstage/plugin-app-backend": "^0.3.55",
"@backstage/plugin-auth-backend": "^0.21.3",
"@backstage/plugin-auth-node": "^0.4.1",
"@backstage/plugin-catalog-backend": "^1.15.0",
"@backstage/plugin-catalog-backend-module-github": "^0.5.3",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.4",
"@backstage/plugin-catalog-graph": "^0.4.0",
"@backstage/plugin-permission-common": "^0.7.10",
"@backstage/plugin-permission-node": "^0.7.18",
"@backstage/plugin-proxy-backend": "^0.4.5",
"@backstage/plugin-scaffolder-backend": "^1.19.1",
"@backstage/plugin-scaffolder-node": "^0.3.3",
"@backstage/plugin-search-backend": "^1.4.7",
"@backstage/plugin-search-backend-module-pg": "^0.5.16",
"@backstage/plugin-search-backend-node": "^1.2.11",
"@backstage/plugin-techdocs-backend": "^1.9.0",
"@backstage/backend-common": "^0.21.7",
"@backstage/backend-tasks": "^0.5.22",
"@backstage/catalog-client": "^1.6.4",
"@backstage/catalog-model": "^1.4.5",
"@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.4",
"@backstage/plugin-auth-node": "^0.4.12",
"@backstage/plugin-catalog-backend": "^1.21.1",
"@backstage/plugin-catalog-backend-module-github": "^0.6.0",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.4.4",
"@backstage/plugin-catalog-graph": "^0.4.4",
"@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.4",
"@backstage/plugin-scaffolder-node": "^0.4.3",
"@backstage/plugin-search-backend": "^1.5.7",
"@backstage/plugin-search-backend-module-pg": "^0.5.26",
"@backstage/plugin-search-backend-node": "^1.2.21",
"@backstage/plugin-techdocs-backend": "^1.10.4",
"@frontside/backstage-plugin-batch-loader": "0.4.1",
"@frontside/backstage-plugin-effection-inspector-backend": "0.1.12",
"@frontside/backstage-plugin-graphql-backend": "^0.1.8",
Expand Down Expand Up @@ -71,7 +71,7 @@
"zod": "^3.21.4"
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/cli": "^0.26.4",
"@octokit/types": "^6.34.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
Expand Down
10 changes: 7 additions & 3 deletions packages/backend/src/plugins/catalog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { PluginEnvironment } from '../types';
export default async function createPlugin(
env: PluginEnvironment,
): Promise<Router> {
const { discovery, permissions } = env;

const builder = CatalogBuilder.create(env);

// incremental builder receives builder because it'll register
Expand All @@ -25,10 +27,12 @@ export default async function createPlugin(
// before incremental builder migrations are executed
await incrementalBuilder.build();

const unprocessed = new UnprocessedEntitiesModule(
await env.database.getClient(),
const unprocessed = UnprocessedEntitiesModule.create({
database: await env.database.getClient(),
router,
);
discovery,
permissions,
});

unprocessed.registerRoutes();

Expand Down
10 changes: 5 additions & 5 deletions packages/ingestion-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"role": "common-library"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/catalog-client": "^1.4.6",
"@backstage/cli": "^0.25.2",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.7.2",
"@backstage/backend-common": "^0.21.7",
"@backstage/catalog-client": "^1.6.4",
"@backstage/cli": "^0.26.4",
"@backstage/config": "^1.2.0",
"@backstage/integration": "^1.10.0",
"@effection/process": "^2.0.4",
"@effection/vitest": "^2.1.0",
"@frontside/graphgen": "^1.6.0",
Expand Down
14 changes: 7 additions & 7 deletions plugins/batch-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"clean": "backstage-cli clean"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/catalog-model": "^1.4.3",
"@backstage/backend-common": "^0.21.7",
"@backstage/catalog-model": "^1.4.5",
"knex": "^3.0.1",
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.7.2",
"@backstage/plugin-catalog-backend": "^1.15.0",
"@backstage/plugin-permission-node": "^0.7.18",
"@backstage/cli": "^0.26.4",
"@backstage/config": "^1.2.0",
"@backstage/integration": "^1.10.0",
"@backstage/plugin-catalog-backend": "^1.21.1",
"@backstage/plugin-permission-node": "^0.7.28",
"@effection/jest": "^2.0.4",
"effection": "^2.0.6",
"jest": "^29.2.2"
Expand Down
6 changes: 3 additions & 3 deletions plugins/effection-inspector-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/config": "^1.1.1",
"@backstage/backend-common": "^0.21.7",
"@backstage/config": "^1.2.0",
"@effection/inspect-utils": "^2.1.6",
"@types/express": "*",
"effection": "^2.0.6",
Expand All @@ -34,7 +34,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/cli": "^0.26.4",
"@types/supertest": "^2.0.8",
"msw": "^0.35.0",
"supertest": "^4.0.2"
Expand Down
14 changes: 7 additions & 7 deletions plugins/effection-inspector/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/theme": "^0.5.1",
"@backstage/core-components": "^0.14.4",
"@backstage/core-plugin-api": "^1.9.2",
"@backstage/theme": "^0.5.3",
"@effection/inspect-ui": "^2.3.2",
"@effection/react": "^2.2.2",
"@material-ui/core": "^4.12.2",
Expand All @@ -36,10 +36,10 @@
"react": "^16.13.1 || ^17.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.11.1",
"@backstage/dev-utils": "^1.0.27",
"@backstage/test-utils": "^1.5.0",
"@backstage/cli": "^0.26.4",
"@backstage/core-app-api": "^1.12.4",
"@backstage/dev-utils": "^1.0.31",
"@backstage/test-utils": "^1.5.4",
"@effection/atom": "^2.0.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
Expand Down
14 changes: 7 additions & 7 deletions plugins/graphql-backend-module-catalog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-plugin-api": "^0.6.7",
"@backstage/catalog-client": "^1.4.6",
"@backstage/catalog-model": "^1.4.3",
"@backstage/plugin-auth-node": "^0.4.1",
"@backstage/plugin-catalog-node": "^1.5.0",
"@backstage/backend-common": "^0.21.7",
"@backstage/backend-plugin-api": "^0.6.17",
"@backstage/catalog-client": "^1.6.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/plugin-auth-node": "^0.4.12",
"@backstage/plugin-catalog-node": "^1.11.1",
"@frontside/backstage-plugin-graphql-backend": "^0.1.8",
"@frontside/hydraphql": "^0.1.3",
"@graphql-tools/load-files": "^7.0.0",
Expand All @@ -58,7 +58,7 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/cli": "^0.26.4",
"@envelop/core": "^4.0.0",
"@envelop/dataloader": "^5.0.0",
"@envelop/graphql-modules": "^5.0.0",
Expand Down
4 changes: 2 additions & 2 deletions plugins/graphql-backend-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-plugin-api": "^0.6.7",
"@backstage/backend-plugin-api": "^0.6.17",
"@frontside/hydraphql": "^0.1.3",
"dataloader": "^2.1.0",
"graphql-modules": "^2.3.0",
"graphql-yoga": "^4.0.3"
},
"devDependencies": {
"@backstage/cli": "^0.25.2"
"@backstage/cli": "^0.26.4"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions plugins/graphql-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-plugin-api": "^0.6.7",
"@backstage/backend-common": "^0.21.7",
"@backstage/backend-plugin-api": "^0.6.17",
"@envelop/core": "^4.0.0",
"@envelop/dataloader": "^5.0.0",
"@envelop/graphql-modules": "^5.0.0",
Expand All @@ -50,7 +50,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.25.2",
"@backstage/cli": "^0.26.4",
"@types/supertest": "^2.0.8",
"supertest": "^6.1.3"
},
Expand Down
Loading
Loading