Skip to content

Commit 6ac8149

Browse files
GDYendellGDYendell
committed
Update backstage version
1 parent 5474857 commit 6ac8149

File tree

19 files changed

+4673
-3405
lines changed

19 files changed

+4673
-3405
lines changed

‎README.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,29 @@ The Diamond Light Source developer portal, built with backstage for deployment o
1919
- Set `remote.containers.dockerPath` to `podman`
2020
- Set `remote.containers.dockerComposePath` to your `docker-compose`
2121
- Disable buildkit by adding `export DOCKER_BUILDKIT=0` to your `~/.bashrc`
22-
- Open Development Container
2322
- Create a `.env` file in the `.devcontainer` directory containing the [necessary secrets](#necessary-secrets)
23+
- Open Development Container
2424
- Install package dependencies with `yarn --cwd backstage install`
2525
- Start the app, with `yarn --cwd backstage dev`
2626

27+
## Contributing changes
28+
29+
The following can be run locally to see if changes will pass CI
30+
31+
- `yarn --cwd backstage run test`
32+
- `a` when prompted to run all tests
33+
- `yarn --cwd backstage run prettier . --check`
34+
- `yarn --cwd backstage run tsc`
35+
- `yarn --cwd backstage backstage-cli repo lint`
36+
37+
## Updating Backstage version
38+
39+
After package install, backstage package dependencies can be updated with
40+
41+
`yarn --cwd backstage backstage-cli versions:bump`
42+
43+
https://backstage.io/docs/getting-started/keeping-backstage-updated
44+
2745
## Deploying on Kubernetes (Diamond Light Source)
2846

2947
- Access the cluster with `module load argus`

‎backstage/app-config.yaml‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,12 @@ techdocs:
5353
auth:
5454
environment: development
5555
providers:
56+
guest: {}
5657
github:
5758
development:
5859
clientId: ${GITHUB_APP_CLIENT_ID}
5960
clientSecret: ${GITHUB_APP_SECRET}
6061

61-
ldap:
62-
providers:
63-
- target: ldap://ralfed.cclrc.ac.uk
64-
users:
65-
dn: ou=dls,dc=fed,dc=cclrc,dc=ac,dc=uk
66-
options:
67-
filter: (memberOf=cn=DLSLTD_Staff,OU=Automatic Groups,DC=fed,DC=cclrc,DC=ac,DC=uk)
68-
paged: true
69-
map:
70-
name: cn
71-
displayName: displayName
72-
groups:
73-
dn: dc=fed,dc=cclrc,dc=ac,dc=uk
74-
options:
75-
filter: (objectClass=group)
76-
7762
catalog:
7863
readonly: true
7964
import:
@@ -113,3 +98,37 @@ catalog:
11398
minutes: 60
11499
timeout:
115100
minutes: 30
101+
ldapOrg:
102+
default:
103+
target: ldap://ralfed.cclrc.ac.uk
104+
bind:
105+
dn: uid=ldap-reader-user,ou=people,ou=example,dc=example,dc=net
106+
secret: dW5hdXRoZW50aWNhdGVkIExEQVAK
107+
schedule:
108+
frequency: PT1H
109+
timeout: PT10M
110+
users:
111+
dn: ou=dls,dc=fed,dc=cclrc,dc=ac,dc=uk
112+
options:
113+
filter: (memberOf=cn=DLSLTD_Staff,OU=Automatic Groups,DC=fed,DC=cclrc,DC=ac,DC=uk)
114+
paged: true
115+
map:
116+
name: cn
117+
displayName: displayName
118+
groups:
119+
dn: dc=fed,dc=cclrc,dc=ac,dc=uk
120+
options:
121+
filter: (objectClass=group)
122+
123+
search:
124+
collators:
125+
catalog:
126+
schedule:
127+
initialDelay: { seconds: 3 }
128+
frequency: { minutes: 10 }
129+
timeout: { minutes: 15 }
130+
techdocs:
131+
schedule:
132+
initialDelay: { seconds: 3 }
133+
frequency: { minutes: 10 }
134+
timeout: { minutes: 15 }

‎backstage/backstage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.20.3"
2+
"version": "1.35.0"
33
}

‎backstage/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
]
3535
},
3636
"devDependencies": {
37-
"@backstage/cli": "^0.26.2",
37+
"@backstage/cli": "^0.29.5",
3838
"@spotify/prettier-config": "^15.0.0",
3939
"concurrently": "^9.0.1",
4040
"lerna": "^8.0.0",

‎backstage/packages/app/package.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,30 @@
1818
"cy:run": "cypress run --browser chrome"
1919
},
2020
"dependencies": {
21-
"@backstage/app-defaults": "^1.4.5",
22-
"@backstage/catalog-model": "^1.4.3",
23-
"@backstage/cli": "^0.26.2",
24-
"@backstage/core-app-api": "^1.11.1",
25-
"@backstage/core-components": "^0.14.0",
26-
"@backstage/core-plugin-api": "^1.8.0",
27-
"@backstage/integration-react": "^1.1.21",
28-
"@backstage/plugin-api-docs": "^0.11.0",
29-
"@backstage/plugin-catalog": "^1.15.1",
30-
"@backstage/plugin-catalog-common": "^1.0.18",
31-
"@backstage/plugin-catalog-graph": "^0.4.0",
32-
"@backstage/plugin-catalog-import": "^0.12.0",
33-
"@backstage/plugin-catalog-react": "^1.9.1",
34-
"@backstage/plugin-github-actions": "^0.6.8",
35-
"@backstage/plugin-home": "^0.7.2",
36-
"@backstage/plugin-org": "^0.6.17",
37-
"@backstage/plugin-permission-react": "^0.4.17",
38-
"@backstage/plugin-scaffolder": "^1.16.1",
39-
"@backstage/plugin-search": "^1.4.3",
40-
"@backstage/plugin-search-react": "^1.7.3",
41-
"@backstage/plugin-techdocs": "^1.9.1",
42-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.2",
43-
"@backstage/plugin-techdocs-react": "^1.1.13",
44-
"@backstage/plugin-user-settings": "^0.8.0",
45-
"@backstage/theme": "^0.5.0",
21+
"@backstage/app-defaults": "^1.5.16",
22+
"@backstage/catalog-model": "^1.7.3",
23+
"@backstage/cli": "^0.29.5",
24+
"@backstage/core-app-api": "^1.15.4",
25+
"@backstage/core-components": "^0.16.3",
26+
"@backstage/core-plugin-api": "^1.10.3",
27+
"@backstage/integration-react": "^1.2.3",
28+
"@backstage/plugin-api-docs": "^0.12.3",
29+
"@backstage/plugin-catalog": "^1.26.1",
30+
"@backstage/plugin-catalog-common": "^1.1.3",
31+
"@backstage/plugin-catalog-graph": "^0.4.15",
32+
"@backstage/plugin-catalog-import": "^0.12.9",
33+
"@backstage/plugin-catalog-react": "^1.15.1",
34+
"@backstage/plugin-home": "^0.8.4",
35+
"@backstage/plugin-org": "^0.6.35",
36+
"@backstage/plugin-permission-react": "^0.4.30",
37+
"@backstage/plugin-scaffolder": "^1.27.4",
38+
"@backstage/plugin-search": "^1.4.22",
39+
"@backstage/plugin-search-react": "^1.8.5",
40+
"@backstage/plugin-techdocs": "^1.12.1",
41+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.20",
42+
"@backstage/plugin-techdocs-react": "^1.2.13",
43+
"@backstage/plugin-user-settings": "^0.8.18",
44+
"@backstage/theme": "^0.6.3",
4645
"@immobiliarelabs/backstage-plugin-gitlab": "^6.0.0",
4746
"@internal/plugin-viewdocs-react": "^0.1.0",
4847
"@material-ui/core": "^4.12.2",
@@ -53,10 +52,11 @@
5352
"react-dom": "^17.0.2",
5453
"react-router": "^6.8.2",
5554
"react-router-dom": "^6.3.0",
56-
"react-use": "^17.2.4"
55+
"react-use": "^17.2.4",
56+
"@backstage-community/plugin-github-actions": "^0.6.16"
5757
},
5858
"devDependencies": {
59-
"@backstage/test-utils": "^1.4.5",
59+
"@backstage/test-utils": "^1.7.4",
6060
"@testing-library/jest-dom": "^6.0.0",
6161
"@testing-library/react": "^12.1.3",
6262
"@testing-library/user-event": "^14.0.0",

‎backstage/packages/app/src/App.tsx‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import { createApp } from '@backstage/app-defaults';
22
import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
3-
import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
3+
import {
4+
AlertDisplay,
5+
OAuthRequestDialog,
6+
SignInPage,
7+
} from '@backstage/core-components';
8+
import { githubAuthApiRef } from '@backstage/core-plugin-api';
49
import { apiDocsPlugin } from '@backstage/plugin-api-docs';
510
import {
611
CatalogEntityPage,
@@ -39,6 +44,22 @@ import { searchPage } from './components/search/SearchPage';
3944
import { PrefixNavigate } from './components/utils/PrefixNavigate';
4045

4146
const app = createApp({
47+
components: {
48+
SignInPage: props => (
49+
<SignInPage
50+
{...props}
51+
providers={[
52+
'guest',
53+
{
54+
id: 'github-auth-provider',
55+
title: 'GitHub',
56+
message: 'Sign in using GitHub',
57+
apiRef: githubAuthApiRef,
58+
},
59+
]}
60+
/>
61+
),
62+
},
4263
apis,
4364
bindRoutes({ bind }) {
4465
bind(catalogPlugin.externalRoutes, {

‎backstage/packages/app/src/components/catalog/EntityPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import {
4444
import {
4545
EntityGithubActionsContent,
4646
isGithubActionsAvailable,
47-
} from '@backstage/plugin-github-actions';
47+
} from '@backstage-community/plugin-github-actions';
4848
import {
4949
EntityGroupProfileCard,
5050
EntityMembersListCard,

‎backstage/packages/backend/package.json‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,34 @@
1616
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
1717
},
1818
"dependencies": {
19-
"@backstage/backend-common": "^0.23.2",
20-
"@backstage/backend-tasks": "^0.5.12",
21-
"@backstage/catalog-client": "^1.4.6",
22-
"@backstage/catalog-model": "^1.4.3",
23-
"@backstage/config": "^1.1.1",
24-
"@backstage/integration": "^1.9.0",
25-
"@backstage/plugin-auth-backend": "^0.22.3",
26-
"@backstage/plugin-auth-node": "^0.4.1",
27-
"@backstage/plugin-catalog-backend": "^1.15.0",
28-
"@backstage/plugin-catalog-backend-module-github": "^0.6.0",
29-
"@backstage/plugin-catalog-backend-module-gitlab": "^0.3.4",
30-
"@backstage/plugin-catalog-backend-module-ldap": "^0.7.0",
31-
"@backstage/plugin-catalog-backend-module-openapi": "^0.1.24",
32-
"@backstage/plugin-permission-common": "^0.8.0",
33-
"@backstage/plugin-permission-node": "^0.8.0",
34-
"@backstage/plugin-proxy-backend": "^0.5.2",
35-
"@backstage/plugin-scaffolder-backend": "^1.19.1",
36-
"@backstage/plugin-search-backend": "^1.4.7",
37-
"@backstage/plugin-search-backend-module-pg": "^0.5.16",
38-
"@backstage/plugin-search-backend-node": "^1.2.11",
39-
"@backstage/plugin-techdocs-backend": "^1.9.0",
19+
"@backstage/backend-common": "^0.25.0",
20+
"@backstage/backend-defaults": "^0.7.0",
21+
"@backstage/backend-plugin-api": "^1.1.1",
22+
"@backstage/backend-tasks": "^0.6.1",
23+
"@backstage/catalog-client": "^1.9.1",
24+
"@backstage/catalog-model": "^1.7.3",
25+
"@backstage/config": "^1.3.2",
26+
"@backstage/integration": "^1.16.1",
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-github": "^0.7.9",
33+
"@backstage/plugin-catalog-backend-module-gitlab": "^0.6.2",
34+
"@backstage/plugin-catalog-backend-module-ldap": "^0.11.1",
35+
"@backstage/plugin-catalog-backend-module-openapi": "^0.2.6",
36+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.4",
37+
"@backstage/plugin-permission-common": "^0.8.4",
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",
4047
"@diamondlightsource/plugin-scaffolder-backend-module-copier": "^0.3.4",
4148
"@immobiliarelabs/backstage-plugin-gitlab-backend": "^6.0.0",
4249
"better-sqlite3": "^11.0.0",
@@ -47,7 +54,7 @@
4754
"winston": "^3.2.1"
4855
},
4956
"devDependencies": {
50-
"@backstage/cli": "^0.26.2",
57+
"@backstage/cli": "^0.29.5",
5158
"@types/dockerode": "^3.3.0",
5259
"@types/express": "^4.17.6",
5360
"@types/express-serve-static-core": "^5.0.1",

0 commit comments

Comments
 (0)