diff --git a/__test__/git-command-manager.test.ts b/__test__/git-command-manager.test.ts index 47a0f8f..8a97d82 100644 --- a/__test__/git-command-manager.test.ts +++ b/__test__/git-command-manager.test.ts @@ -378,59 +378,6 @@ describe('Test fetchDepth and fetchTags options', () => { }) }) -describe('repository initialization object format', () => { - beforeEach(async () => { - jest.spyOn(fshelper, 'fileExistsSync').mockImplementation(jest.fn()) - jest.spyOn(fshelper, 'directoryExistsSync').mockImplementation(jest.fn()) - }) - - afterEach(() => { - jest.restoreAllMocks() - }) - - it('initializes SHA-256 repositories with the matching object format', async () => { - mockExec.mockImplementation((path, args, options) => { - if (args.includes('version')) { - options.listeners.stdout(Buffer.from('git version 2.50.1')) - } - - return 0 - }) - jest.spyOn(exec, 'exec').mockImplementation(mockExec) - - git = await commandManager.createCommandManager('test', false, false) - - await git.init('sha256') - - expect(mockExec).toHaveBeenCalledWith( - expect.any(String), - ['init', '--object-format=sha256', 'test'], - expect.any(Object) - ) - }) - - it('initializes SHA-1 repositories with existing default arguments', async () => { - mockExec.mockImplementation((path, args, options) => { - if (args.includes('version')) { - options.listeners.stdout(Buffer.from('git version 2.50.1')) - } - - return 0 - }) - jest.spyOn(exec, 'exec').mockImplementation(mockExec) - - git = await commandManager.createCommandManager('test', false, false) - - await git.init('sha1') - - expect(mockExec).toHaveBeenCalledWith( - expect.any(String), - ['init', 'test'], - expect.any(Object) - ) - }) -}) - describe('git user-agent with orchestration ID', () => { beforeEach(async () => { jest.spyOn(fshelper, 'fileExistsSync').mockImplementation(jest.fn()) diff --git a/__test__/github-api-helper.test.ts b/__test__/github-api-helper.test.ts deleted file mode 100644 index 6319e20..0000000 --- a/__test__/github-api-helper.test.ts +++ /dev/null @@ -1,98 +0,0 @@ -import * as core from '@actions/core' -import * as github from '@actions/github' -import * as githubApiHelper from '../lib/github-api-helper' - -describe('github-api-helper object format', () => { - let getOctokitSpy: jest.SpyInstance - let debugSpy: jest.SpyInstance - let request: jest.Mock - - function mockHashAlgorithmApi(hashAlgorithm: string): void { - request = jest.fn(async () => ({ - data: { - hash_algorithm: hashAlgorithm - } - })) - getOctokitSpy = jest.spyOn(github, 'getOctokit').mockReturnValue({ - request - } as any) - } - - beforeEach(() => { - debugSpy = jest.spyOn(core, 'debug').mockImplementation(jest.fn()) - }) - - afterEach(() => { - jest.restoreAllMocks() - }) - - it('detects SHA-256 from the repository hash algorithm endpoint', async () => { - mockHashAlgorithmApi('sha256') - - await expect( - githubApiHelper.tryGetRepositoryObjectFormat('token', 'owner', 'repo') - ).resolves.toEqual({format: 'sha256', succeeded: true}) - - expect(getOctokitSpy).toHaveBeenCalledWith( - 'token', - expect.objectContaining({baseUrl: 'https://api.github.com'}) - ) - expect(request).toHaveBeenCalledWith( - 'GET /repos/{owner}/{repo}/hash-algorithm', - {owner: 'owner', repo: 'repo'} - ) - }) - - it('detects SHA-1 from the repository hash algorithm endpoint', async () => { - mockHashAlgorithmApi('sha1') - - await expect( - githubApiHelper.tryGetRepositoryObjectFormat('token', 'owner', 'repo') - ).resolves.toEqual({format: 'sha1', succeeded: true}) - }) - - it('detects object format from an existing commit without API calls', async () => { - const commitSha = - '9422233ca7ee1b17f1e905d0e141faf0c401556c41cdc6acd71c6bd685da2e92' - getOctokitSpy = jest.spyOn(github, 'getOctokit') - - await expect( - githubApiHelper.tryGetRepositoryObjectFormat( - 'token', - 'owner', - 'repo', - undefined, - commitSha - ) - ).resolves.toEqual({format: 'sha256', succeeded: true}) - - expect(getOctokitSpy).not.toHaveBeenCalled() - }) - - it('returns unsuccessful when the hash algorithm endpoint value is not recognized', async () => { - mockHashAlgorithmApi('unknown') - - await expect( - githubApiHelper.tryGetRepositoryObjectFormat('token', 'owner', 'repo') - ).resolves.toEqual({format: '', succeeded: false}) - expect(debugSpy).toHaveBeenCalledWith( - 'Unable to determine repository object format from hash-algorithm endpoint' - ) - }) - - it('returns unsuccessful when the hash algorithm API lookup fails', async () => { - request = jest.fn(async () => { - throw new Error('not found') - }) - jest.spyOn(github, 'getOctokit').mockReturnValue({ - request - } as any) - - await expect( - githubApiHelper.tryGetRepositoryObjectFormat('token', 'owner', 'repo') - ).resolves.toEqual({format: '', succeeded: false}) - expect(debugSpy).toHaveBeenCalledWith( - 'Unable to determine repository object format from hash-algorithm endpoint: not found' - ) - }) -}) diff --git a/__test__/input-helper.test.ts b/__test__/input-helper.test.ts index 09331eb..9514cb4 100644 --- a/__test__/input-helper.test.ts +++ b/__test__/input-helper.test.ts @@ -133,16 +133,6 @@ describe('input-helper tests', () => { expect(settings.commit).toBe('1111111111222222222233333333334444444444') }) - it('sets ref to empty when explicit sha-256', async () => { - inputs.ref = - '1111111111222222222233333333334444444444555555555566666666667777' - const settings: IGitSourceSettings = await inputHelper.getInputs() - expect(settings.ref).toBeFalsy() - expect(settings.commit).toBe( - '1111111111222222222233333333334444444444555555555566666666667777' - ) - }) - it('sets sha to empty when explicit ref', async () => { inputs.ref = 'refs/heads/some-other-ref' const settings: IGitSourceSettings = await inputHelper.getInputs() diff --git a/__test__/ref-helper.test.ts b/__test__/ref-helper.test.ts index b1578f2..4943abd 100644 --- a/__test__/ref-helper.test.ts +++ b/__test__/ref-helper.test.ts @@ -1,12 +1,8 @@ import * as assert from 'assert' -import * as core from '@actions/core' -import * as github from '@actions/github' import * as refHelper from '../lib/ref-helper' import {IGitCommandManager} from '../lib/git-command-manager' const commit = '1234567890123456789012345678901234567890' -const sha256Commit = - '1234567890123456789012345678901234567890123456789012345678901234' let git: IGitCommandManager describe('ref-helper tests', () => { @@ -41,12 +37,6 @@ describe('ref-helper tests', () => { expect(checkoutInfo.startPoint).toBeFalsy() }) - it('getCheckoutInfo sha-256 only', async () => { - const checkoutInfo = await refHelper.getCheckoutInfo(git, '', sha256Commit) - expect(checkoutInfo.ref).toBe(sha256Commit) - expect(checkoutInfo.startPoint).toBeFalsy() - }) - it('getCheckoutInfo refs/heads/', async () => { const checkoutInfo = await refHelper.getCheckoutInfo( git, @@ -237,142 +227,4 @@ describe('ref-helper tests', () => { '+refs/heads/my/branch:refs/remotes/origin/my/branch' ) }) - - describe('checkCommitInfo', () => { - const repositoryOwner = 'some-owner' - const repositoryName = 'some-repo' - const ref = 'refs/pull/123/merge' - const sha1Head = '1111111111222222222233333333334444444444' - const sha1Base = 'aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd' - const sha256Head = - '1111111111222222222233333333334444444444555555555566666666667777' - const sha256Base = - 'aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffff0000' - let debugSpy: jest.SpyInstance - let getOctokitSpy: jest.SpyInstance - let repoGetSpy: jest.Mock - let originalEventName: string - let originalPayload: unknown - let originalRef: string - let originalSha: string - - function setPullRequestContext( - expectedHeadSha: string, - expectedBaseSha: string, - mergeCommit: string - ): void { - ;(github.context as any).eventName = 'pull_request' - github.context.ref = ref - github.context.sha = mergeCommit - ;(github.context as any).payload = { - action: 'synchronize', - after: expectedHeadSha, - number: 123, - pull_request: { - base: { - sha: expectedBaseSha - } - }, - repository: { - private: false - } - } - } - - beforeEach(() => { - originalEventName = github.context.eventName - originalPayload = github.context.payload - originalRef = github.context.ref - originalSha = github.context.sha - - jest.spyOn(github.context, 'repo', 'get').mockReturnValue({ - owner: repositoryOwner, - repo: repositoryName - }) - debugSpy = jest.spyOn(core, 'debug').mockImplementation(jest.fn()) - repoGetSpy = jest.fn(async () => ({})) - getOctokitSpy = jest.spyOn(github, 'getOctokit').mockReturnValue({ - rest: { - repos: { - get: repoGetSpy - } - } - } as any) - }) - - afterEach(() => { - ;(github.context as any).eventName = originalEventName - ;(github.context as any).payload = originalPayload - github.context.ref = originalRef - github.context.sha = originalSha - jest.restoreAllMocks() - }) - - it('returns early for SHA-1 merge commit', async () => { - setPullRequestContext(sha1Head, sha1Base, commit) - - await refHelper.checkCommitInfo( - 'token', - `Merge ${sha1Head} into ${sha1Base}`, - repositoryOwner, - repositoryName, - ref, - commit - ) - - expect(getOctokitSpy).not.toHaveBeenCalled() - expect(repoGetSpy).not.toHaveBeenCalled() - }) - - it('matches SHA-256 merge commit info', async () => { - const actualHeadSha = - '9999999999888888888877777777776666666666555555555544444444443333' - setPullRequestContext(sha256Head, sha256Base, sha256Commit) - - await refHelper.checkCommitInfo( - 'token', - `Merge ${actualHeadSha} into ${sha256Base}`, - repositoryOwner, - repositoryName, - ref, - sha256Commit - ) - - expect(getOctokitSpy).toHaveBeenCalledWith( - 'token', - expect.objectContaining({ - userAgent: expect.stringContaining( - `expected_head_sha=${sha256Head};actual_head_sha=${actualHeadSha}` - ) - }) - ) - expect(repoGetSpy).toHaveBeenCalledWith({ - owner: repositoryOwner, - repo: repositoryName - }) - expect(debugSpy).toHaveBeenCalledWith( - `Expected head sha ${sha256Head}; actual head sha ${actualHeadSha}` - ) - expect(debugSpy).not.toHaveBeenCalledWith('Unexpected message format') - }) - - it('does not match 50-char hex as a valid merge', async () => { - const invalidHeadSha = - '99999999998888888888777777777766666666665555555555' - setPullRequestContext(sha1Head, sha1Base, commit) - - await refHelper.checkCommitInfo( - 'token', - `Merge ${invalidHeadSha} into ${sha1Base}`, - repositoryOwner, - repositoryName, - ref, - commit - ) - - expect(getOctokitSpy).not.toHaveBeenCalled() - expect(repoGetSpy).not.toHaveBeenCalled() - expect(debugSpy).toHaveBeenCalledWith('Unexpected message format') - }) - }) }) diff --git a/dist/index.js b/dist/index.js index 906b59a..fe3f317 100644 --- a/dist/index.js +++ b/dist/index.js @@ -896,14 +896,9 @@ class GitCommandManager { getWorkingDirectory() { return this.workingDirectory; } - init(objectFormat) { + init() { return __awaiter(this, void 0, void 0, function* () { - const args = ['init']; - if (objectFormat === 'sha256') { - args.push('--object-format=sha256'); - } - args.push(this.workingDirectory); - yield this.execGit(args); + yield this.execGit(['init', this.workingDirectory]); }); } isDetached() { @@ -1491,17 +1486,8 @@ function getSource(settings) { stateHelper.setRepositoryPath(settings.repositoryPath); // Initialize the repository if (!fsHelper.directoryExistsSync(path.join(settings.repositoryPath, '.git'))) { - core.startGroup('Determining repository object format'); - const objectFormatResult = yield githubApiHelper.tryGetRepositoryObjectFormat(settings.authToken, settings.repositoryOwner, settings.repositoryName, settings.githubServerUrl, settings.commit); - const objectFormat = objectFormatResult.succeeded - ? objectFormatResult.format - : ''; - if (objectFormat === 'sha256') { - core.info('Detected SHA-256 repository object format'); - } - core.endGroup(); core.startGroup('Initializing the repository'); - yield git.init(objectFormat); + yield git.init(); yield git.remoteAdd('origin', repositoryUrl); core.endGroup(); } @@ -1824,7 +1810,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", ({ value: true })); exports.downloadRepository = downloadRepository; exports.getDefaultBranch = getDefaultBranch; -exports.tryGetRepositoryObjectFormat = tryGetRepositoryObjectFormat; const assert = __importStar(__nccwpck_require__(9491)); const core = __importStar(__nccwpck_require__(2186)); const fs = __importStar(__nccwpck_require__(7147)); @@ -1926,40 +1911,6 @@ function getDefaultBranch(authToken, owner, repo, baseUrl) { })); }); } -function tryGetRepositoryObjectFormat(authToken, owner, repo, baseUrl, commit) { - return __awaiter(this, void 0, void 0, function* () { - var _a; - const commitFormat = getObjectFormat(commit); - if (commitFormat) { - return { format: commitFormat, succeeded: true }; - } - try { - const octokit = github.getOctokit(authToken, { - baseUrl: (0, url_helper_1.getServerApiUrl)(baseUrl) - }); - const response = yield octokit.request('GET /repos/{owner}/{repo}/hash-algorithm', { owner, repo }); - const hashAlgorithm = response.data.hash_algorithm; - if (hashAlgorithm === 'sha256' || hashAlgorithm === 'sha1') { - return { format: hashAlgorithm, succeeded: true }; - } - core.debug('Unable to determine repository object format from hash-algorithm endpoint'); - return { format: '', succeeded: false }; - } - catch (err) { - core.debug(`Unable to determine repository object format from hash-algorithm endpoint: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`); - return { format: '', succeeded: false }; - } - }); -} -function getObjectFormat(sha) { - if (/^[0-9a-fA-F]{64}$/.test(sha || '')) { - return 'sha256'; - } - if (/^[0-9a-fA-F]{40}$/.test(sha || '')) { - return 'sha1'; - } - return ''; -} function downloadArchive(authToken, owner, repo, ref, commit, baseUrl) { return __awaiter(this, void 0, void 0, function* () { const octokit = github.getOctokit(authToken, { @@ -2070,7 +2021,7 @@ function getInputs() { } } // SHA? - else if (result.ref.match(/^(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/)) { + else if (result.ref.match(/^[0-9a-fA-F]{40}$/)) { result.commit = result.ref; result.ref = ''; } @@ -2493,7 +2444,7 @@ function checkCommitInfo(token, commitInfo, repositoryOwner, repositoryName, ref return; } // Extract details from message - const match = commitInfo.match(/Merge ([0-9a-f]{40}|[0-9a-f]{64}) into ([0-9a-f]{40}|[0-9a-f]{64})/); + const match = commitInfo.match(/Merge ([0-9a-f]{40}) into ([0-9a-f]{40})/); if (!match) { core.debug('Unexpected message format'); return; diff --git a/src/git-command-manager.ts b/src/git-command-manager.ts index f1349ce..f5ba40e 100644 --- a/src/git-command-manager.ts +++ b/src/git-command-manager.ts @@ -43,7 +43,7 @@ export interface IGitCommandManager { getDefaultBranch(repositoryUrl: string): Promise getSubmoduleConfigPaths(recursive: boolean): Promise getWorkingDirectory(): string - init(objectFormat?: string): Promise + init(): Promise isDetached(): Promise lfsFetch(ref: string): Promise lfsInstall(): Promise @@ -364,14 +364,8 @@ class GitCommandManager { return this.workingDirectory } - async init(objectFormat?: string): Promise { - const args = ['init'] - if (objectFormat === 'sha256') { - args.push('--object-format=sha256') - } - args.push(this.workingDirectory) - - await this.execGit(args) + async init(): Promise { + await this.execGit(['init', this.workingDirectory]) } async isDetached(): Promise { diff --git a/src/git-source-provider.ts b/src/git-source-provider.ts index 452d44e..ec87178 100644 --- a/src/git-source-provider.ts +++ b/src/git-source-provider.ts @@ -109,25 +109,8 @@ export async function getSource(settings: IGitSourceSettings): Promise { if ( !fsHelper.directoryExistsSync(path.join(settings.repositoryPath, '.git')) ) { - core.startGroup('Determining repository object format') - const objectFormatResult = - await githubApiHelper.tryGetRepositoryObjectFormat( - settings.authToken, - settings.repositoryOwner, - settings.repositoryName, - settings.githubServerUrl, - settings.commit - ) - const objectFormat = objectFormatResult.succeeded - ? objectFormatResult.format - : '' - if (objectFormat === 'sha256') { - core.info('Detected SHA-256 repository object format') - } - core.endGroup() - core.startGroup('Initializing the repository') - await git.init(objectFormat) + await git.init() await git.remoteAdd('origin', repositoryUrl) core.endGroup() } diff --git a/src/github-api-helper.ts b/src/github-api-helper.ts index bef31e6..1ff27c2 100644 --- a/src/github-api-helper.ts +++ b/src/github-api-helper.ts @@ -11,11 +11,6 @@ import {getServerApiUrl} from './url-helper' const IS_WINDOWS = process.platform === 'win32' -export interface RepositoryObjectFormatResult { - format: string - succeeded: boolean -} - export async function downloadRepository( authToken: string, owner: string, @@ -127,53 +122,6 @@ export async function getDefaultBranch( }) } -export async function tryGetRepositoryObjectFormat( - authToken: string, - owner: string, - repo: string, - baseUrl?: string, - commit?: string -): Promise { - const commitFormat = getObjectFormat(commit) - if (commitFormat) { - return {format: commitFormat, succeeded: true} - } - - try { - const octokit = github.getOctokit(authToken, { - baseUrl: getServerApiUrl(baseUrl) - }) - const response = await octokit.request( - 'GET /repos/{owner}/{repo}/hash-algorithm', - {owner, repo} - ) - const hashAlgorithm = response.data.hash_algorithm - if (hashAlgorithm === 'sha256' || hashAlgorithm === 'sha1') { - return {format: hashAlgorithm, succeeded: true} - } - - core.debug( - 'Unable to determine repository object format from hash-algorithm endpoint' - ) - return {format: '', succeeded: false} - } catch (err) { - core.debug( - `Unable to determine repository object format from hash-algorithm endpoint: ${(err as any)?.message ?? err}` - ) - return {format: '', succeeded: false} - } -} - -function getObjectFormat(sha?: string): string { - if (/^[0-9a-fA-F]{64}$/.test(sha || '')) { - return 'sha256' - } - if (/^[0-9a-fA-F]{40}$/.test(sha || '')) { - return 'sha1' - } - return '' -} - async function downloadArchive( authToken: string, owner: string, diff --git a/src/input-helper.ts b/src/input-helper.ts index e0c61e2..059232f 100644 --- a/src/input-helper.ts +++ b/src/input-helper.ts @@ -71,7 +71,7 @@ export async function getInputs(): Promise { } } // SHA? - else if (result.ref.match(/^(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/)) { + else if (result.ref.match(/^[0-9a-fA-F]{40}$/)) { result.commit = result.ref result.ref = '' } diff --git a/src/ref-helper.ts b/src/ref-helper.ts index 71e8b22..5130f53 100644 --- a/src/ref-helper.ts +++ b/src/ref-helper.ts @@ -258,9 +258,7 @@ export async function checkCommitInfo( } // Extract details from message - const match = commitInfo.match( - /Merge ([0-9a-f]{40}|[0-9a-f]{64}) into ([0-9a-f]{40}|[0-9a-f]{64})/ - ) + const match = commitInfo.match(/Merge ([0-9a-f]{40}) into ([0-9a-f]{40})/) if (!match) { core.debug('Unexpected message format') return