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

Merge branch 'master' of github.com:spotify/backstage into mob/catalog-in-gql

Browse Source 
* 'master' of github.com:spotify/backstage:
  v0.1.1-alpha.17
  create-app: remove copyright headers from backend template
  create-app: update tech-docs backend wiring
  create-app: add empty list of auth providers
  cli: fix e2e package references
  Add api-catalog.yaml file (#1822)
  cli: update e2e-test to include dist versions of backend packages
  chore(deps): bump helmet from 3.23.2 to 4.0.0
  feat: add simple healthcheck to app container
  packages/cli: fix packaging of packages without deps
  config-loader,backend-common: refactor config loading to pass in path and use common util for backend
  techdocs-cli: import version from techdocs-cli directly
  create-app: use cli-common to discover paths and import version directly
  cli: use cli-common to discover paths
  packages: add cli-common
This commit is contained in:
blam
2020-08-06 10:35:13 +02:00
parent 11de4c5f4b 24ed336579
commit cc80ff7d46
87 changed files with 567 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/package.json
+14 -15
View File
@@ -1,6 +1,6 @@
{
"name": "example-backend",
"version": "0.1.1-alpha.16",
"version": "0.1.1-alpha.17",
"main": "dist/index.cjs.js",
"types": "src/index.ts",
"private": true,
@@ -18,19 +18,18 @@
"migrate:create": "knex migrate:make -x ts"
},
"dependencies": {
"@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",
"@backstage/plugin-proxy-backend": "^0.1.1-alpha.16",
"@backstage/plugin-rollbar-backend": "^0.1.1-alpha.16",
"@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.16",
"@backstage/plugin-sentry-backend": "^0.1.1-alpha.16",
"@backstage/plugin-techdocs-backend": "^0.1.1-alpha.16",
"@backstage/plugin-graphql-backend": "^0.1.1-alpha.16",
"@backstage/backend-common": "^0.1.1-alpha.17",
"@backstage/catalog-model": "^0.1.1-alpha.17",
"@backstage/config": "^0.1.1-alpha.17",
"@backstage/plugin-auth-backend": "^0.1.1-alpha.17",
"@backstage/plugin-catalog-backend": "^0.1.1-alpha.17",
"@backstage/plugin-graphql-backend": "^0.1.1-alpha.17",
"@backstage/plugin-identity-backend": "^0.1.1-alpha.17",
"@backstage/plugin-proxy-backend": "^0.1.1-alpha.17",
"@backstage/plugin-rollbar-backend": "^0.1.1-alpha.17",
"@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.17",
"@backstage/plugin-sentry-backend": "^0.1.1-alpha.17",
"@backstage/plugin-techdocs-backend": "^0.1.1-alpha.17",
"@octokit/rest": "^18.0.0",
"dockerode": "^3.2.0",
"express": "^4.17.1",
@@ -40,7 +39,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.16",
"@backstage/cli": "^0.1.1-alpha.17",
"@types/dockerode": "^2.5.32",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
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);
const healthcheckEnv = useHotMemoize(module, () => createEnv('healthcheck'));