8000 github: use isGhes func from actions/artifact module · docker/actions-toolkit@99e6b01 · GitHub
[go: up one dir, main page]
Skip to content

Commit 99e6b01

Browse files
crazy-maxcrazy-max
committed
github: use isGhes func from actions/artifact module
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent 4c7e849 commit 99e6b01

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

‎__tests__/github.test.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,6 @@ describe('apiURL', () => {
8585
});
8686
});
8787

88-
describe('isGHES', () => {
89-
afterEach(() => {
90-
process.env.GITHUB_SERVER_URL = '';
91-
});
92-
it('should return false when the request domain is github.com', () => {
93-
process.env.GITHUB_SERVER_URL = 'https://github.com';
94-
expect(GitHub.isGHES).toBe(false);
95-
});
96-
it('should return false when the request domain ends with ghe.com', () => {
97-
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.com';
98-
expect(GitHub.isGHES).toBe(false);
99-
});
100-
it('should return false when the request domain ends with ghe.localhost', () => {
101-
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost';
102-
expect(GitHub.isGHES).toBe(false);
103-
});
104-
it('should return true when the request domain is specific to an enterprise', () => {
105-
process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com';
106-
expect(GitHub.isGHES).toBe(true);
107-
});
108-
});
109-
11088
describe('repository', () => {
11189
it('returns GitHub repository', async () => {
11290
expect(GitHub.repository).toEqual('docker/actions-toolkit');

‎src/github.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import os from 'os';
2222
import path from 'path';
2323
import {CreateArtifactRequest, FinalizeArtifactRequest, StringValue} from '@actions/artifact/lib/generated';
2424
import {internalArtifactTwirpClient} from '@actions/artifact/lib/internal/shared/artifact-twirp-client';
25+
import {isGhes} from '@actions/artifact/lib/internal/shared/config';
2526
import {getBackendIdsFromToken} from '@actions/artifact/lib/internal/shared/util';
2627
import {getExpiration} from '@actions/artifact/lib/internal/upload/retention';
2728
import {InvalidResponseError, NetworkError} from '@actions/artifact';
@@ -67,11 +68,9 @@ export class GitHub {
6768
}
6869

6970
static get isGHES(): boolean {
70-
const serverURL = new URL(GitHub.serverURL);
71-
const hostname = serverURL.hostname.trimEnd().toUpperCase();
72-
const isGitHubHost = hostname === 'GITHUB.COM';
73-
const isGHESHost = hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST');
74-
return !isGitHubHost && !isGHESHost;
71+
// FIXME: we are using the function from GitHub artifact module but should
72+
// be within core module when available.
73+
return isGhes();
7574
}
7675

7776
static get repository(): string {

0 commit comments

Comments
 (0)
0