From b90fc74d7099b815d8a22eab4f04bbf106a65b33 Mon Sep 17 00:00:00 2001
From: Bryce Larson <bryce.larson@originenergy.com.au>
Date: Thu, 4 Nov 2021 20:08:58 +1100
Subject: [PATCH 1/2] feat: Add getDefaultProcessors to CatalogBuilder

Signed-off-by: Bryce Larson <bryce.larson@originenergy.com.au>
---
 .changeset/violet-panthers-care.md            |  5 +++
 .../src/service/NextCatalogBuilder.ts         | 38 +++++++++++++------
 2 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/violet-panthers-care.md

diff --git a/.changeset/violet-panthers-care.md b/.changeset/violet-panthers-care.md
new file mode 100644
index 0000000000..7a43c87f37
--- /dev/null
+++ b/.changeset/violet-panthers-care.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+adds getDefaultProcessor method to CatalogBuilder
diff --git a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
index 835c1dc700..5e0bcd9a75 100644
--- a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
@@ -265,7 +265,8 @@ export class NextCatalogBuilder {
    * Sets what entity processors to use. These are responsible for reading,
    * parsing, and processing entities before they are persisted in the catalog.
    *
-   * This function replaces the default set of processors; use with care.
+   * This function replaces the default set of processors, consider using with
+   * {@link NextCatalogBuilder#getDefaultProcessors}; use with care.
    *
    * @param processors One or more processors
    */
@@ -275,6 +276,30 @@ export class NextCatalogBuilder {
     return this;
   }
 
+  /**
+   * Returns the default list of entity processors. These are responsible for reading,
+   * parsing, and processing entities before they are persisted in the catalog. Changing
+   * the order of processing can give more control to custom processors.
+   *
+   * Consider using with with {@link NextCatalogBuilder#replaceProcessors}
+   *
+   */
+  getDefaultProcessors(): CatalogProcessor[] {
+    const { config, logger, reader } = this.env;
+    const integrations = ScmIntegrations.fromConfig(config);
+
+    return [
+      new FileReaderProcessor(),
+      BitbucketDiscoveryProcessor.fromConfig(config, { logger }),
+      GithubDiscoveryProcessor.fromConfig(config, { logger }),
+      GithubOrgReaderProcessor.fromConfig(config, { logger }),
+      GitLabDiscoveryProcessor.fromConfig(config, { logger }),
+      new UrlReaderProcessor({ reader, logger }),
+      CodeOwnersProcessor.fromConfig(config, { logger, reader }),
+      new AnnotateLocationEntityProcessor({ integrations }),
+    ];
+  }
+
   /**
    * Sets up the catalog to use a custom parser for entity data.
    *
@@ -416,16 +441,7 @@ export class NextCatalogBuilder {
 
     // These are only added unless the user replaced them all
     if (!this.processorsReplace) {
-      processors.push(
-        new FileReaderProcessor(),
-        BitbucketDiscoveryProcessor.fromConfig(config, { logger }),
-        GithubDiscoveryProcessor.fromConfig(config, { logger }),
-        GithubOrgReaderProcessor.fromConfig(config, { logger }),
-        GitLabDiscoveryProcessor.fromConfig(config, { logger }),
-        new UrlReaderProcessor({ reader, logger }),
-        CodeOwnersProcessor.fromConfig(config, { logger, reader }),
-        new AnnotateLocationEntityProcessor({ integrations }),
-      );
+      processors.push(...this.getDefaultProcessors());
     }
 
     // Add the ones (if any) that the user added

From 23348dd5864a2427c40288b6cf30a103bb267556 Mon Sep 17 00:00:00 2001
From: Bryce Larson <85923137+bryce-od@users.noreply.github.com>
Date: Fri, 5 Nov 2021 10:25:28 +1100
Subject: [PATCH 2/2] Update
 plugins/catalog-backend/src/service/NextCatalogBuilder.ts

Co-authored-by: Jussi Hallila <jussi@hallila.com>
Signed-off-by: Bryce Larson <bryce.larson@originenergy.com.au>
---
 plugins/catalog-backend/src/service/NextCatalogBuilder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
index 5e0bcd9a75..bbda6f070c 100644
--- a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
@@ -281,7 +281,7 @@ export class NextCatalogBuilder {
    * parsing, and processing entities before they are persisted in the catalog. Changing
    * the order of processing can give more control to custom processors.
    *
-   * Consider using with with {@link NextCatalogBuilder#replaceProcessors}
+   * Consider using with {@link NextCatalogBuilder#replaceProcessors}
    *
    */
   getDefaultProcessors(): CatalogProcessor[] {
@@ -417,7 +417,7 @@ export class NextCatalogBuilder {
   }
 
   private buildProcessors(): CatalogProcessor[] {
-    const { config, logger, reader } = this.env;
+    const { config, reader } = this.env;
     const integrations = ScmIntegrations.fromConfig(config);
 
     this.checkDeprecatedReaderProcessors();