diff --git a/plugins/catalog-backend/report.api.md b/plugins/catalog-backend/report.api.md index 375f14e5f8..51dc76f385 100644 --- a/plugins/catalog-backend/report.api.md +++ b/plugins/catalog-backend/report.api.md @@ -516,36 +516,35 @@ export class UrlReaderProcessor implements CatalogProcessor_2 { // src/deprecated.d.ts:207:22 - (ae-undocumented) Missing documentation for "defaultCatalogCollatorEntityTransformer". // src/deprecated.d.ts:212:1 - (ae-undocumented) Missing documentation for "DefaultCatalogCollatorFactoryOptions". // src/deprecated.d.ts:217:1 - (ae-undocumented) Missing documentation for "CatalogCollatorEntityTransformer". -// src/modules/codeowners/CodeOwnersProcessor.d.ts:8:1 - (ae-undocumented) Missing documentation for "CodeOwnersProcessor". -// src/modules/codeowners/CodeOwnersProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "fromConfig". -// src/modules/codeowners/CodeOwnersProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/codeowners/CodeOwnersProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "preProcessEntity". -// src/modules/core/AnnotateLocationEntityProcessor.d.ts:6:1 - (ae-undocumented) Missing documentation for "AnnotateLocationEntityProcessor". -// src/modules/core/AnnotateLocationEntityProcessor.d.ts:11:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/AnnotateLocationEntityProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "preProcessEntity". -// src/modules/core/AnnotateScmSlugEntityProcessor.d.ts:7:1 - (ae-undocumented) Missing documentation for "AnnotateScmSlugEntityProcessor". -// src/modules/core/AnnotateScmSlugEntityProcessor.d.ts:13:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/AnnotateScmSlugEntityProcessor.d.ts:14:5 - (ae-undocumented) Missing documentation for "fromConfig". -// src/modules/core/AnnotateScmSlugEntityProcessor.d.ts:17:5 - (ae-undocumented) Missing documentation for "preProcessEntity". -// src/modules/core/BuiltinKindsEntityProcessor.d.ts:5:1 - (ae-undocumented) Missing documentation for "BuiltinKindsEntityProcessor". -// src/modules/core/BuiltinKindsEntityProcessor.d.ts:7:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/BuiltinKindsEntityProcessor.d.ts:8:5 - (ae-undocumented) Missing documentation for "validateEntityKind". -// src/modules/core/BuiltinKindsEntityProcessor.d.ts:9:5 - (ae-undocumented) Missing documentation for "postProcessEntity". -// src/modules/core/FileReaderProcessor.d.ts:4:1 - (ae-undocumented) Missing documentation for "FileReaderProcessor". -// src/modules/core/FileReaderProcessor.d.ts:5:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/FileReaderProcessor.d.ts:6:5 - (ae-undocumented) Missing documentation for "readLocation". -// src/modules/core/LocationEntityProcessor.d.ts:10:1 - (ae-undocumented) Missing documentation for "LocationEntityProcessorOptions". -// src/modules/core/LocationEntityProcessor.d.ts:28:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/LocationEntityProcessor.d.ts:29:5 - (ae-undocumented) Missing documentation for "postProcessEntity". -// src/modules/core/PlaceholderProcessor.d.ts:8:1 - (ae-undocumented) Missing documentation for "PlaceholderProcessorOptions". -// src/modules/core/PlaceholderProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/PlaceholderProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "preProcessEntity". -// src/modules/core/UrlReaderProcessor.d.ts:5:1 - (ae-undocumented) Missing documentation for "UrlReaderProcessor". -// src/modules/core/UrlReaderProcessor.d.ts:11:5 - (ae-undocumented) Missing documentation for "getProcessorName". -// src/modules/core/UrlReaderProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "readLocation". -// src/modules/util/parse.d.ts:5:1 - (ae-undocumented) Missing documentation for "parseEntityYaml". // src/processing/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "start". // src/processing/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "stop". +// src/processors/AnnotateLocationEntityProcessor.d.ts:6:1 - (ae-undocumented) Missing documentation for "AnnotateLocationEntityProcessor". +// src/processors/AnnotateLocationEntityProcessor.d.ts:11:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/AnnotateLocationEntityProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "preProcessEntity". +// src/processors/AnnotateScmSlugEntityProcessor.d.ts:7:1 - (ae-undocumented) Missing documentation for "AnnotateScmSlugEntityProcessor". +// src/processors/AnnotateScmSlugEntityProcessor.d.ts:13:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/AnnotateScmSlugEntityProcessor.d.ts:14:5 - (ae-undocumented) Missing documentation for "fromConfig". +// src/processors/AnnotateScmSlugEntityProcessor.d.ts:17:5 - (ae-undocumented) Missing documentation for "preProcessEntity". +// src/processors/BuiltinKindsEntityProcessor.d.ts:5:1 - (ae-undocumented) Missing documentation for "BuiltinKindsEntityProcessor". +// src/processors/BuiltinKindsEntityProcessor.d.ts:7:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/BuiltinKindsEntityProcessor.d.ts:8:5 - (ae-undocumented) Missing documentation for "validateEntityKind". +// src/processors/BuiltinKindsEntityProcessor.d.ts:9:5 - (ae-undocumented) Missing documentation for "postProcessEntity". +// src/processors/CodeOwnersProcessor.d.ts:8:1 - (ae-undocumented) Missing documentation for "CodeOwnersProcessor". +// src/processors/CodeOwnersProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "fromConfig". +// src/processors/CodeOwnersProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/CodeOwnersProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "preProcessEntity". +// src/processors/FileReaderProcessor.d.ts:4:1 - (ae-undocumented) Missing documentation for "FileReaderProcessor". +// src/processors/FileReaderProcessor.d.ts:5:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/FileReaderProcessor.d.ts:6:5 - (ae-undocumented) Missing documentation for "readLocation". +// src/processors/LocationEntityProcessor.d.ts:10:1 - (ae-undocumented) Missing documentation for "LocationEntityProcessorOptions". +// src/processors/LocationEntityProcessor.d.ts:28:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/LocationEntityProcessor.d.ts:29:5 - (ae-undocumented) Missing documentation for "postProcessEntity". +// src/processors/PlaceholderProcessor.d.ts:8:1 - (ae-undocumented) Missing documentation for "PlaceholderProcessorOptions". +// src/processors/PlaceholderProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/PlaceholderProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "preProcessEntity". +// src/processors/UrlReaderProcessor.d.ts:5:1 - (ae-undocumented) Missing documentation for "UrlReaderProcessor". +// src/processors/UrlReaderProcessor.d.ts:11:5 - (ae-undocumented) Missing documentation for "getProcessorName". +// src/processors/UrlReaderProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "readLocation". // src/search/DefaultCatalogCollator.d.ts:11:1 - (ae-undocumented) Missing documentation for "DefaultCatalogCollator". // src/search/DefaultCatalogCollator.d.ts:12:5 - (ae-undocumented) Missing documentation for "discovery". // src/search/DefaultCatalogCollator.d.ts:13:5 - (ae-undocumented) Missing documentation for "locationTemplate". @@ -559,4 +558,5 @@ export class UrlReaderProcessor implements CatalogProcessor_2 { // src/search/DefaultCatalogCollator.d.ts:33:5 - (ae-undocumented) Missing documentation for "execute". // src/service/CatalogBuilder.d.ts:19:1 - (ae-undocumented) Missing documentation for "CatalogEnvironment". // src/service/CatalogBuilder.d.ts:233:5 - (ae-undocumented) Missing documentation for "subscribe". +// src/util/parse.d.ts:5:1 - (ae-undocumented) Missing documentation for "parseEntityYaml". ``` diff --git a/plugins/catalog-backend/src/index.ts b/plugins/catalog-backend/src/index.ts index d3ffa9a974..e3374a6a8b 100644 --- a/plugins/catalog-backend/src/index.ts +++ b/plugins/catalog-backend/src/index.ts @@ -20,9 +20,10 @@ * @packageDocumentation */ -export * from './modules'; +export * from './processors'; export * from './processing'; export * from './search'; export * from './service'; export * from './deprecated'; export * from './constants'; +export * from './util'; diff --git a/plugins/catalog-backend/src/modules/codeowners/index.ts b/plugins/catalog-backend/src/modules/codeowners/index.ts deleted file mode 100644 index 6b7569ff07..0000000000 --- a/plugins/catalog-backend/src/modules/codeowners/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2022 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export { CodeOwnersProcessor } from './CodeOwnersProcessor'; diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts index e8d05e3f25..31d7c34b94 100644 --- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts +++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts @@ -33,7 +33,7 @@ import { } from '@backstage/plugin-catalog-node'; import { CatalogRulesEnforcer } from '../ingestion/CatalogRules'; import { DefaultCatalogProcessingOrchestrator } from './DefaultCatalogProcessingOrchestrator'; -import { defaultEntityDataParser } from '../modules/util/parse'; +import { defaultEntityDataParser } from '../util/parse'; import { ConfigReader } from '@backstage/config'; import { InputError } from '@backstage/errors'; import { mockServices } from '@backstage/backend-test-utils'; diff --git a/plugins/catalog-backend/src/processing/index.ts b/plugins/catalog-backend/src/processing/index.ts index 5ed8831779..6e5893c976 100644 --- a/plugins/catalog-backend/src/processing/index.ts +++ b/plugins/catalog-backend/src/processing/index.ts @@ -15,6 +15,5 @@ */ export type { CatalogProcessingEngine } from './types'; - export { createRandomProcessingInterval } from './refresh'; export type { ProcessingIntervalFunction } from './refresh'; diff --git a/plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.test.ts b/plugins/catalog-backend/src/processors/AnnotateLocationEntityProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.test.ts rename to plugins/catalog-backend/src/processors/AnnotateLocationEntityProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.ts b/plugins/catalog-backend/src/processors/AnnotateLocationEntityProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.ts rename to plugins/catalog-backend/src/processors/AnnotateLocationEntityProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.test.ts b/plugins/catalog-backend/src/processors/AnnotateScmSlugEntityProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.test.ts rename to plugins/catalog-backend/src/processors/AnnotateScmSlugEntityProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.ts b/plugins/catalog-backend/src/processors/AnnotateScmSlugEntityProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.ts rename to plugins/catalog-backend/src/processors/AnnotateScmSlugEntityProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/BuiltinKindsEntityProcessor.test.ts b/plugins/catalog-backend/src/processors/BuiltinKindsEntityProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/BuiltinKindsEntityProcessor.test.ts rename to plugins/catalog-backend/src/processors/BuiltinKindsEntityProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/BuiltinKindsEntityProcessor.ts b/plugins/catalog-backend/src/processors/BuiltinKindsEntityProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/BuiltinKindsEntityProcessor.ts rename to plugins/catalog-backend/src/processors/BuiltinKindsEntityProcessor.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.test.ts b/plugins/catalog-backend/src/processors/CodeOwnersProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.test.ts rename to plugins/catalog-backend/src/processors/CodeOwnersProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.ts b/plugins/catalog-backend/src/processors/CodeOwnersProcessor.ts similarity index 98% rename from plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.ts rename to plugins/catalog-backend/src/processors/CodeOwnersProcessor.ts index 9b8d2a3bbf..f6dc27101c 100644 --- a/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.ts +++ b/plugins/catalog-backend/src/processors/CodeOwnersProcessor.ts @@ -22,7 +22,7 @@ import { } from '@backstage/integration'; import { LocationSpec } from '@backstage/plugin-catalog-common'; import { CatalogProcessor } from '@backstage/plugin-catalog-node'; -import { findCodeOwnerByTarget } from './lib'; +import { findCodeOwnerByTarget } from './codeowners'; import { LoggerService, UrlReaderService } from '@backstage/backend-plugin-api'; const ALLOWED_KINDS = ['API', 'Component', 'Domain', 'Resource', 'System']; diff --git a/plugins/catalog-backend/src/modules/core/FileReaderProcessor.test.ts b/plugins/catalog-backend/src/processors/FileReaderProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/FileReaderProcessor.test.ts rename to plugins/catalog-backend/src/processors/FileReaderProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/FileReaderProcessor.ts b/plugins/catalog-backend/src/processors/FileReaderProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/FileReaderProcessor.ts rename to plugins/catalog-backend/src/processors/FileReaderProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/LocationEntityProcessor.test.ts b/plugins/catalog-backend/src/processors/LocationEntityProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/LocationEntityProcessor.test.ts rename to plugins/catalog-backend/src/processors/LocationEntityProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/LocationEntityProcessor.ts b/plugins/catalog-backend/src/processors/LocationEntityProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/LocationEntityProcessor.ts rename to plugins/catalog-backend/src/processors/LocationEntityProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts b/plugins/catalog-backend/src/processors/PlaceholderProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts rename to plugins/catalog-backend/src/processors/PlaceholderProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.ts b/plugins/catalog-backend/src/processors/PlaceholderProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/PlaceholderProcessor.ts rename to plugins/catalog-backend/src/processors/PlaceholderProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/UrlReaderProcessor.test.ts b/plugins/catalog-backend/src/processors/UrlReaderProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/UrlReaderProcessor.test.ts rename to plugins/catalog-backend/src/processors/UrlReaderProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/UrlReaderProcessor.ts b/plugins/catalog-backend/src/processors/UrlReaderProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/UrlReaderProcessor.ts rename to plugins/catalog-backend/src/processors/UrlReaderProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/awsS3/awsS3-mock-object.txt b/plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/awsS3/awsS3-mock-object.txt similarity index 100% rename from plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/awsS3/awsS3-mock-object.txt rename to plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/awsS3/awsS3-mock-object.txt diff --git a/plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/component.yaml b/plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/component.yaml similarity index 100% rename from plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/component.yaml rename to plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/component.yaml diff --git a/plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/dir/api.yaml b/plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/dir/api.yaml similarity index 100% rename from plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/dir/api.yaml rename to plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/dir/api.yaml diff --git a/plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/test.txt b/plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/test.txt similarity index 100% rename from plugins/catalog-backend/src/modules/core/__fixtures__/fileReaderProcessor/test.txt rename to plugins/catalog-backend/src/processors/__fixtures__/fileReaderProcessor/test.txt diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/index.ts b/plugins/catalog-backend/src/processors/codeowners/index.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/lib/index.ts rename to plugins/catalog-backend/src/processors/codeowners/index.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/read.test.ts b/plugins/catalog-backend/src/processors/codeowners/read.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/lib/read.test.ts rename to plugins/catalog-backend/src/processors/codeowners/read.test.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/read.ts b/plugins/catalog-backend/src/processors/codeowners/read.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/lib/read.ts rename to plugins/catalog-backend/src/processors/codeowners/read.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/resolve.test.ts b/plugins/catalog-backend/src/processors/codeowners/resolve.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/lib/resolve.test.ts rename to plugins/catalog-backend/src/processors/codeowners/resolve.test.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/resolve.ts b/plugins/catalog-backend/src/processors/codeowners/resolve.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/lib/resolve.ts rename to plugins/catalog-backend/src/processors/codeowners/resolve.ts diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/scm.ts b/plugins/catalog-backend/src/processors/codeowners/scm.ts similarity index 100% rename from plugins/catalog-backend/src/modules/codeowners/lib/scm.ts rename to plugins/catalog-backend/src/processors/codeowners/scm.ts diff --git a/plugins/catalog-backend/src/modules/core/index.ts b/plugins/catalog-backend/src/processors/index.ts similarity index 92% rename from plugins/catalog-backend/src/modules/core/index.ts rename to plugins/catalog-backend/src/processors/index.ts index e410c3824d..ee2204f20f 100644 --- a/plugins/catalog-backend/src/modules/core/index.ts +++ b/plugins/catalog-backend/src/processors/index.ts @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Backstage Authors + * Copyright 2022 The Backstage Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ export { AnnotateLocationEntityProcessor } from './AnnotateLocationEntityProcessor'; export { AnnotateScmSlugEntityProcessor } from './AnnotateScmSlugEntityProcessor'; export { BuiltinKindsEntityProcessor } from './BuiltinKindsEntityProcessor'; +export { CodeOwnersProcessor } from './CodeOwnersProcessor'; export { FileReaderProcessor } from './FileReaderProcessor'; export { LocationEntityProcessor } from './LocationEntityProcessor'; export type { LocationEntityProcessorOptions } from './LocationEntityProcessor'; export { PlaceholderProcessor } from './PlaceholderProcessor'; export type { PlaceholderProcessorOptions } from './PlaceholderProcessor'; export { UrlReaderProcessor } from './UrlReaderProcessor'; -export { parseEntityYaml } from '../util/parse'; export { transformLegacyPolicyToProcessor } from './transformLegacyPolicyToProcessor'; diff --git a/plugins/catalog-backend/src/modules/core/transformLegacyPolicyToProcessor.test.ts b/plugins/catalog-backend/src/processors/transformLegacyPolicyToProcessor.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/transformLegacyPolicyToProcessor.test.ts rename to plugins/catalog-backend/src/processors/transformLegacyPolicyToProcessor.test.ts diff --git a/plugins/catalog-backend/src/modules/core/transformLegacyPolicyToProcessor.ts b/plugins/catalog-backend/src/processors/transformLegacyPolicyToProcessor.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/transformLegacyPolicyToProcessor.ts rename to plugins/catalog-backend/src/processors/transformLegacyPolicyToProcessor.ts diff --git a/plugins/catalog-backend/src/modules/core/ConfigLocationEntityProvider.test.ts b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/core/ConfigLocationEntityProvider.test.ts rename to plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.test.ts diff --git a/plugins/catalog-backend/src/modules/core/ConfigLocationEntityProvider.ts b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.ts similarity index 94% rename from plugins/catalog-backend/src/modules/core/ConfigLocationEntityProvider.ts rename to plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.ts index 38f02195f3..9273beaf7f 100644 --- a/plugins/catalog-backend/src/modules/core/ConfigLocationEntityProvider.ts +++ b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.ts @@ -16,12 +16,12 @@ import { Config } from '@backstage/config'; import path from 'path'; -import { getEntityLocationRef } from '../../processing/util'; +import { getEntityLocationRef } from '../processing/util'; import { EntityProvider, EntityProviderConnection, } from '@backstage/plugin-catalog-node'; -import { locationSpecToLocationEntity } from '../../util/conversion'; +import { locationSpecToLocationEntity } from '../util/conversion'; export class ConfigLocationEntityProvider implements EntityProvider { constructor(private readonly config: Config) {} diff --git a/plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts b/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts similarity index 98% rename from plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts rename to plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts index dafd6e13d8..4f302308ae 100644 --- a/plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts +++ b/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts @@ -17,13 +17,13 @@ import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils'; import { ANNOTATION_ORIGIN_LOCATION } from '@backstage/catalog-model'; import { v4 as uuid } from 'uuid'; -import { applyDatabaseMigrations } from '../../database/migrations'; +import { applyDatabaseMigrations } from '../database/migrations'; import { DbFinalEntitiesRow, DbLocationsRow, DbRefreshStateRow, DbSearchRow, -} from '../../database/tables'; +} from '../database/tables'; import { DefaultLocationStore } from './DefaultLocationStore'; jest.setTimeout(60_000); diff --git a/plugins/catalog-backend/src/modules/core/DefaultLocationStore.ts b/plugins/catalog-backend/src/providers/DefaultLocationStore.ts similarity index 96% rename from plugins/catalog-backend/src/modules/core/DefaultLocationStore.ts rename to plugins/catalog-backend/src/providers/DefaultLocationStore.ts index fcf576b93e..2b3459ecb1 100644 --- a/plugins/catalog-backend/src/modules/core/DefaultLocationStore.ts +++ b/plugins/catalog-backend/src/providers/DefaultLocationStore.ts @@ -22,14 +22,14 @@ import { DbLocationsRow, DbRefreshStateRow, DbSearchRow, -} from '../../database/tables'; -import { getEntityLocationRef } from '../../processing/util'; +} from '../database/tables'; +import { getEntityLocationRef } from '../processing/util'; import { EntityProvider, EntityProviderConnection, } from '@backstage/plugin-catalog-node'; -import { locationSpecToLocationEntity } from '../../util/conversion'; -import { LocationInput, LocationStore } from '../../service/types'; +import { locationSpecToLocationEntity } from '../util/conversion'; +import { LocationInput, LocationStore } from '../service/types'; import { ANNOTATION_ORIGIN_LOCATION, CompoundEntityRef, diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index dac0a64e59..c404bfaa0d 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -52,17 +52,17 @@ import { FileReaderProcessor, PlaceholderProcessor, UrlReaderProcessor, -} from '../modules'; -import { ConfigLocationEntityProvider } from '../modules/core/ConfigLocationEntityProvider'; -import { DefaultLocationStore } from '../modules/core/DefaultLocationStore'; +} from '../processors'; +import { ConfigLocationEntityProvider } from '../providers/ConfigLocationEntityProvider'; +import { DefaultLocationStore } from '../providers/DefaultLocationStore'; import { RepoLocationAnalyzer } from '../ingestion/LocationAnalyzer'; import { AuthorizedLocationAnalyzer } from './AuthorizedLocationAnalyzer'; import { jsonPlaceholderResolver, textPlaceholderResolver, yamlPlaceholderResolver, -} from '../modules/core/PlaceholderProcessor'; -import { defaultEntityDataParser } from '../modules/util/parse'; +} from '../processors/PlaceholderProcessor'; +import { defaultEntityDataParser } from '../util/parse'; import { CatalogProcessingEngine, createRandomProcessingInterval, diff --git a/plugins/catalog-backend/src/tests/integration.test.ts b/plugins/catalog-backend/src/tests/integration.test.ts index 0c07b0fd4d..d278fb4f0a 100644 --- a/plugins/catalog-backend/src/tests/integration.test.ts +++ b/plugins/catalog-backend/src/tests/integration.test.ts @@ -40,7 +40,7 @@ import { DefaultProviderDatabase } from '../database/DefaultProviderDatabase'; import { applyDatabaseMigrations } from '../database/migrations'; import { RefreshStateItem } from '../database/types'; import { DefaultCatalogRulesEnforcer } from '../ingestion/CatalogRules'; -import { defaultEntityDataParser } from '../modules/util/parse'; +import { defaultEntityDataParser } from '../util/parse'; import { DefaultCatalogProcessingEngine, ProgressTracker, diff --git a/plugins/catalog-backend/src/modules/index.ts b/plugins/catalog-backend/src/util/index.ts similarity index 85% rename from plugins/catalog-backend/src/modules/index.ts rename to plugins/catalog-backend/src/util/index.ts index 10ebf65fed..b0e291ac60 100644 --- a/plugins/catalog-backend/src/modules/index.ts +++ b/plugins/catalog-backend/src/util/index.ts @@ -1,5 +1,5 @@ /* - * Copyright 2022 The Backstage Authors + * Copyright 2024 The Backstage Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,5 +14,4 @@ * limitations under the License. */ -export * from './codeowners'; -export * from './core'; +export { parseEntityYaml } from './parse'; diff --git a/plugins/catalog-backend/src/modules/util/parse.test.ts b/plugins/catalog-backend/src/util/parse.test.ts similarity index 100% rename from plugins/catalog-backend/src/modules/util/parse.test.ts rename to plugins/catalog-backend/src/util/parse.test.ts diff --git a/plugins/catalog-backend/src/modules/util/parse.ts b/plugins/catalog-backend/src/util/parse.ts similarity index 100% rename from plugins/catalog-backend/src/modules/util/parse.ts rename to plugins/catalog-backend/src/util/parse.ts