From ee5f49dd203dbbd2557b10683a04112ed7e1e850 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Sat, 6 May 2023 09:09:10 +0900 Subject: [PATCH] getServerUrl refers to the GITHUB_SERVER_URL environment variable (#169) * getServerUrl refers to the GITHUB_SERVER_URL environment variable * fix indent * fix error * eslint fix --- src/git.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/git.ts b/src/git.ts index d3f459d12..1a228ac6d 100644 --- a/src/git.ts +++ b/src/git.ts @@ -38,14 +38,20 @@ async function capture(cmd: string, args: string[]): Promise { } } +export function getServerUrlObj(repositoryUrl: string | undefined): URL { + const urlValue = + repositoryUrl && repositoryUrl.trim().length > 0 + ? repositoryUrl + : process.env['GITHUB_SERVER_URL'] ?? DEFAULT_GITHUB_URL; + return new URL(urlValue); +} + export function getServerUrl(repositoryUrl: string | undefined): string { - const urlObj = repositoryUrl ? new URL(repositoryUrl) : new URL(DEFAULT_GITHUB_URL); - return repositoryUrl ? urlObj.origin : DEFAULT_GITHUB_URL; + return getServerUrlObj(repositoryUrl).origin; } export function getServerName(repositoryUrl: string | undefined): string { - const urlObj = repositoryUrl ? new URL(repositoryUrl) : new URL(DEFAULT_GITHUB_URL); - return repositoryUrl ? urlObj.hostname : DEFAULT_GITHUB_URL.replace('https://', ''); + return getServerUrlObj(repositoryUrl).hostname; } export async function cmd(additionalGitOptions: string[], ...args: string[]): Promise {