Skip to content

File tree

4 files changed

+40
-65
lines changed

4 files changed

+40
-65
lines changed

backstage/app-config.yaml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,6 @@ auth:
6161
clientId: ${GITHUB_APP_CLIENT_ID}
6262
clientSecret: ${GITHUB_APP_SECRET}
6363

64-
ldap:
65-
providers:
66-
- target: ldap://ralfed.cclrc.ac.uk
67-
users:
68-
dn: ou=dls,dc=fed,dc=cclrc,dc=ac,dc=uk
69-
options:
70-
filter: (memberOf=cn=DLSLTD_Staff,OU=Automatic Groups,DC=fed,DC=cclrc,DC=ac,DC=uk)
71-
paged: true
72-
map:
73-
name: cn
74-
displayName: displayName
75-
groups:
76-
dn: dc=fed,dc=cclrc,dc=ac,dc=uk
77-
options:
78-
filter: (objectClass=group)
79-
8064
catalog:
8165
readonly: true
8266
import:
@@ -116,6 +100,27 @@ catalog:
116100
minutes: 60
117101
timeout:
118102
minutes: 30
103+
ldapOrg:
104+
default:
105+
target: ldap://ralfed.cclrc.ac.uk
106+
bind:
107+
dn: uid=ldap-reader-user,ou=people,ou=example,dc=example,dc=net
108+
secret: dW5hdXRoZW50aWNhdGVkIExEQVAK
109+
schedule:
110+
frequency: PT1H
111+
timeout: PT10M
112+
users:
113+
dn: ou=dls,dc=fed,dc=cclrc,dc=ac,dc=uk
114+
options:
115+
filter: (memberOf=cn=DLSLTD_Staff,OU=Automatic Groups,DC=fed,DC=cclrc,DC=ac,DC=uk)
116+
paged: true
117+
map:
118+
name: cn
119+
displayName: displayName
120+
groups:
121+
dn: dc=fed,dc=cclrc,dc=ac,dc=uk
122+
options:
123+
filter: (objectClass=group)
119124

120125
search:
121126
collators:
@@ -126,6 +131,7 @@ search:
126131
frequency: { minutes: 10 }
127132
timeout: { minutes: 15 }
128133
techdocs:
129-
initialDelay: { seconds: 3 }
130-
frequency: { minutes: 10 }
131-
timeout: { minutes: 15 }
134+
schedule:
135+
initialDelay: { seconds: 3 }
136+
frequency: { minutes: 10 }
137+
timeout: { minutes: 15 }

backstage/packages/backend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"@backstage/plugin-catalog-backend-module-gitlab": "^0.6.2",
3232
"@backstage/plugin-catalog-backend-module-ldap": "^0.11.1",
3333
"@backstage/plugin-catalog-backend-module-openapi": "^0.2.6",
34+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.4",
3435
"@backstage/plugin-permission-common": "^0.8.4",
3536
"@backstage/plugin-permission-node": "^0.8.7",
3637
"@backstage/plugin-proxy-backend": "^0.5.10",

backstage/packages/backend/src/index.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,20 @@ import {
77

88
const backend = createBackend();
99
backend.add(legacyPlugin('auth', import('./plugins/auth')));
10-
backend.add(legacyPlugin('catalog', import('./plugins/catalog')));
10+
11+
// Catalog with Scaffolder module
12+
backend.add(import('@backstage/plugin-catalog-backend'));
13+
backend.add(
14+
import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
15+
);
16+
// LDAP identity provider
17+
backend.add(import('@backstage/plugin-catalog-backend-module-ldap'));
18+
// GitHub entity provider
19+
backend.add(import('@backstage/plugin-catalog-backend-module-github'));
20+
// GitLab entity provider
21+
backend.add(import('@backstage/plugin-catalog-backend-module-gitlab'));
22+
// Placeholder resolver for openapi and asyncapi
23+
backend.add(import('@backstage/plugin-catalog-backend-module-openapi'));
1124

1225
// GitLab
1326
backend.add(gitlabPlugin);

backstage/packages/backend/src/plugins/catalog.ts

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)