Merge pull request #3647 from O5ten/patch-2

Fix missing baseUrl in graphql client for GHE

.changeset/calm-scissors-jam.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': minor
+---
+
+Add support for Github Enterprise in GitHubOrgReaderProcessor so you can properly ingest users of a GHE organization.

app-config.yaml

@@ -133,7 +133,7 @@ catalog:
             $env: GITHUB_TOKEN
         #### Example for how to add your GitHub Enterprise instance using the API:
         # - target: https://ghe.example.net
-        #   apiBaseUrl: https://ghe.example.net/api/v3
+        #   apiBaseUrl: https://ghe.example.net/api
         #   token:
         #     $env: GHE_TOKEN
     ldapOrg:

plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts

@@ -64,6 +64,7 @@ export class GithubOrgReaderProcessor implements CatalogProcessor {
     const client = !provider.token
       ? graphql
       : graphql.defaults({
+          baseUrl: provider.apiBaseUrl,
           headers: {
             authorization: `token ${provider.token}`,
           },