Skip to content

Commit 480aa8e

Browse files
karthikjeeyarkarthikjeeyar
authored
chore(adoption-insights): Release Adoption insights plugin (#574)
* chore(adoption-insights): downgrade adoption insights plugin to backstage 1.35.1 * fix permission support * make all the plugins public * add changeset
1 parent 5ad094e commit 480aa8e

12 files changed

Lines changed: 1240 additions & 941 deletions

File tree

‎workspaces/adoption-insights/.changeset/fuzzy-shirts-travel.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights': patch
3+
'@red-hat-developer-hub/backstage-plugin-adoption-insights-backend': patch
4+
'@red-hat-developer-hub/backstage-plugin-adoption-insights-common': patch
5+
'@red-hat-developer-hub/backstage-plugin-adoption-insights': patch
6+
---
7+
8+
Release Adoption insights plugin

‎workspaces/adoption-insights/backstage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "version": "1.36.0" }
1+
{ "version": "1.35.1" }

‎workspaces/adoption-insights/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"directory": "workspaces/adoption-insights"
3939
},
4040
"devDependencies": {
41-
"@backstage/cli": "^0.30.0",
41+
"@backstage/cli": "^0.29.6",
4242
"@backstage/e2e-test-utils": "^0.1.1",
4343
"@backstage/repo-tools": "^0.13.0",
4444
"@changesets/cli": "^2.27.1",
@@ -51,7 +51,9 @@
5151
},
5252
"resolutions": {
5353
"@types/react": "^18",
54-
"@types/react-dom": "^18"
54+
"@types/react-dom": "^18",
55+
"@backstage/plugin-catalog-backend": "1.30.0",
56+
"@backstage/plugin-scaffolder-backend": "1.29.0"
5557
},
5658
"prettier": "@spotify/prettier-config",
5759
"lint-staged": {

‎workspaces/adoption-insights/packages/app/package.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@
1919
"lint": "backstage-cli package lint"
2020
},
2121
"dependencies": {
22-
"@backstage/app-defaults": "^1.5.17",
22+
"@backstage/app-defaults": "^1.5.16",
2323
"@backstage/catalog-model": "^1.7.3",
24-
"@backstage/cli": "^0.30.0",
25-
"@backstage/core-app-api": "^1.15.5",
26-
"@backstage/core-components": "^0.16.4",
27-
"@backstage/core-plugin-api": "^1.10.4",
28-
"@backstage/integration-react": "^1.2.4",
29-
"@backstage/plugin-api-docs": "^0.12.4",
30-
"@backstage/plugin-catalog": "^1.27.0",
24+
"@backstage/cli": "^0.29.6",
25+
"@backstage/core-app-api": "^1.15.4",
26+
"@backstage/core-components": "^0.16.3",
27+
"@backstage/core-plugin-api": "^1.10.3",
28+
"@backstage/integration-react": "^1.2.3",
29+
"@backstage/plugin-api-docs": "^0.12.3",
30+
"@backstage/plugin-catalog": "^1.26.1",
3131
"@backstage/plugin-catalog-common": "^1.1.3",
32-
"@backstage/plugin-catalog-graph": "^0.4.16",
33-
"@backstage/plugin-catalog-import": "^0.12.10",
34-
"@backstage/plugin-catalog-react": "^1.15.2",
35-
"@backstage/plugin-kubernetes": "^0.12.4",
36-
"@backstage/plugin-org": "^0.6.36",
37-
"@backstage/plugin-permission-react": "^0.4.31",
38-
"@backstage/plugin-scaffolder": "^1.28.0",
39-
"@backstage/plugin-search": "^1.4.23",
40-
"@backstage/plugin-search-react": "^1.8.6",
41-
"@backstage/plugin-techdocs": "^1.12.3",
42-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21",
43-
"@backstage/plugin-techdocs-react": "^1.2.14",
44-
"@backstage/plugin-user-settings": "^0.8.19",
45-
"@backstage/theme": "^0.6.4",
32+
"@backstage/plugin-catalog-graph": "^0.4.15",
33+
"@backstage/plugin-catalog-import": "^0.12.9",
34+
"@backstage/plugin-catalog-react": "^1.15.1",
35+
"@backstage/plugin-kubernetes": "^0.12.3",
36+
"@backstage/plugin-org": "^0.6.35",
37+
"@backstage/plugin-permission-react": "^0.4.30",
38+
"@backstage/plugin-scaffolder": "^1.27.5",
39+
"@backstage/plugin-search": "^1.4.22",
40+
"@backstage/plugin-search-react": "^1.8.5",
41+
"@backstage/plugin-techdocs": "^1.12.2",
42+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.20",
43+
"@backstage/plugin-techdocs-react": "^1.2.13",
44+
"@backstage/plugin-user-settings": "^0.8.18",
45+
"@backstage/theme": "^0.6.3",
4646
"@material-ui/core": "^4.12.2",
4747
"@material-ui/icons": "^4.9.1",
4848
"@mui/icons-material": "5.16.4",

‎workspaces/adoption-insights/packages/backend/package.json‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,29 @@
2121
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
2222
},
2323
"dependencies": {
24-
"@backstage/backend-defaults": "^0.8.0",
25-
"@backstage/backend-plugin-api": "^1.2.0",
24+
"@backstage/backend-defaults": "^0.7.0",
2625
"@backstage/config": "^1.3.2",
27-
"@backstage/plugin-app-backend": "^0.4.5",
28-
"@backstage/plugin-auth-backend": "^0.24.3",
29-
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.0",
30-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5",
31-
"@backstage/plugin-auth-node": "^0.6.0",
32-
"@backstage/plugin-catalog-backend": "^1.31.0",
33-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.7",
34-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.5",
35-
"@backstage/plugin-kubernetes-backend": "^0.19.3",
36-
"@backstage/plugin-permission-backend": "^0.5.54",
37-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.5",
26+
"@backstage/plugin-app-backend": "^0.4.4",
27+
"@backstage/plugin-auth-backend": "^0.24.2",
28+
"@backstage/plugin-auth-backend-module-github-provider": "^0.2.4",
29+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.4",
30+
"@backstage/plugin-auth-node": "^0.5.6",
31+
"@backstage/plugin-catalog-backend": "^1.30.0",
32+
"@backstage/plugin-catalog-backend-module-logs": "^0.1.6",
33+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.4",
34+
"@backstage/plugin-kubernetes-backend": "^0.19.2",
35+
"@backstage/plugin-permission-backend": "^0.5.53",
36+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.4",
3837
"@backstage/plugin-permission-common": "^0.8.4",
39-
"@backstage/plugin-permission-node": "^0.8.8",
40-
"@backstage/plugin-proxy-backend": "^0.5.11",
41-
"@backstage/plugin-scaffolder-backend": "^1.30.0",
42-
"@backstage/plugin-scaffolder-backend-module-github": "^0.6.0",
43-
"@backstage/plugin-search-backend": "^1.8.2",
44-
"@backstage/plugin-search-backend-module-catalog": "^0.3.1",
45-
"@backstage/plugin-search-backend-module-pg": "^0.5.41",
46-
"@backstage/plugin-search-backend-module-techdocs": "^0.3.6",
47-
"@backstage/plugin-search-backend-node": "^1.3.8",
48-
"@backstage/plugin-techdocs-backend": "^1.11.6",
38+
"@backstage/plugin-permission-node": "^0.8.7",
39+
"@backstage/plugin-proxy-backend": "^0.5.10",
40+
"@backstage/plugin-scaffolder-backend": "^1.29.0",
41+
"@backstage/plugin-search-backend": "^1.8.1",
42+
"@backstage/plugin-search-backend-module-catalog": "^0.3.0",
43+
"@backstage/plugin-search-backend-module-pg": "^0.5.40",
44+
"@backstage/plugin-search-backend-module-techdocs": "^0.3.5",
45+
"@backstage/plugin-search-backend-node": "^1.3.7",
46+
"@backstage/plugin-techdocs-backend": "^1.11.5",
4947
"@red-hat-developer-hub/backstage-plugin-adoption-insights-backend": "workspace:^",
5048
"@red-hat-developer-hub/backstage-plugin-adoption-insights-common": "workspace:^",
5149
"app": "link:../app",
@@ -54,7 +52,7 @@
5452
"pg": "^8.11.3"
5553
},
5654
"devDependencies": {
57-
"@backstage/cli": "^0.30.0"
55+
"@backstage/cli": "^0.29.6"
5856
},
5957
"files": [
6058
"dist"

‎workspaces/adoption-insights/plugins/adoption-insights-backend/package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@red-hat-developer-hub/backstage-plugin-adoption-insights-backend",
33
"version": "0.0.1",
44
"license": "Apache-2.0",
5-
"private": true,
65
"main": "src/index.ts",
76
"types": "src/index.ts",
87
"publishConfig": {
@@ -34,11 +33,11 @@
3433
"postpack": "backstage-cli package postpack"
3534
},
3635
"dependencies": {
37-
"@backstage/backend-defaults": "^0.8.0",
38-
"@backstage/backend-plugin-api": "^1.2.0",
39-
"@backstage/core-plugin-api": "^1.10.4",
36+
"@backstage/backend-defaults": "^0.7.0",
37+
"@backstage/backend-plugin-api": "^1.1.1",
38+
"@backstage/core-plugin-api": "^1.10.3",
4039
"@backstage/errors": "^1.2.7",
41-
"@backstage/plugin-catalog-node": "^1.16.0",
40+
"@backstage/plugin-catalog-node": "^1.15.1",
4241
"@backstage/plugin-permission-common": "^0.8.4",
4342
"@red-hat-developer-hub/backstage-plugin-adoption-insights-common": "workspace:^",
4443
"express": "^4.17.1",
@@ -51,7 +50,7 @@
5150
},
5251
"devDependencies": {
5352
"@backstage/backend-test-utils": "^1.3.0",
54-
"@backstage/cli": "^0.30.0",
53+
"@backstage/cli": "^0.29.6",
5554
"@types/express": "^4.17.6",
5655
"@types/supertest": "^2.0.12",
5756
"supertest": "^6.2.4"

‎workspaces/adoption-insights/plugins/adoption-insights-backend/src/plugin.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import { EventBatchProcessor } from './domain/EventBatchProcessor';
2424
import EventApiController from './controllers/EventApiController';
2525
import { schedulePartition } from './database/partition';
2626
import { getConfigurationOptions } from './utils/config';
27-
import { adoptionInsightsEventsReadPermission } from '@red-hat-developer-hub/backstage-plugin-adoption-insights-common';
2827

2928
/**
3029
* adoptionInsightsPlugin backend plugin
@@ -43,7 +42,6 @@ export const adoptionInsightsPlugin = createBackendPlugin({
4342
database: coreServices.database,
4443
scheduler: coreServices.scheduler,
4544
permissions: coreServices.permissions,
46-
permissionsRegistry: coreServices.permissionsRegistry,
4745
},
4846
async init({
4947
config,
@@ -53,7 +51,6 @@ export const adoptionInsightsPlugin = createBackendPlugin({
5351
database,
5452
scheduler,
5553
permissions,
56-
permissionsRegistry,
5754
}) {
5855
// Queue configuration
5956
const options = getConfigurationOptions(config);
@@ -66,10 +63,6 @@ export const adoptionInsightsPlugin = createBackendPlugin({
6663
config,
6764
);
6865

69-
permissionsRegistry.addPermissions([
70-
adoptionInsightsEventsReadPermission,
71-
]);
72-
7366
// Migrate database
7467
await migrate(database);
7568

‎workspaces/adoption-insights/plugins/adoption-insights-backend/src/router.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { AuthorizeResult } from '@backstage/plugin-permission-common';
2424
import { adoptionInsightsEventsReadPermission } from '@red-hat-developer-hub/backstage-plugin-adoption-insights-common';
2525
import EventApiController from './controllers/EventApiController';
2626
import { QueryParams } from './types/event-request';
27+
import { createPermissionIntegrationRouter } from '@backstage/plugin-permission-node';
2728

2829
export async function createRouter({
2930
httpAuth,
@@ -36,6 +37,11 @@ export async function createRouter({
3637
}): Promise<express.Router> {
3738
const router = Router();
3839

40+
const permissionIntegrationRouter = createPermissionIntegrationRouter({
41+
permissions: [adoptionInsightsEventsReadPermission],
42+
});
43+
44+
router.use(permissionIntegrationRouter);
3945
router.use(express.json());
4046

4147
const authorizeUser = async (

‎workspaces/adoption-insights/plugins/adoption-insights-common/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@red-hat-developer-hub/backstage-plugin-adoption-insights-common",
33
"version": "0.1.0",
44
"license": "Apache-2.0",
5-
"private": true,
65
"description": "Common functionalities for the adoption-insights plugin",
76
"main": "src/index.ts",
87
"types": "src/index.ts",
@@ -33,7 +32,7 @@
3332
"postpack": "backstage-cli package postpack"
3433
},
3534
"devDependencies": {
36-
"@backstage/cli": "^0.30.0"
35+
"@backstage/cli": "^0.29.5"
3736
},
3837
"peerDependencies": {
3938
"@backstage/plugin-permission-common": "^0.8.4"

‎workspaces/adoption-insights/plugins/adoption-insights/package.json‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@red-hat-developer-hub/backstage-plugin-adoption-insights",
33
"version": "0.0.1",
44
"license": "Apache-2.0",
5-
"private": true,
65
"main": "src/index.ts",
76
"types": "src/index.ts",
87
"publishConfig": {
@@ -36,11 +35,11 @@
3635
},
3736
"dependencies": {
3837
"@backstage/catalog-model": "^1.7.3",
39-
"@backstage/core-components": "^0.16.4",
40-
"@backstage/core-plugin-api": "^1.10.4",
41-
"@backstage/plugin-catalog-react": "^1.15.2",
42-
"@backstage/plugin-permission-react": "^0.4.31",
43-
"@backstage/theme": "^0.6.4",
38+
"@backstage/core-components": "^0.16.3",
39+
"@backstage/core-plugin-api": "^1.10.3",
40+
"@backstage/plugin-catalog-react": "^1.15.1",
41+
"@backstage/plugin-permission-react": "^0.4.30",
42+
"@backstage/theme": "^0.6.3",
4443
"@material-ui/core": "^4.12.2",
4544
"@material-ui/icons": "^4.9.1",
4645
"@material-ui/lab": "4.0.0-alpha.61",
@@ -57,11 +56,11 @@
5756
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
5857
},
5958
"devDependencies": {
60-
"@backstage/cli": "^0.30.0",
59+
"@backstage/cli": "^0.29.5",
6160
"@backstage/config": "^1.3.2",
62-
"@backstage/core-app-api": "^1.15.5",
61+
"@backstage/core-app-api": "^1.15.4",
6362
"@backstage/dev-utils": "^1.1.7",
64-
"@backstage/test-utils": "^1.7.5",
63+
"@backstage/test-utils": "^1.7.4",
6564
"@redhat-developer/red-hat-developer-hub-theme": "^0.5.0",
6665
"@testing-library/jest-dom": "^6.0.0",
6766
"@testing-library/react": "^14.0.0",

0 commit comments

Comments
 (0)