Skip to content

Commit

Permalink
chore: run formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
voidrot committed Oct 24, 2023
1 parent ba445f1 commit bf5d0e8
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 21 deletions.
15 changes: 7 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

## 1.0.0 (2023-10-23)


### Features

* add ADR plugin ([edcabef](https://github.com/lab-ops/backstage/commit/edcabefeedd789cf80870866a7b94c5aac2070e1))
* add event processor ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
* add github auth ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
* add github discovery ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
* add github events backend ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
* update techdocs ([edcabef](https://github.com/lab-ops/backstage/commit/edcabefeedd789cf80870866a7b94c5aac2070e1))
* upgrade deprecated ScaffolderEntitiesProcessor ([ad1ca26](https://github.com/lab-ops/backstage/commit/ad1ca26845266da7b2ec72f982bdb322355ee149))
- add ADR plugin ([edcabef](https://github.com/lab-ops/backstage/commit/edcabefeedd789cf80870866a7b94c5aac2070e1))
- add event processor ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
- add github auth ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
- add github discovery ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
- add github events backend ([cd6d2a5](https://github.com/lab-ops/backstage/commit/cd6d2a54a692f474c94ee53cc7ec6db333edc0b0))
- update techdocs ([edcabef](https://github.com/lab-ops/backstage/commit/edcabefeedd789cf80870866a7b94c5aac2070e1))
- upgrade deprecated ScaffolderEntitiesProcessor ([ad1ca26](https://github.com/lab-ops/backstage/commit/ad1ca26845266da7b2ec72f982bdb322355ee149))
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Backstage](https://backstage.io)

Version: 1.0.0 <!-- x-release-please-version -->
Version: 1.0.0 <!-- x-release-please-version -->

This is your newly scaffolded Backstage App, Good Luck!

Expand Down
5 changes: 1 addition & 4 deletions app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ integrations:
webhookSecret: ${GITHUB_CLIENT_WEBHOOK_SECRET}
privateKey: ${GITHUB_CLIENT_PRIVATE_KEY}


proxy:
### Example for how to add a proxy endpoint for the frontend.
### A typical reason to do this is to handle HTTPS and CORS for internal services.
Expand Down Expand Up @@ -79,7 +78,6 @@ auth:
# clientId: ${GITHUB_CLIENT_ID}
# clientSecret: ${GITHUB_CLIENT_SECRET}


scaffolder:
# see https://backstage.io/docs/features/software-templates/configuration for software template options

Expand Down Expand Up @@ -123,7 +121,7 @@ catalog:
# - type: url
# target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all.yaml

## Uncomment these lines to add an example org
## Uncomment these lines to add an example org
# - type: url
# target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
# rules:
Expand All @@ -134,7 +132,6 @@ events:
github:
webhookSecret: ${GITHUB_CLIENT_WEBHOOK_SECRET}


kubernetes:
serviceLocatorMethod:
type: 'multiTenant'
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ services:
POSTGRES_DB: postgres
PGDATA: /var/lib/postgresql/data/pgdata
ports:
- 5432:5432
- 5432:5432
volumes:
- postgres:/var/lib/postgresql/data
- postgres:/var/lib/postgresql/data

volumes:
postgres:
3 changes: 2 additions & 1 deletion packages/app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import { SearchPage } from '@backstage/plugin-search';
import { TechRadarPage } from '@backstage/plugin-tech-radar';
import {
DefaultTechDocsHome,
TechDocsIndexPage, techdocsPlugin,
TechDocsIndexPage,
techdocsPlugin,
TechDocsReaderPage,
} from '@backstage/plugin-techdocs';
import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
Expand Down
6 changes: 4 additions & 2 deletions packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import search from './plugins/search';
import { PluginEnvironment } from './types';
import { ServerPermissionClient } from '@backstage/plugin-permission-node';
import { DefaultIdentityClient } from '@backstage/plugin-auth-node';
import {DefaultEventBroker} from "@backstage/plugin-events-backend";
import { DefaultEventBroker } from '@backstage/plugin-events-backend';
import adr from './plugins/adr';
import kubernetes from './plugins/kubernetes';

Expand All @@ -41,7 +41,9 @@ function makeCreateEnv(config: Config) {
const discovery = HostDiscovery.fromConfig(config);
const cacheManager = CacheManager.fromConfig(config);
const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
const tokenManager = process.env.BACKSTAGE_BACKEND_AUTH ? ServerTokenManager.fromConfig(config, { logger: root }) :ServerTokenManager.noop()
const tokenManager = process.env.BACKSTAGE_BACKEND_AUTH
? ServerTokenManager.fromConfig(config, { logger: root })
: ServerTokenManager.noop();
const taskScheduler = TaskScheduler.fromConfig(config, { databaseManager });
const eventBroker = new DefaultEventBroker(root.child({ type: 'plugin' }));

Expand Down
6 changes: 4 additions & 2 deletions packages/backend/src/plugins/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ import {
} from '@backstage/plugin-events-backend';
import { Router } from 'express';
import { PluginEnvironment } from '../types';
import { createGithubSignatureValidator, GithubEventRouter } from '@backstage/plugin-events-backend-module-github';
import {
createGithubSignatureValidator,
GithubEventRouter,
} from '@backstage/plugin-events-backend-module-github';

export default async function createPlugin(
env: PluginEnvironment,
): Promise<Router> {
const eventsRouter = Router();


const http = HttpPostIngressEventPublisher.fromConfig({
config: env.config,
ingresses: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { PluginTaskScheduler } from '@backstage/backend-tasks';
import { PermissionEvaluator } from '@backstage/plugin-permission-common';
import { IdentityApi } from '@backstage/plugin-auth-node';
import {EventBroker} from "@backstage/plugin-events-node";
import { EventBroker } from '@backstage/plugin-events-node';

export type PluginEnvironment = {
logger: Logger;
Expand Down

0 comments on commit bf5d0e8

Please sign in to comment.