diff --git a/.changeset/calm-scissors-jam.md b/.changeset/calm-scissors-jam.md new file mode 100644 index 0000000000..b0939188ef --- /dev/null +++ b/.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. diff --git a/app-config.yaml b/app-config.yaml index 9d4d702473..0eb00ebbf3 100644 --- a/app-config.yaml +++ b/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: diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts index 27d5424e4e..ab6e3aa008 100644 --- a/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts +++ b/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}`, },