diff --git a/app-config.yaml b/app-config.yaml index dd72051189..fd9263a5e8 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -218,6 +218,8 @@ catalog: - System - Domain - Location + sources: + - github.com/backstage processors: ldapOrg: diff --git a/plugins/catalog-backend/src/ingestion/CatalogRules.ts b/plugins/catalog-backend/src/ingestion/CatalogRules.ts index 903774b2f9..398133036a 100644 --- a/plugins/catalog-backend/src/ingestion/CatalogRules.ts +++ b/plugins/catalog-backend/src/ingestion/CatalogRules.ts @@ -98,7 +98,7 @@ export class DefaultCatalogRulesEnforcer implements CatalogRulesEnforcer { if (config.has('catalog.rules')) { const globalRules = config.getConfigArray('catalog.rules').map(sub => ({ allow: sub.getStringArray('allow').map(kind => ({ kind })), - sources: sub.getStringArray('sources').map(source => ({ source })), + sources: (sub.getOptionalStringArray('sources') || []).map(source => ({ source })), })); rules.push(...globalRules); } else { @@ -143,9 +143,9 @@ export class DefaultCatalogRulesEnforcer implements CatalogRulesEnforcer { return false; } - if (this.matchEntity(entity, rule.allow)) { - return true; - } + if (this.matchEntity(entity, rule.allow)) { + return true; + } } return false; diff --git a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx index 0236e7c4d0..cec35574fc 100644 --- a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx +++ b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx @@ -27,17 +27,13 @@ import React from 'react'; import { ImportInfoCard } from '../ImportInfoCard'; import { ImportStepper } from '../ImportStepper'; -interface DefaultImportPageProps { - filters?: Array; -} /** * The default catalog import page. * * @public */ -export const DefaultImportPage = (props: DefaultImportPageProps = { filters: [] }) => { - const { filters } = props; +export const DefaultImportPage = () => { const configApi = useApi(configApiRef); const appTitle = configApi.getOptional('app.title') || 'Backstage'; @@ -58,7 +54,7 @@ export const DefaultImportPage = (props: DefaultImportPageProps = { filters: [] - + diff --git a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx index d44a71dbdb..94dff39d0f 100644 --- a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx +++ b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx @@ -51,7 +51,6 @@ export interface StepperProvider { analyze: ( s: Extract, opts: { apis: StepperApis }, - filters?: String[], ) => StepConfiguration; prepare: ( s: Extract,