paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity

Merge pull request #3834 from erikxiv/fix/techdocs-ghe-apibaseurl

Browse Source 
Fix for integration.github.apiBaseUrl configuration not properly overriding apiBaseUrl used by techdocs
This commit is contained in:
Ben Lambert
2021-01-04 13:18:22 +01:00
committed by GitHub
parent dc271aa61a 5f13147713
commit cf2c2df7d3
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/fifty-yaks-behave.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/techdocs-common': patch
---
Fix for `integration.github.apiBaseUrl` configuration not properly overriding apiBaseUrl used by techdocs
packages/techdocs-common/src/default-branch.ts
+6 -6
View File
@@ -54,19 +54,19 @@ interface IGitlabBranch {
}
function getGithubApiUrl(config: Config, url: string): URL {
const { protocol, owner, name } = parseGitUrl(url);
const { resource, owner, name } = parseGitUrl(url);
const providerConfigs =
config.getOptionalConfigArray('integrations.github') ?? [];
// TODO: Maybe we need to filter by host in the array, not sure about GHE
const targetProviderConfig = providerConfigs[0];
const hostConfig = providerConfigs.filter(
providerConfig => providerConfig.getOptionalString('host') === resource,
);
const apiBaseUrl =
targetProviderConfig?.getOptionalString('integrations.github.apiBaseUrl') ??
'api.github.com';
hostConfig[0]?.getOptionalString('apiBaseUrl') ?? 'https://api.github.com';
const apiRepos = 'repos';
return new URL(`${protocol}://${apiBaseUrl}/${apiRepos}/${owner}/${name}`);
return new URL(`${apiBaseUrl}/${apiRepos}/${owner}/${name}`);
}
function getGitlabApiUrl(url: string): URL {