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

Merge pull request #1813 from spotify/rugvip/cli-common

Browse Source 
cli: separate out path discovery logic that's common to CLIs, backend and config
This commit is contained in:
Patrik Oldsberg
2020-08-05 12:10:25 +02:00
committed by GitHub
parent a6e7029504 cd6febaf2d
commit 2ecd8ae8dd
36 changed files with 266 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/package.json
-1
View File
@@ -21,7 +21,6 @@
"@backstage/backend-common": "^0.1.1-alpha.16",
"@backstage/catalog-model": "^0.1.1-alpha.16",
"@backstage/config": "^0.1.1-alpha.16",
"@backstage/config-loader": "^0.1.1-alpha.16",
"@backstage/plugin-auth-backend": "^0.1.1-alpha.16",
"@backstage/plugin-catalog-backend": "^0.1.1-alpha.16",
"@backstage/plugin-identity-backend": "^0.1.1-alpha.16",
packages/backend/src/index.ts
+2 -2
View File
@@ -24,11 +24,11 @@
import {
createServiceBuilder,
loadBackendConfig,
getRootLogger,
useHotMemoize,
} from '@backstage/backend-common';
import { ConfigReader, AppConfig } from '@backstage/config';
import { loadConfig } from '@backstage/config-loader';
import knex, { PgConnectionConfig } from 'knex';
import healthcheck from './plugins/healthcheck';
import auth from './plugins/auth';
@@ -85,7 +85,7 @@ function makeCreateEnv(loadedConfigs: AppConfig[]) {
}
async function main() {
const configs = await loadConfig({ shouldReadSecrets: true });
const configs = await loadBackendConfig();
const configReader = ConfigReader.fromConfigs(configs);
const createEnv = makeCreateEnv(configs);