Merge pull request #2913 from markuscodes1/feature/github-scaffolder-baseurl

Scaffolder backend- provide base url for creating apps in Enterprise GitHub
This commit is contained in:
Fredrik Adelöw
2020-10-16 14:35:33 +02:00
committed by GitHub
4 changed files with 15 additions and 2 deletions
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/plugin-scaffolder': patch
'@backstage/plugin-scaffolder-backend': patch
---
The new `scaffolder.github.baseUrl` config property allows to specify a custom base url for GitHub enterprise instances
+1
View File
@@ -148,6 +148,7 @@ catalog:
scaffolder:
github:
host: https://github.com
token:
$env: GITHUB_TOKEN
visibility: public # or 'internal' or 'private'
+6 -1
View File
@@ -68,7 +68,12 @@ export default async function createPlugin({
) as RepoVisibilityOptions;
const githubToken = githubConfig.getString('token');
const githubClient = new Octokit({ auth: githubToken });
const githubHost =
githubConfig.getOptionalString('host') ?? 'https://github.com';
const githubClient = new Octokit({
auth: githubToken,
baseUrl: githubHost,
});
const githubPublisher = new GithubPublisher({
client: githubClient,
token: githubToken,
@@ -48,7 +48,8 @@ export default async function createPlugin({
) as RepoVisibilityOptions;
const githubToken = githubConfig.getString('token');
const githubClient = new Octokit({ auth: githubToken });
const githubHost = githubConfig.getOptionalString('host');
const githubClient = new Octokit({ auth: githubToken, baseUrl: githubHost });
const githubPublisher = new GithubPublisher({
client: githubClient,
token: githubToken,