From 36376778ecf6313b9765d4a175ed89b1b23777aa Mon Sep 17 00:00:00 2001 From: Omer Farooq Date: Sat, 29 Aug 2020 22:22:19 +1200 Subject: [PATCH] move processor config to catalog from backend --- app-config.yaml | 40 +++++++++---------- .../AzureApiReaderProcessor.test.ts | 2 +- .../processors/AzureApiReaderProcessor.ts | 2 +- .../BitbucketApiReaderProcessor.test.ts | 2 +- .../processors/BitbucketApiReaderProcessor.ts | 4 +- .../GithubApiReaderProcessor.test.ts | 2 +- .../processors/GithubApiReaderProcessor.ts | 2 +- .../GitlabApiReaderProcessor.test.ts | 2 +- .../processors/GitlabApiReaderProcessor.ts | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index a273e815c2..aac8e233f0 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -13,26 +13,6 @@ backend: database: client: sqlite3 connection: ':memory:' - processors: - githubApi: - privateToken: - $secret: - env: GITHUB_PRIVATE_TOKEN - bitbucketApi: - userName: - $secret: - env: BITBUCKET_USERNAME - appPassword: - $secret: - env: BITBUCKET_APP_PASSWORD - gitlabApi: - privateToken: - $secret: - env: GITLAB_PRIVATE_TOKEN - azureApi: - privateToken: - $secret: - env: AZURE_PRIVATE_TOKEN # See README.md in the proxy-backend plugin for information on the configuration format proxy: @@ -65,6 +45,26 @@ newrelic: key: NEW_RELIC_REST_API_KEY catalog: + processors: + githubApi: + privateToken: + $secret: + env: GITHUB_PRIVATE_TOKEN + bitbucketApi: + userName: + $secret: + env: BITBUCKET_USERNAME + appPassword: + $secret: + env: BITBUCKET_APP_PASSWORD + gitlabApi: + privateToken: + $secret: + env: GITLAB_PRIVATE_TOKEN + azureApi: + privateToken: + $secret: + env: AZURE_PRIVATE_TOKEN exampleEntityLocations: github: - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/artist-lookup-component.yaml diff --git a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts index 9e2b265b93..182343133e 100644 --- a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts +++ b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.test.ts @@ -23,7 +23,7 @@ describe('AzureApiReaderProcessor', () => { { context: '', data: { - backend: { + catalog: { processors: { azureApi: { privateToken: token, diff --git a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts index 94be3a9650..02b0981a27 100644 --- a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts @@ -26,7 +26,7 @@ export class AzureApiReaderProcessor implements LocationProcessor { constructor(config: Config) { this.privateToken = (config.getOptional( - 'backend.processors.azureApi.privateToken', + 'catalog.processors.azureApi.privateToken', ) as string) ?? ''; } diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.test.ts index ddc00c23fc..6c82f73e97 100644 --- a/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.test.ts +++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.test.ts @@ -26,7 +26,7 @@ describe('BitbucketApiReaderProcessor', () => { { context: '', data: { - backend: { + catalog: { processors: { bitbucketApi: { userName: userName, diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts index 90a6689adb..5f5b5750ee 100644 --- a/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts @@ -27,11 +27,11 @@ export class BitbucketApiReaderProcessor implements LocationProcessor { constructor(config: Config) { this.username = (config.getOptional( - 'backend.processors.bitbucketApi.userName', + 'catalog.processors.bitbucketApi.userName', ) as string) ?? ''; this.password = (config.getOptional( - 'backend.processors.bitbucketApi.appPassword', + 'catalog.processors.bitbucketApi.appPassword', ) as string) ?? ''; } diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.test.ts index 501562fe58..31537954f5 100644 --- a/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.test.ts +++ b/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.test.ts @@ -23,7 +23,7 @@ describe('GithubApiReaderProcessor', () => { { context: '', data: { - backend: { + catalog: { processors: { githubApi: { privateToken: token, diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.ts index ad549837d6..89e6c97ab1 100644 --- a/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/GithubApiReaderProcessor.ts @@ -26,7 +26,7 @@ export class GithubApiReaderProcessor implements LocationProcessor { constructor(config: Config) { this.privateToken = (config.getOptional( - 'backend.processors.githubApi.privateToken', + 'catalog.processors.githubApi.privateToken', ) as string) ?? ''; } diff --git a/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.test.ts index 2deae1dcb0..a239afee04 100644 --- a/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.test.ts +++ b/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.test.ts @@ -23,7 +23,7 @@ describe('GitlabApiReaderProcessor', () => { { context: '', data: { - backend: { + catalog: { processors: { gitlabApi: { privateToken: token, diff --git a/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts index c807389440..8915d73bb9 100644 --- a/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts @@ -26,7 +26,7 @@ export class GitlabApiReaderProcessor implements LocationProcessor { constructor(config: Config) { this.privateToken = (config.getOptional( - 'backend.processors.gitlabApi.privateToken', + 'catalog.processors.gitlabApi.privateToken', ) as string) ?? ''; }