-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d81dd0e
commit 2c898c5
Showing
2 changed files
with
215 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,212 @@ | ||
diff --git a/backstage.json b/backstage.json | ||
index 418d353..2bdd973 100644 | ||
--- a/backstage.json | ||
+++ b/backstage.json | ||
@@ -1,3 +1,3 @@ | ||
{ | ||
- "version": "1.27.0-next.1" | ||
+ "version": "1.26.0" | ||
} | ||
diff --git a/package.json b/package.json | ||
index 83896ec..d8d5629 100644 | ||
--- a/package.json | ||
+++ b/package.json | ||
@@ -33,3 +33,3 @@ | ||
"devDependencies": { | ||
- "@backstage/cli": "^0.26.5-next.0", | ||
+ "@backstage/cli": "^0.26.3", | ||
"@backstage/e2e-test-utils": "^0.1.1", | ||
diff --git a/packages/app/package.json b/packages/app/package.json | ||
index 3350e7e..7ca04af 100644 | ||
--- a/packages/app/package.json | ||
+++ b/packages/app/package.json | ||
@@ -16,25 +16,27 @@ | ||
"dependencies": { | ||
- "@backstage/app-defaults": "^1.5.5-next.1", | ||
- "@backstage/catalog-model": "^1.5.0-next.0", | ||
- "@backstage/cli": "^0.26.5-next.0", | ||
+ "@backstage/app-defaults": "^1.5.4", | ||
+ "@backstage/catalog-model": "^1.4.5", | ||
+ "@backstage/cli": "^0.26.3", | ||
"@backstage/core-app-api": "^1.12.4", | ||
- "@backstage/core-components": "^0.14.6-next.1", | ||
+ "@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.5-next.1", | ||
- "@backstage/plugin-catalog": "^1.19.1-next.1", | ||
- "@backstage/plugin-catalog-common": "^1.0.23-next.0", | ||
- "@backstage/plugin-catalog-graph": "^0.4.5-next.1", | ||
- "@backstage/plugin-catalog-import": "^0.10.11-next.1", | ||
- "@backstage/plugin-catalog-react": "^1.11.4-next.1", | ||
- "@backstage/plugin-org": "^0.6.25-next.1", | ||
+ "@backstage/plugin-api-docs": "^0.11.4", | ||
+ "@backstage/plugin-catalog": "^1.19.0", | ||
+ "@backstage/plugin-catalog-common": "^1.0.22", | ||
+ "@backstage/plugin-catalog-graph": "^0.4.4", | ||
+ "@backstage/plugin-catalog-import": "^0.10.10", | ||
+ "@backstage/plugin-catalog-react": "^1.11.3", | ||
+ "@backstage/plugin-github-actions": "^0.6.15", | ||
+ "@backstage/plugin-org": "^0.6.24", | ||
"@backstage/plugin-permission-react": "^0.4.22", | ||
- "@backstage/plugin-scaffolder": "^1.19.4-next.1", | ||
- "@backstage/plugin-search": "^1.4.11-next.1", | ||
- "@backstage/plugin-search-react": "^1.7.11-next.1", | ||
- "@backstage/plugin-techdocs": "^1.10.5-next.1", | ||
- "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.10-next.1", | ||
- "@backstage/plugin-techdocs-react": "^1.2.4-next.1", | ||
- "@backstage/plugin-user-settings": "^0.8.6-next.1", | ||
- "@backstage/theme": "^0.5.4-next.0", | ||
+ "@backstage/plugin-scaffolder": "^1.19.3", | ||
+ "@backstage/plugin-search": "^1.4.10", | ||
+ "@backstage/plugin-search-react": "^1.7.10", | ||
+ "@backstage/plugin-tech-radar": "^0.7.3", | ||
+ "@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", | ||
"@material-ui/core": "^4.12.2", | ||
@@ -49,3 +51,3 @@ | ||
"devDependencies": { | ||
- "@backstage/test-utils": "^1.5.5-next.0", | ||
+ "@backstage/test-utils": "^1.5.4", | ||
"@playwright/test": "^1.32.3", | ||
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx | ||
index e24c468..f751cf6 100644 | ||
--- a/packages/app/src/App.tsx | ||
+++ b/packages/app/src/App.tsx | ||
@@ -15,2 +15,3 @@ import { orgPlugin } from '@backstage/plugin-org'; | ||
import { SearchPage } from '@backstage/plugin-search'; | ||
+import { TechRadarPage } from '@backstage/plugin-tech-radar'; | ||
import { | ||
@@ -84,2 +85,6 @@ const routes = ( | ||
<Route path="/api-docs" element={<ApiExplorerPage />} /> | ||
+ <Route | ||
+ path="/tech-radar" | ||
+ element={<TechRadarPage width={1500} height={800} />} | ||
+ /> | ||
<Route | ||
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx | ||
index 53b6685..7c6a71e 100644 | ||
--- a/packages/app/src/components/catalog/EntityPage.tsx | ||
+++ b/packages/app/src/components/catalog/EntityPage.tsx | ||
@@ -30,2 +30,6 @@ import { | ||
} from '@backstage/plugin-catalog'; | ||
+import { | ||
+ isGithubActionsAvailable, | ||
+ EntityGithubActionsContent, | ||
+} from '@backstage/plugin-github-actions'; | ||
import { | ||
@@ -68,9 +72,5 @@ const cicdContent = ( | ||
<EntitySwitch> | ||
- {/* | ||
- Here you can add support for different CI/CD services, for example | ||
- using @backstage-community/plugin-github-actions as follows: | ||
- <EntitySwitch.Case if={isGithubActionsAvailable}> | ||
- <EntityGithubActionsContent /> | ||
- </EntitySwitch.Case> | ||
- */} | ||
+ <EntitySwitch.Case if={isGithubActionsAvailable}> | ||
+ <EntityGithubActionsContent /> | ||
+ </EntitySwitch.Case> | ||
|
||
diff --git a/packages/backend/package.json b/packages/backend/package.json | ||
index 1fbbb24..b217bc0 100644 | ||
--- a/packages/backend/package.json | ||
+++ b/packages/backend/package.json | ||
@@ -18,24 +18,24 @@ | ||
"dependencies": { | ||
- "@backstage/backend-common": "^0.22.0-next.1", | ||
- "@backstage/backend-defaults": "^0.2.18-next.1", | ||
- "@backstage/backend-tasks": "^0.5.23-next.1", | ||
+ "@backstage/backend-common": "^0.21.7", | ||
+ "@backstage/backend-defaults": "^0.2.17", | ||
+ "@backstage/backend-tasks": "^0.5.22", | ||
"@backstage/config": "^1.2.0", | ||
- "@backstage/plugin-app-backend": "^0.3.66-next.1", | ||
- "@backstage/plugin-auth-backend": "^0.22.5-next.1", | ||
- "@backstage/plugin-auth-backend-module-github-provider": "^0.1.15-next.1", | ||
- "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4-next.1", | ||
- "@backstage/plugin-auth-node": "^0.4.13-next.1", | ||
- "@backstage/plugin-catalog-backend": "^1.22.0-next.1", | ||
- "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.16-next.1", | ||
- "@backstage/plugin-permission-backend": "^0.5.42-next.1", | ||
- "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.15-next.1", | ||
+ "@backstage/plugin-app-backend": "^0.3.65", | ||
+ "@backstage/plugin-auth-backend": "^0.22.4", | ||
+ "@backstage/plugin-auth-backend-module-github-provider": "^0.1.14", | ||
+ "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.3", | ||
+ "@backstage/plugin-auth-node": "^0.4.12", | ||
+ "@backstage/plugin-catalog-backend": "^1.21.1", | ||
+ "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.15", | ||
+ "@backstage/plugin-permission-backend": "^0.5.41", | ||
+ "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.14", | ||
"@backstage/plugin-permission-common": "^0.7.13", | ||
- "@backstage/plugin-permission-node": "^0.7.29-next.1", | ||
- "@backstage/plugin-proxy-backend": "^0.4.16-next.1", | ||
- "@backstage/plugin-scaffolder-backend": "^1.22.5-next.1", | ||
- "@backstage/plugin-search-backend": "^1.5.8-next.1", | ||
- "@backstage/plugin-search-backend-module-catalog": "^0.1.24-next.1", | ||
- "@backstage/plugin-search-backend-module-techdocs": "^0.1.23-next.1", | ||
- "@backstage/plugin-search-backend-node": "^1.2.22-next.1", | ||
- "@backstage/plugin-techdocs-backend": "^1.10.5-next.1", | ||
+ "@backstage/plugin-permission-node": "^0.7.28", | ||
+ "@backstage/plugin-proxy-backend": "^0.4.15", | ||
+ "@backstage/plugin-scaffolder-backend": "^1.22.4", | ||
+ "@backstage/plugin-search-backend": "^1.5.7", | ||
+ "@backstage/plugin-search-backend-module-catalog": "^0.1.22", | ||
+ "@backstage/plugin-search-backend-module-techdocs": "^0.1.22", | ||
+ "@backstage/plugin-search-backend-node": "^1.2.21", | ||
+ "@backstage/plugin-techdocs-backend": "^1.10.4", | ||
"app": "link:../app", | ||
@@ -48,3 +48,3 @@ | ||
"devDependencies": { | ||
- "@backstage/cli": "^0.26.5-next.0", | ||
+ "@backstage/cli": "^0.26.3", | ||
"@types/dockerode": "^3.3.0", | ||
diff --git a/packages/backend/src/index.test.ts b/packages/backend/src/index.test.ts | ||
new file mode 100644 | ||
index 0000000..7814b8c | ||
--- /dev/null | ||
+++ b/packages/backend/src/index.test.ts | ||
@@ -0,0 +1,8 @@ | ||
+import { PluginEnvironment } from './types'; | ||
+ | ||
+describe('test', () => { | ||
+ it('unbreaks the test runner', () => { | ||
+ const unbreaker = {} as PluginEnvironment; | ||
+ expect(unbreaker).toBeTruthy(); | ||
+ }); | ||
+}); | ||
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts | ||
new file mode 100644 | ||
index 0000000..9cd2c74 | ||
--- /dev/null | ||
+++ b/packages/backend/src/types.ts | ||
@@ -0,0 +1,25 @@ | ||
+import { Logger } from 'winston'; | ||
+import { Config } from '@backstage/config'; | ||
+import { | ||
+ PluginCacheManager, | ||
+ PluginDatabaseManager, | ||
+ PluginEndpointDiscovery, | ||
+ TokenManager, | ||
+ UrlReader, | ||
+} from '@backstage/backend-common'; | ||
+import { PluginTaskScheduler } from '@backstage/backend-tasks'; | ||
+import { PermissionEvaluator } from '@backstage/plugin-permission-common'; | ||
+import { IdentityApi } from '@backstage/plugin-auth-node'; | ||
+ | ||
+export type PluginEnvironment = { | ||
+ logger: Logger; | ||
+ database: PluginDatabaseManager; | ||
+ cache: PluginCacheManager; | ||
+ config: Config; | ||
+ reader: UrlReader; | ||
+ discovery: PluginEndpointDiscovery; | ||
+ tokenManager: TokenManager; | ||
+ scheduler: PluginTaskScheduler; | ||
+ permissions: PermissionEvaluator; | ||
+ identity: IdentityApi; | ||
+}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -547,5 +547,8 @@ | |
}, | ||
"1.27.0-next.1": { | ||
"createApp": "0.5.15-next.1" | ||
}, | ||
"1.26.5": { | ||
"createApp": "0.5.14" | ||
} | ||
} |