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

Jump to bottom

chore: bump backstage dependencies from 1.22 -> 1.30 #60

Merged
merged 6 commits into from
Aug 24, 2024
Merged

chore: bump backstage dependencies from 1.22 -> 1.30 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d01d3b9
bump backstage 1.22 -> 1.30
zhammer Aug 24, 2024
4bea842
fix breaking change in 1.30 removing setupRequestMockHandlers
zhammer Aug 24, 2024
a16c4f8
temporarily fix scaffolder type issue
zhammer Aug 24, 2024
a7a5d2d
fix broken tests in entityscaffoldercontent
zhammer Aug 24, 2024
0717fe4
more reader fixes
zhammer Aug 24, 2024
cc41cbb
fix lodash tsc issue
zhammer Aug 24, 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
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.22.2"
"version": "1.30.2"
}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"yarn": "1.22.21"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/e2e-test-utils": "^0.1.0",
"@backstage/cli": "^0.27.0",
"@backstage/e2e-test-utils": "^0.1.1",
"@playwright/test": "^1.32.3",
"@qiwi/multi-semantic-release": "^7.1.1",
"@semantic-release/exec": "^6.0.3",
Expand Down
50 changes: 25 additions & 25 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage/app-defaults": "^1.4.7",
"@backstage/catalog-model": "^1.4.3",
"@backstage/cli": "^0.25.1",
"@backstage/core-app-api": "^1.11.3",
"@backstage/core-components": "^0.13.10",
"@backstage/core-plugin-api": "^1.8.2",
"@backstage/integration-react": "^1.1.23",
"@backstage/plugin-api-docs": "^0.10.3",
"@backstage/plugin-catalog": "^1.16.1",
"@backstage/plugin-catalog-common": "^1.0.20",
"@backstage/plugin-catalog-graph": "^0.3.3",
"@backstage/plugin-catalog-import": "^0.10.5",
"@backstage/plugin-catalog-react": "^1.9.3",
"@backstage/plugin-github-actions": "^0.6.10",
"@backstage/plugin-org": "^0.6.19",
"@backstage/plugin-permission-react": "^0.4.19",
"@backstage/plugin-scaffolder": "^1.17.1",
"@backstage/plugin-search": "^1.4.5",
"@backstage/plugin-search-react": "^1.7.5",
"@backstage/plugin-techdocs": "^1.9.3",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.4",
"@backstage/plugin-techdocs-react": "^1.1.15",
"@backstage/plugin-user-settings": "^0.8.0",
"@backstage/theme": "^0.5.0",
"@backstage/app-defaults": "^1.5.10",
"@backstage/catalog-model": "^1.6.0",
"@backstage/cli": "^0.27.0",
"@backstage/core-app-api": "^1.14.2",
"@backstage/core-components": "^0.14.10",
"@backstage/core-plugin-api": "^1.9.3",
"@backstage/integration-react": "^1.1.30",
"@backstage/plugin-api-docs": "^0.11.8",
"@backstage/plugin-catalog": "^1.22.0",
"@backstage/plugin-catalog-common": "^1.0.26",
"@backstage/plugin-catalog-graph": "^0.4.8",
"@backstage/plugin-catalog-import": "^0.12.2",
"@backstage/plugin-catalog-react": "^1.12.3",
"@backstage/plugin-github-actions": "^0.6.16",
"@backstage/plugin-org": "^0.6.28",
"@backstage/plugin-permission-react": "^0.4.25",
"@backstage/plugin-scaffolder": "^1.24.0",
"@backstage/plugin-search": "^1.4.15",
"@backstage/plugin-search-react": "^1.7.14",
"@backstage/plugin-techdocs": "^1.10.8",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.13",
"@backstage/plugin-techdocs-react": "^1.2.7",
"@backstage/plugin-user-settings": "^0.8.11",
"@backstage/theme": "^0.5.6",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@seatgeek/backstage-plugin-awards": "link:*",
Expand All @@ -50,7 +50,7 @@
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.4.7",
"@backstage/test-utils": "^1.5.10",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^8.0.0",
"@testing-library/jest-dom": "^5.10.1",
Expand Down
42 changes: 21 additions & 21 deletions packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-common": "^0.20.1",
"@backstage/backend-tasks": "^0.5.14",
"@backstage/catalog-client": "^1.5.2",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/plugin-app-backend": "^0.3.57",
"@backstage/plugin-auth-backend": "^0.20.3",
"@backstage/plugin-auth-node": "^0.4.3",
"@backstage/plugin-catalog-backend": "^1.16.2",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.6",
"@backstage/plugin-permission-common": "^0.7.12",
"@backstage/plugin-permission-node": "^0.7.20",
"@backstage/plugin-proxy-backend": "^0.4.7",
"@backstage/plugin-scaffolder-backend": "^1.20.0",
"@backstage/plugin-search-backend": "^1.4.9",
"@backstage/plugin-search-backend-module-catalog": "^0.1.13",
"@backstage/plugin-search-backend-module-pg": "^0.5.18",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.13",
"@backstage/plugin-search-backend-node": "^1.2.13",
"@backstage/plugin-techdocs-backend": "^1.9.2",
"@backstage/backend-common": "^0.24.0",
"@backstage/backend-tasks": "^0.6.0",
"@backstage/catalog-client": "^1.6.6",
"@backstage/catalog-model": "^1.6.0",
"@backstage/config": "^1.2.0",
"@backstage/plugin-app-backend": "^0.3.72",
"@backstage/plugin-auth-backend": "^0.22.10",
"@backstage/plugin-auth-node": "^0.5.0",
"@backstage/plugin-catalog-backend": "^1.25.0",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.21",
"@backstage/plugin-permission-common": "^0.8.1",
"@backstage/plugin-permission-node": "^0.8.1",
"@backstage/plugin-proxy-backend": "^0.5.4",
"@backstage/plugin-scaffolder-backend": "^1.24.0",
"@backstage/plugin-search-backend": "^1.5.15",
"@backstage/plugin-search-backend-module-catalog": "^0.2.0",
"@backstage/plugin-search-backend-module-pg": "^0.5.33",
"@backstage/plugin-search-backend-module-techdocs": "^0.2.0",
"@backstage/plugin-search-backend-node": "^1.3.0",
"@backstage/plugin-techdocs-backend": "^1.10.11",
"@seatgeek/backstage-plugin-awards-backend": "link:*",
"app": "*",
"better-sqlite3": "^9.0.0",
Expand All @@ -47,7 +47,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/cli": "^0.27.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
Expand Down
6 changes: 1 addition & 5 deletions packages/backend/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
DatabaseManager,
HostDiscovery,
ServerTokenManager,
UrlReaders,
createServiceBuilder,
getRootLogger,
loadBackendConfig,
Expand All @@ -35,7 +34,6 @@ import { PluginEnvironment } from './types';

function makeCreateEnv(config: Config) {
const root = getRootLogger();
const reader = UrlReaders.default({ logger: root, config });
const discovery = HostDiscovery.fromConfig(config);
const cacheManager = CacheManager.fromConfig(config);
const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
Expand All @@ -50,8 +48,6 @@ function makeCreateEnv(config: Config) {
tokenManager,
});

root.info(`Created UrlReader ${reader}`);

return (plugin: string): PluginEnvironment => {
const logger = root.child({ type: 'plugin', plugin });
const database = databaseManager.forPlugin(plugin);
Expand All @@ -62,10 +58,10 @@ function makeCreateEnv(config: Config) {
database,
cache,
config,
reader,
discovery,
tokenManager,
scheduler,
reader: undefined as any,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reader has been removed from backend-common. this is just a temporary hack to get CI to pass so that we can move to the next PR where we switch to the new backend

permissions,
identity,
};
Expand Down
3 changes: 1 addition & 2 deletions packages/backend/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
PluginDatabaseManager,
PluginEndpointDiscovery,
TokenManager,
UrlReader,
} from '@backstage/backend-common';
import { PluginTaskScheduler } from '@backstage/backend-tasks';
import { Config } from '@backstage/config';
Expand All @@ -16,8 +15,8 @@ export type PluginEnvironment = {
database: PluginDatabaseManager;
cache: PluginCacheManager;
config: Config;
reader: UrlReader;
discovery: PluginEndpointDiscovery;
reader: any;
tokenManager: TokenManager;
scheduler: PluginTaskScheduler;
permissions: PermissionEvaluator;
Expand Down
17 changes: 9 additions & 8 deletions plugins/awards-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.521.0",
"@backstage/backend-common": "^0.20.1",
"@backstage/backend-plugin-api": "^0.6.9",
"@backstage/catalog-client": "^1.6.0",
"@backstage/catalog-model": "^1.4.4",
"@backstage/config": "^1.1.1",
"@backstage/errors": "^1.2.3",
"@backstage/plugin-auth-node": "^0.4.3",
"@backstage/backend-common": "^0.24.0",
"@backstage/backend-plugin-api": "^0.8.0",
"@backstage/catalog-client": "^1.6.6",
"@backstage/catalog-model": "^1.6.0",
"@backstage/config": "^1.2.0",
"@backstage/errors": "^1.2.4",
"@backstage/plugin-auth-node": "^0.5.0",
"@seatgeek/backstage-plugin-awards-common": "link:*",
"@slack/webhook": "^7.0.2",
"@tweedegolf/sab-adapter-amazon-s3": "^1.0.13",
Expand All @@ -50,7 +50,8 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/cli": "^0.27.0",
"@types/lodash": "^4.17.7",
"@types/supertest": "^2.0.12",
"better-sqlite3": "^9.1.1",
"msw": "^1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions plugins/awards-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"role": "backend-plugin"
},
"dependencies": {
"@backstage/backend-common": "^0.20.1",
"@backstage/config": "^1.1.1",
"@backstage/backend-common": "^0.24.0",
"@backstage/config": "^1.2.0",
"@types/express": "*",
"@types/uuid": "^9.0.6",
"express": "^4.17.1",
Expand All @@ -32,7 +32,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/cli": "^0.27.0",
"@types/supertest": "^2.0.12",
"msw": "^1.0.0",
"supertest": "^6.2.4"
Expand Down
19 changes: 10 additions & 9 deletions plugins/awards/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/catalog-model": "^1.4.3",
"@backstage/core-components": "^0.13.10",
"@backstage/core-plugin-api": "^1.8.2",
"@backstage/plugin-catalog-react": "^1.9.3",
"@backstage/theme": "^0.5.0",
"@backstage/catalog-model": "^1.6.0",
"@backstage/core-components": "^0.14.10",
"@backstage/core-plugin-api": "^1.9.3",
"@backstage/plugin-catalog-react": "^1.12.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",
Expand All @@ -37,13 +37,14 @@
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/core-app-api": "^1.11.3",
"@backstage/dev-utils": "^1.0.26",
"@backstage/test-utils": "^1.4.7",
"@backstage/cli": "^0.27.0",
"@backstage/core-app-api": "^1.14.2",
"@backstage/dev-utils": "^1.0.37",
"@backstage/test-utils": "^1.5.10",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.0.0",
"@types/lodash": "^4.17.7",
"msw": "^1.0.0",
"uuid": "^9.0.1"
},
Expand Down
15 changes: 8 additions & 7 deletions plugins/aws-catalog-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"dependencies": {
"@aws-sdk/client-rds": "^3.499.0",
"@aws-sdk/types": "^3.347.0",
"@backstage/backend-common": "^0.20.1",
"@backstage/backend-tasks": "^0.5.14",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/plugin-catalog-node": "^1.6.1",
"@backstage/backend-common": "^0.24.0",
"@backstage/backend-tasks": "^0.6.0",
"@backstage/catalog-model": "^1.6.0",
"@backstage/config": "^1.2.0",
"@backstage/plugin-catalog-node": "^1.12.5",
"@seatgeek/backstage-plugin-aws-catalog-common": "link:*",
"@types/express": "*",
"express": "^4.17.1",
Expand All @@ -40,8 +40,9 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/backend-test-utils": "^0.2.10",
"@backstage/cli": "^0.25.1",
"@backstage/backend-test-utils": "^0.5.0",
"@backstage/cli": "^0.27.0",
"@types/lodash": "^4.17.7",
"@types/supertest": "^2.0.12",
"msw": "^1.0.0",
"supertest": "^6.2.4"
Expand Down
4 changes: 2 additions & 2 deletions plugins/aws-catalog-backend/src/RDSEntityProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { DBInstance } from '@aws-sdk/client-rds';
import { getVoidLogger } from '@backstage/backend-common';
import { TaskInvocationDefinition, TaskRunner } from '@backstage/backend-tasks';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { registerMswTestHooks } from '@backstage/backend-test-utils';
import { ResourceEntity } from '@backstage/catalog-model';
import { ConfigReader } from '@backstage/config';
import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
Expand Down Expand Up @@ -55,7 +55,7 @@ const EXAMPLE_CREDENTIALS = {
};

describe('RDSEntityProvider', () => {
setupRequestMockHandlers(server);
registerMswTestHooks(server);
afterEach(() => jest.resetAllMocks());

it('no provider config', () => {
Expand Down
2 changes: 1 addition & 1 deletion plugins/aws-catalog-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"link2aws": "^1.0.18"
},
"devDependencies": {
"@backstage/cli": "^0.25.1"
"@backstage/cli": "^0.27.0"
},
"files": [
"dist"
Expand Down
17 changes: 9 additions & 8 deletions plugins/catalog-backend-module-okta/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/backend-common": "^0.20.1",
"@backstage/backend-tasks": "^0.5.14",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.8.0",
"@backstage/plugin-catalog-node": "^1.6.1",
"@backstage/backend-common": "^0.24.0",
"@backstage/backend-tasks": "^0.6.0",
"@backstage/catalog-model": "^1.6.0",
"@backstage/config": "^1.2.0",
"@backstage/integration": "^1.14.0",
"@backstage/plugin-catalog-node": "^1.12.5",
"@okta/okta-sdk-nodejs": "^7.0.1",
"@types/express": "*",
"express": "^4.17.1",
Expand All @@ -39,8 +39,9 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/backend-test-utils": "^0.2.10",
"@backstage/cli": "^0.25.1",
"@backstage/backend-test-utils": "^0.5.0",
"@backstage/cli": "^0.27.0",
"@types/lodash": "^4.17.7",
"@types/supertest": "^2.0.12",
"@types/uuid": "^9.0.4",
"msw": "^1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions plugins/catalog-backend-module-okta/src/OktaOrgDiscoveryEntityProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import { getVoidLogger } from '@backstage/backend-common';
import { TaskInvocationDefinition, TaskRunner } from '@backstage/backend-tasks';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { registerMswTestHooks } from '@backstage/backend-test-utils';
import { GroupEntity, UserEntity } from '@backstage/catalog-model';
import { ConfigReader } from '@backstage/config';
import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
Expand Down Expand Up @@ -69,7 +69,7 @@ const simpleGroupTransformer: OktaGroupTransformer = (
};

describe('GitlabOrgDiscoveryEntityProvider', () => {
setupRequestMockHandlers(server);
registerMswTestHooks(server);
afterEach(() => jest.resetAllMocks());

it('no provider config', () => {
Expand Down
Loading
Loading