From aa195b11df7ca60eed490671f9b451de086e848d Mon Sep 17 00:00:00 2001 From: Seehait Chockthanyawat Date: Sun, 3 Jul 2022 23:16:31 +0900 Subject: [PATCH] fix: octokit to use the correct enterprise url --- src/github-api-helper.ts | 5 ++++- src/url-helper.ts | 21 ++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/github-api-helper.ts b/src/github-api-helper.ts index 45b979a..e17c9f0 100644 --- a/src/github-api-helper.ts +++ b/src/github-api-helper.ts @@ -8,6 +8,7 @@ import * as retryHelper from './retry-helper' import * as toolCache from '@actions/tool-cache' import {default as uuid} from 'uuid/v4' import {Octokit} from '@octokit/rest' +import { getAPIUrl } from './url-helper' const IS_WINDOWS = process.platform === 'win32' @@ -83,7 +84,9 @@ export async function getDefaultBranch( ): Promise { return await retryHelper.execute(async () => { core.info('Retrieving the default branch name') - const octokit = new github.GitHub(authToken) + const octokit = new github.GitHub(authToken, { + baseUrl: getAPIUrl() + }) let result: string try { // Get the default branch from the repo info diff --git a/src/url-helper.ts b/src/url-helper.ts index 05f1cbd..ef796a6 100644 --- a/src/url-helper.ts +++ b/src/url-helper.ts @@ -19,11 +19,26 @@ export function getFetchUrl(settings: IGitSourceSettings): string { return `${serviceUrl.origin}/${encodedOwner}/${encodedName}` } -export function getServerUrl(): URL { +function getServerUrlFromEnv(): string | undefined { // todo: remove GITHUB_URL after support for GHES Alpha is no longer needed + return process.env['GITHUB_SERVER_URL'] || + process.env['GITHUB_URL'] +} + +export function getServerUrl(): URL { return new URL( - process.env['GITHUB_SERVER_URL'] || - process.env['GITHUB_URL'] || + getServerUrlFromEnv() || 'https://github.com' ) } + +export function getAPIUrl(): URL { + const urlFromEnv = getServerUrlFromEnv() + if (urlFromEnv) { + return new URL(`${urlFromEnv}/api/v3`) + } + + return new URL( + 'https://api.github.com' + ) +}