paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 41 Packages Projects Releases Wiki Activity

Merge branch 'backstage:master' into 7340-remote-config-fix

Browse Source
This commit is contained in:
Praveen Ranjan Keshri
2021-12-07 22:46:46 +05:30
committed by GitHub
parent 776180b740 3421826ca8
commit d5d69f1169
593 changed files with 26063 additions and 2542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/CHANGELOG.md
+44
View File
@@ -1,5 +1,49 @@
# example-backend
## 0.2.55
### Patch Changes
- Updated dependencies
- @backstage/integration@0.6.10
- @backstage/plugin-scaffolder-backend@0.15.15
- @backstage/plugin-auth-backend@0.4.10
- @backstage/plugin-kubernetes-backend@0.3.20
- @backstage/plugin-badges-backend@0.1.13
- @backstage/plugin-catalog-backend@0.19.0
- @backstage/plugin-code-coverage-backend@0.1.16
- @backstage/plugin-jenkins-backend@0.1.9
- @backstage/plugin-tech-insights-backend@0.1.3
- @backstage/plugin-techdocs-backend@0.11.0
- @backstage/plugin-todo-backend@0.1.14
- @backstage/backend-common@0.9.12
- @backstage/plugin-azure-devops-backend@0.2.3
- @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.2
- @backstage/plugin-tech-insights-node@0.1.1
- example-app@0.2.55
## 0.2.54
### Patch Changes
- Updated dependencies
- @backstage/plugin-kubernetes-backend@0.3.19
- @backstage/plugin-tech-insights-backend@0.1.2
- @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.1
- @backstage/plugin-auth-backend@0.4.9
- @backstage/plugin-scaffolder-backend@0.15.14
- @backstage/plugin-catalog-backend@0.18.0
- @backstage/plugin-kafka-backend@0.2.12
- @backstage/backend-common@0.9.11
- @backstage/plugin-azure-devops-backend@0.2.2
- @backstage/plugin-badges-backend@0.1.12
- @backstage/plugin-code-coverage-backend@0.1.15
- @backstage/plugin-jenkins-backend@0.1.8
- @backstage/plugin-proxy-backend@0.2.14
- @backstage/plugin-rollbar-backend@0.1.16
- @backstage/plugin-search-backend@0.2.7
- @backstage/plugin-techdocs-backend@0.10.9
## 0.2.52
### Patch Changes
packages/backend/package.json
+22 -22
View File
@@ -1,6 +1,6 @@
{
"name": "example-backend",
"version": "0.2.52",
"version": "0.2.55",
"main": "dist/index.cjs.js",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -24,39 +24,39 @@
"migrate:create": "knex migrate:make -x ts"
},
"dependencies": {
"@backstage/backend-common": "^0.9.10",
"@backstage/backend-common": "^0.9.12",
"@backstage/catalog-client": "^0.5.2",
"@backstage/catalog-model": "^0.9.7",
"@backstage/config": "^0.1.10",
"@backstage/integration": "^0.6.8",
"@backstage/integration": "^0.6.10",
"@backstage/plugin-app-backend": "^0.3.19",
"@backstage/plugin-auth-backend": "^0.4.8",
"@backstage/plugin-azure-devops-backend": "^0.2.1",
"@backstage/plugin-badges-backend": "^0.1.11",
"@backstage/plugin-catalog-backend": "^0.17.4",
"@backstage/plugin-code-coverage-backend": "^0.1.14",
"@backstage/plugin-auth-backend": "^0.4.10",
"@backstage/plugin-azure-devops-backend": "^0.2.3",
"@backstage/plugin-badges-backend": "^0.1.13",
"@backstage/plugin-catalog-backend": "^0.19.0",
"@backstage/plugin-code-coverage-backend": "^0.1.16",
"@backstage/plugin-graphql-backend": "^0.1.9",
"@backstage/plugin-jenkins-backend": "^0.1.7",
"@backstage/plugin-kubernetes-backend": "^0.3.18",
"@backstage/plugin-kafka-backend": "^0.2.11",
"@backstage/plugin-proxy-backend": "^0.2.13",
"@backstage/plugin-rollbar-backend": "^0.1.15",
"@backstage/plugin-scaffolder-backend": "^0.15.13",
"@backstage/plugin-jenkins-backend": "^0.1.9",
"@backstage/plugin-kubernetes-backend": "^0.3.20",
"@backstage/plugin-kafka-backend": "^0.2.12",
"@backstage/plugin-proxy-backend": "^0.2.14",
"@backstage/plugin-rollbar-backend": "^0.1.16",
"@backstage/plugin-scaffolder-backend": "^0.15.15",
"@backstage/plugin-scaffolder-backend-module-rails": "^0.1.7",
"@backstage/plugin-search-backend": "^0.2.6",
"@backstage/plugin-search-backend": "^0.2.7",
"@backstage/plugin-search-backend-node": "^0.4.2",
"@backstage/plugin-search-backend-module-elasticsearch": "^0.0.5",
"@backstage/plugin-search-backend-module-pg": "^0.2.1",
"@backstage/plugin-techdocs-backend": "^0.10.8",
"@backstage/plugin-tech-insights-backend": "^0.1.1",
"@backstage/plugin-tech-insights-node": "^0.1.0",
"@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.0",
"@backstage/plugin-todo-backend": "^0.1.13",
"@backstage/plugin-techdocs-backend": "^0.11.0",
"@backstage/plugin-tech-insights-backend": "^0.1.3",
"@backstage/plugin-tech-insights-node": "^0.1.1",
"@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.2",
"@backstage/plugin-todo-backend": "^0.1.14",
"@gitbeaker/node": "^34.6.0",
"@octokit/rest": "^18.5.3",
"azure-devops-node-api": "^11.0.1",
"dockerode": "^3.3.1",
"example-app": "^0.2.53",
"example-app": "^0.2.55",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"express-prom-bundle": "^6.3.6",
@@ -68,7 +68,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.9.0",
"@backstage/cli": "^0.10.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5"
packages/backend/src/index.ts
+3 -1
View File
@@ -33,6 +33,7 @@ import {
SingleHostDiscovery,
UrlReaders,
useHotMemoize,
ServerTokenManager,
} from '@backstage/backend-common';
import { Config } from '@backstage/config';
import healthcheck from './plugins/healthcheck';
@@ -60,6 +61,7 @@ function makeCreateEnv(config: Config) {
const root = getRootLogger();
const reader = UrlReaders.default({ logger: root, config });
const discovery = SingleHostDiscovery.fromConfig(config);
const tokenManager = ServerTokenManager.noop();
root.info(`Created UrlReader ${reader}`);
@@ -70,7 +72,7 @@ function makeCreateEnv(config: Config) {
const logger = root.child({ type: 'plugin', plugin });
const database = databaseManager.forPlugin(plugin);
const cache = cacheManager.forPlugin(plugin);
return { logger, cache, database, config, reader, discovery };
return { logger, cache, database, config, reader, discovery, tokenManager };
};
}
packages/backend/src/plugins/search.ts
+6 -1
View File
@@ -59,6 +59,7 @@ export default async function createPlugin({
discovery,
config,
database,
tokenManager,
}: PluginEnvironment) {
// Initialize a connection to a search engine.
const searchEngine = await createSearchEngine({ config, logger, database });
@@ -68,7 +69,10 @@ export default async function createPlugin({
// particular collator gathers entities from the software catalog.
indexBuilder.addCollator({
defaultRefreshIntervalSeconds: 600,
collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
collator: DefaultCatalogCollator.fromConfig(config, {
discovery,
tokenManager,
}),
});
indexBuilder.addCollator({
@@ -76,6 +80,7 @@ export default async function createPlugin({
collator: DefaultTechDocsCollator.fromConfig(config, {
discovery,
logger,
tokenManager,
}),
});
packages/backend/src/plugins/techdocs.ts
+2
View File
@@ -29,6 +29,7 @@ export default async function createPlugin({
config,
discovery,
reader,
cache,
}: PluginEnvironment): Promise<Router> {
// Preparers are responsible for fetching source files for documentation.
const preparers = await Preparers.fromConfig(config, {
@@ -64,5 +65,6 @@ export default async function createPlugin({
logger,
config,
discovery,
cache,
});
}
packages/backend/src/types.ts
+2
View File
@@ -20,6 +20,7 @@ import {
PluginCacheManager,
PluginDatabaseManager,
PluginEndpointDiscovery,
TokenManager,
UrlReader,
} from '@backstage/backend-common';
@@ -30,4 +31,5 @@ export type PluginEnvironment = {
config: Config;
reader: UrlReader;
discovery: PluginEndpointDiscovery;
tokenManager: TokenManager;
};