From 6943ead4c644958245974304306fec8918e7a995 Mon Sep 17 00:00:00 2001 From: Markus Heinemann Date: Thu, 15 Oct 2020 13:04:12 +0000 Subject: [PATCH] feat: add base url config property to github scaffholders --- app-config.yaml | 1 + packages/backend/src/plugins/scaffolder.ts | 6 +++++- .../default-app/packages/backend/src/plugins/scaffolder.ts | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 8ec43c6007..b527069c15 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -147,6 +147,7 @@ catalog: scaffolder: github: + baseUrl: https://github.com token: $env: GITHUB_TOKEN visibility: public # or 'internal' or 'private' diff --git a/packages/backend/src/plugins/scaffolder.ts b/packages/backend/src/plugins/scaffolder.ts index 90667bfb16..7ba90ed8b5 100644 --- a/packages/backend/src/plugins/scaffolder.ts +++ b/packages/backend/src/plugins/scaffolder.ts @@ -68,7 +68,11 @@ export default async function createPlugin({ ) as RepoVisibilityOptions; const githubToken = githubConfig.getString('token'); - const githubClient = new Octokit({ auth: githubToken }); + const githubBaseUrl = githubConfig.getString('baseUrl'); + const githubClient = new Octokit({ + auth: githubToken, + baseUrl: githubBaseUrl, + }); const githubPublisher = new GithubPublisher({ client: githubClient, token: githubToken, diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts index ed16d766f1..9f59412036 100644 --- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts +++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts @@ -48,7 +48,8 @@ export default async function createPlugin({ ) as RepoVisibilityOptions; const githubToken = githubConfig.getString('token'); - const githubClient = new Octokit({ auth: githubToken }); + const githubBaseUrl = githubConfig.getString('baseUrl'); + const githubClient = new Octokit({ auth: githubToken, baseUrl: githubBaseUrl }); const githubPublisher = new GithubPublisher({ client: githubClient, token: githubToken,