diff --git a/__test__/create-or-update-branch.int.test.ts b/__test__/create-or-update-branch.int.test.ts index ea65f37..0636095 100644 --- a/__test__/create-or-update-branch.int.test.ts +++ b/__test__/create-or-update-branch.int.test.ts @@ -2,7 +2,6 @@ import { createOrUpdateBranch, tryFetch, getWorkingBaseAndType, - buildBranchFileChanges, buildBranchCommits } from '../lib/create-or-update-branch' import * as fs from 'fs' @@ -298,80 +297,6 @@ describe('create-or-update-branch tests', () => { } }) - it('tests buildBranchFileChanges with no diff', async () => { - await git.checkout(BRANCH, BASE) - const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH) - expect(branchFileChanges.additions.length).toEqual(0) - expect(branchFileChanges.deletions.length).toEqual(0) - }) - - it('tests buildBranchFileChanges with addition and modification', async () => { - await git.checkout(BRANCH, BASE) - const changes = await createChanges() - await git.exec(['add', '-A']) - await git.commit(['-m', 'Test changes']) - - const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH) - - expect(branchFileChanges.additions).toEqual([ - { - path: TRACKED_FILE, - contents: Buffer.from(changes.tracked, 'binary').toString('base64') - }, - { - path: UNTRACKED_FILE, - contents: Buffer.from(changes.untracked, 'binary').toString('base64') - } - ]) - expect(branchFileChanges.deletions.length).toEqual(0) - }) - - it('tests buildBranchFileChanges with addition and deletion', async () => { - await git.checkout(BRANCH, BASE) - const changes = await createChanges() - const TRACKED_FILE_NEW_PATH = 'c/tracked-file.txt' - const filepath = path.join(REPO_PATH, TRACKED_FILE_NEW_PATH) - await fs.promises.mkdir(path.dirname(filepath), {recursive: true}) - await fs.promises.rename(path.join(REPO_PATH, TRACKED_FILE), filepath) - await git.exec(['add', '-A']) - await git.commit(['-m', 'Test changes']) - - const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH) - - expect(branchFileChanges.additions).toEqual([ - { - path: UNTRACKED_FILE, - contents: Buffer.from(changes.untracked, 'binary').toString('base64') - }, - { - path: TRACKED_FILE_NEW_PATH, - contents: Buffer.from(changes.tracked, 'binary').toString('base64') - } - ]) - expect(branchFileChanges.deletions).toEqual([{path: TRACKED_FILE}]) - }) - - it('tests buildBranchFileChanges with binary files', async () => { - await git.checkout(BRANCH, BASE) - const filename = 'c/untracked-binary-file' - const filepath = path.join(REPO_PATH, filename) - const binaryData = Buffer.from([0x00, 0xff, 0x10, 0x20]) - await fs.promises.mkdir(path.dirname(filepath), {recursive: true}) - await fs.promises.writeFile(filepath, binaryData) - await git.exec(['add', '-A']) - await git.commit(['-m', 'Test changes']) - - const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH) - - expect(branchFileChanges.additions).toEqual([ - { - path: filename, - contents: binaryData.toString('base64') - } - ]) - expect(branchFileChanges.deletions.length).toEqual(0) - }) - it('tests no changes resulting in no new branch being created', async () => { const commitMessage = uuidv4() const result = await createOrUpdateBranch( diff --git a/dist/index.js b/dist/index.js index 6f518bb..428e1cb 100644 --- a/dist/index.js +++ b/dist/index.js @@ -43,11 +43,9 @@ exports.WorkingBaseType = void 0; exports.getWorkingBaseAndType = getWorkingBaseAndType; exports.tryFetch = tryFetch; exports.buildBranchCommits = buildBranchCommits; -exports.buildBranchFileChanges = buildBranchFileChanges; exports.createOrUpdateBranch = createOrUpdateBranch; const core = __importStar(__nccwpck_require__(2186)); const uuid_1 = __nccwpck_require__(5840); -const utils = __importStar(__nccwpck_require__(918)); const CHERRYPICK_EMPTY = 'The previous cherry-pick is now empty, possibly due to conflict resolution.'; const NOTHING_TO_COMMIT = 'nothing to commit, working tree clean'; const FETCH_DEPTH_MARGIN = 10; @@ -99,35 +97,6 @@ function buildBranchCommits(git, base, branch) { return commits; }); } -function buildBranchFileChanges(git, base, branch) { - return __awaiter(this, void 0, void 0, function* () { - const branchFileChanges = { - additions: [], - deletions: [] - }; - const changedFiles = yield git.getChangedFiles([ - '--diff-filter=AM', - `${base}..${branch}` - ]); - const deletedFiles = yield git.getChangedFiles([ - '--diff-filter=D', - `${base}..${branch}` - ]); - const repoPath = git.getWorkingDirectory(); - for (const file of changedFiles) { - branchFileChanges.additions.push({ - path: file, - contents: utils.readFileBase64([repoPath, file]) - }); - } - for (const file of deletedFiles) { - branchFileChanges.deletions.push({ - path: file - }); - } - return branchFileChanges; - }); -} // Return the number of commits that branch2 is ahead of branch1 function commitsAhead(git, branch1, branch2) { return __awaiter(this, void 0, void 0, function* () { @@ -309,8 +278,6 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName } // Build the branch commits result.branchCommits = yield buildBranchCommits(git, base, branch); - // Build the branch file changes - result.branchFileChanges = yield buildBranchFileChanges(git, base, branch); // Get the pull request branch SHA result.headSha = yield git.revParse('HEAD'); // Delete the temporary branch @@ -492,13 +459,6 @@ function createPullRequest(inputs) { const stashed = yield git.stashPush(['--include-untracked']); yield git.checkout(inputs.branch); yield githubHelper.pushSignedCommits(result.branchCommits, repoPath, branchRepository, inputs.branch); - // await githubHelper.pushSignedCommit( - // branchRepository, - // inputs.branch, - // inputs.base, - // inputs.commitMessage, - // result.branchFileChanges - // ) yield git.checkout('-'); if (stashed) { yield git.stashPop(); @@ -1198,17 +1158,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __rest = (this && this.__rest) || function (s, e) { - var t = {}; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) - t[p] = s[p]; - if (s != null && typeof Object.getOwnPropertySymbols === "function") - for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) { - if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) - t[p[i]] = s[p[i]]; - } - return t; -}; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.GitHubHelper = void 0; const core = __importStar(__nccwpck_require__(2186)); @@ -1339,11 +1288,11 @@ class GitHubHelper { const repository = this.parseRepository(branchRepository); let treeSha = commit.tree; if (commit.changes.length > 0) { - core.debug(`Creating tree objects for local commit ${commit.sha}`); + core.info(`Creating tree objects for local commit ${commit.sha}`); const treeObjects = yield Promise.all(commit.changes.map((_a) => __awaiter(this, [_a], void 0, function* ({ path, mode, status }) { let sha = null; if (status === 'A' || status === 'M') { - core.debug(`Creating blob for file '${path}'`); + core.info(`Creating blob for file '${path}'`); const { data: blob } = yield this.octokit.rest.git.createBlob(Object.assign(Object.assign({}, repository), { content: utils.readFileBase64([repoPath, path]), encoding: 'base64' })); sha = blob.sha; } @@ -1354,154 +1303,32 @@ class GitHubHelper { type: 'blob' }; }))); - core.debug(`Creating tree for local commit ${commit.sha}`); + core.info(`Creating tree for local commit ${commit.sha}`); const { data: tree } = yield this.octokit.rest.git.createTree(Object.assign(Object.assign({}, repository), { base_tree: commit.parents[0], tree: treeObjects })); treeSha = tree.sha; - core.debug(`Created tree ${treeSha} for local commit ${commit.sha}`); + core.info(`Created tree ${treeSha} for local commit ${commit.sha}`); } const { data: remoteCommit } = yield this.octokit.rest.git.createCommit(Object.assign(Object.assign({}, repository), { parents: commit.parents, tree: treeSha, message: `${commit.subject}\n\n${commit.body}` })); - core.debug(`Created commit ${remoteCommit.sha} for local commit ${commit.sha}`); + core.info(`Created commit ${remoteCommit.sha} for local commit ${commit.sha}`); return remoteCommit.sha; }); } createOrUpdateRef(branchRepository, branch, newHead) { return __awaiter(this, void 0, void 0, function* () { const repository = this.parseRepository(branchRepository); - const branchExists = yield this.octokit.rest.git - .getRef(Object.assign(Object.assign({}, repository), { ref: branch })) + const branchExists = yield this.octokit.rest.repos + .getBranch(Object.assign(Object.assign({}, repository), { branch: branch })) .then(() => true, () => false); if (branchExists) { - core.debug(`Branch ${branch} exists, updating ref`); + core.info(`Branch ${branch} exists; Updating ref`); yield this.octokit.rest.git.updateRef(Object.assign(Object.assign({}, repository), { sha: newHead, ref: `heads/${branch}` })); } else { - core.debug(`Branch ${branch} does not exist, creating ref`); + core.info(`Branch ${branch} does not exist; Creating ref`); yield this.octokit.rest.git.createRef(Object.assign(Object.assign({}, repository), { sha: newHead, ref: `refs/heads/${branch}` })); } }); } - pushSignedCommit(branchRepository, branch, base, commitMessage, branchFileChanges) { - return __awaiter(this, void 0, void 0, function* () { - var _a; - core.info(`Use API to push a signed commit`); - const [repoOwner, repoName] = branchRepository.split('/'); - core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`); - const refQuery = ` - query GetRefId($repoName: String!, $repoOwner: String!, $branchName: String!) { - repository(owner: $repoOwner, name: $repoName){ - id - ref(qualifiedName: $branchName){ - id - name - prefix - target{ - id - oid - commitUrl - commitResourcePath - abbreviatedOid - } - } - }, - } - `; - let branchRef = yield this.octokit.graphql(refQuery, { - repoOwner: repoOwner, - repoName: repoName, - branchName: branch - }); - core.debug(`Fetched information for branch '${branch}' - '${JSON.stringify(branchRef)}'`); - // if the branch does not exist, then first we need to create the branch from base - if (branchRef.repository.ref == null) { - core.debug(`Branch does not exist - '${branch}'`); - branchRef = yield this.octokit.graphql(refQuery, { - repoOwner: repoOwner, - repoName: repoName, - branchName: base - }); - core.debug(`Fetched information for base branch '${base}' - '${JSON.stringify(branchRef)}'`); - core.info(`Creating new branch '${branch}' from '${base}', with ref '${JSON.stringify(branchRef.repository.ref.target.oid)}'`); - if (branchRef.repository.ref != null) { - core.debug(`Send request for creating new branch`); - const newBranchMutation = ` - mutation CreateNewBranch($branchName: String!, $oid: GitObjectID!, $repoId: ID!) { - createRef(input: { - name: $branchName, - oid: $oid, - repositoryId: $repoId - }) { - ref { - id - name - prefix - } - } - } - `; - const newBranch = yield this.octokit.graphql(newBranchMutation, { - repoId: branchRef.repository.id, - oid: branchRef.repository.ref.target.oid, - branchName: 'refs/heads/' + branch - }); - core.debug(`Created new branch '${branch}': '${JSON.stringify(newBranch.createRef.ref)}'`); - } - } - core.info(`Hash ref of branch '${branch}' is '${JSON.stringify(branchRef.repository.ref.target.oid)}'`); - const fileChanges = { - additions: branchFileChanges.additions, - deletions: branchFileChanges.deletions - }; - const pushCommitMutation = ` - mutation PushCommit( - $repoNameWithOwner: String!, - $branchName: String!, - $headOid: GitObjectID!, - $commitMessage: String!, - $fileChanges: FileChanges - ) { - createCommitOnBranch(input: { - branch: { - repositoryNameWithOwner: $repoNameWithOwner, - branchName: $branchName, - } - fileChanges: $fileChanges - message: { - headline: $commitMessage - } - expectedHeadOid: $headOid - }){ - clientMutationId - ref{ - id - name - prefix - } - commit{ - id - abbreviatedOid - oid - } - } - } - `; - const pushCommitVars = { - branchName: branch, - repoNameWithOwner: repoOwner + '/' + repoName, - headOid: branchRef.repository.ref.target.oid, - commitMessage: commitMessage, - fileChanges: fileChanges - }; - const pushCommitVarsWithoutContents = Object.assign(Object.assign({}, pushCommitVars), { fileChanges: Object.assign(Object.assign({}, pushCommitVars.fileChanges), { additions: (_a = pushCommitVars.fileChanges.additions) === null || _a === void 0 ? void 0 : _a.map(addition => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { contents } = addition, rest = __rest(addition, ["contents"]); - return rest; - }) }) }); - core.debug(`Push commit with payload: '${JSON.stringify(pushCommitVarsWithoutContents)}'`); - const commit = yield this.octokit.graphql(pushCommitMutation, pushCommitVars); - core.debug(`Pushed commit - '${JSON.stringify(commit)}'`); - core.info(`Pushed commit with hash - '${commit.createCommitOnBranch.commit.oid}' on branch - '${commit.createCommitOnBranch.ref.name}'`); - }); - } } exports.GitHubHelper = GitHubHelper; diff --git a/package-lock.json b/package-lock.json index 8e9087d..986baf0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,6 @@ "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@octokit/core": "^4.2.4", - "@octokit/graphql": "^8.1.1", - "@octokit/graphql-schema": "^15.25.0", "@octokit/plugin-paginate-rest": "^5.0.1", "@octokit/plugin-rest-endpoint-methods": "^6.8.1", "proxy-from-env": "^1.1.0", @@ -1312,83 +1310,6 @@ "node": ">= 14" } }, - "node_modules/@octokit/graphql": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz", - "integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==", - "dependencies": { - "@octokit/request": "^9.0.0", - "@octokit/types": "^13.0.0", - "universal-user-agent": "^7.0.0" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/@octokit/graphql-schema": { - "version": "15.25.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql-schema/-/graphql-schema-15.25.0.tgz", - "integrity": "sha512-aqz9WECtdxVWSqgKroUu9uu+CRt5KnfErWs0dBPKlTdrreAeWzS5NRu22ZVcGdPP7s3XDg2Gnf5iyoZPCRZWmQ==", - "dependencies": { - "graphql": "^16.0.0", - "graphql-tag": "^2.10.3" - } - }, - "node_modules/@octokit/graphql/node_modules/@octokit/endpoint": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz", - "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==", - "dependencies": { - "@octokit/types": "^13.0.0", - "universal-user-agent": "^7.0.2" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": { - "version": "22.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", - "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==" - }, - "node_modules/@octokit/graphql/node_modules/@octokit/request": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz", - "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==", - "dependencies": { - "@octokit/endpoint": "^10.0.0", - "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.1.0", - "universal-user-agent": "^7.0.2" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/@octokit/graphql/node_modules/@octokit/request-error": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz", - "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==", - "dependencies": { - "@octokit/types": "^13.0.0" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/@octokit/graphql/node_modules/@octokit/types": { - "version": "13.5.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", - "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", - "dependencies": { - "@octokit/openapi-types": "^22.2.0" - } - }, - "node_modules/@octokit/graphql/node_modules/universal-user-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz", - "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==" - }, "node_modules/@octokit/openapi-types": { "version": "18.1.1", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz", @@ -4567,28 +4488,6 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "node_modules/graphql": { - "version": "16.9.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz", - "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==", - "engines": { - "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" - } - }, - "node_modules/graphql-tag": { - "version": "2.12.6", - "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", - "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==", - "dependencies": { - "tslib": "^2.1.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" - } - }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -7636,7 +7535,8 @@ "node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "dev": true }, "node_modules/tsutils": { "version": "3.21.0", diff --git a/package.json b/package.json index d77369d..141b76f 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,6 @@ "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@octokit/core": "^4.2.4", - "@octokit/graphql": "^8.1.1", - "@octokit/graphql-schema": "^15.25.0", "@octokit/plugin-paginate-rest": "^5.0.1", "@octokit/plugin-rest-endpoint-methods": "^6.8.1", "proxy-from-env": "^1.1.0", diff --git a/src/create-or-update-branch.ts b/src/create-or-update-branch.ts index 99179ee..9e316dc 100644 --- a/src/create-or-update-branch.ts +++ b/src/create-or-update-branch.ts @@ -1,7 +1,6 @@ import * as core from '@actions/core' import {GitCommandManager, Commit} from './git-command-manager' import {v4 as uuidv4} from 'uuid' -import * as utils from './utils' const CHERRYPICK_EMPTY = 'The previous cherry-pick is now empty, possibly due to conflict resolution.' @@ -66,38 +65,6 @@ export async function buildBranchCommits( return commits } -export async function buildBranchFileChanges( - git: GitCommandManager, - base: string, - branch: string -): Promise { - const branchFileChanges: BranchFileChanges = { - additions: [], - deletions: [] - } - const changedFiles = await git.getChangedFiles([ - '--diff-filter=AM', - `${base}..${branch}` - ]) - const deletedFiles = await git.getChangedFiles([ - '--diff-filter=D', - `${base}..${branch}` - ]) - const repoPath = git.getWorkingDirectory() - for (const file of changedFiles) { - branchFileChanges.additions!.push({ - path: file, - contents: utils.readFileBase64([repoPath, file]) - }) - } - for (const file of deletedFiles) { - branchFileChanges.deletions!.push({ - path: file - }) - } - return branchFileChanges -} - // Return the number of commits that branch2 is ahead of branch1 async function commitsAhead( git: GitCommandManager, @@ -176,7 +143,6 @@ interface CreateOrUpdateBranchResult { base: string hasDiffWithBase: boolean headSha: string - branchFileChanges?: BranchFileChanges branchCommits: Commit[] } @@ -356,9 +322,6 @@ export async function createOrUpdateBranch( // Build the branch commits result.branchCommits = await buildBranchCommits(git, base, branch) - // Build the branch file changes - result.branchFileChanges = await buildBranchFileChanges(git, base, branch) - // Get the pull request branch SHA result.headSha = await git.revParse('HEAD') diff --git a/src/create-pull-request.ts b/src/create-pull-request.ts index 09c2a8d..457dcd4 100644 --- a/src/create-pull-request.ts +++ b/src/create-pull-request.ts @@ -205,13 +205,6 @@ export async function createPullRequest(inputs: Inputs): Promise { branchRepository, inputs.branch ) - // await githubHelper.pushSignedCommit( - // branchRepository, - // inputs.branch, - // inputs.base, - // inputs.commitMessage, - // result.branchFileChanges - // ) await git.checkout('-') if (stashed) { await git.stashPop() diff --git a/src/github-helper.ts b/src/github-helper.ts index b30c676..7632fc2 100644 --- a/src/github-helper.ts +++ b/src/github-helper.ts @@ -2,13 +2,6 @@ import * as core from '@actions/core' import {Inputs} from './create-pull-request' import {Commit} from './git-command-manager' import {Octokit, OctokitOptions} from './octokit-client' -import type { - Repository as TempRepository, - Ref, - Commit as CommitTemp, - FileChanges -} from '@octokit/graphql-schema' -import {BranchFileChanges} from './create-or-update-branch' import * as utils from './utils' const ERROR_PR_REVIEW_TOKEN_SCOPE = @@ -221,12 +214,12 @@ export class GitHubHelper { const repository = this.parseRepository(branchRepository) let treeSha = commit.tree if (commit.changes.length > 0) { - core.debug(`Creating tree objects for local commit ${commit.sha}`) + core.info(`Creating tree objects for local commit ${commit.sha}`) const treeObjects = await Promise.all( commit.changes.map(async ({path, mode, status}) => { let sha: string | null = null if (status === 'A' || status === 'M') { - core.debug(`Creating blob for file '${path}'`) + core.info(`Creating blob for file '${path}'`) const {data: blob} = await this.octokit.rest.git.createBlob({ ...repository, content: utils.readFileBase64([repoPath, path]), @@ -242,14 +235,14 @@ export class GitHubHelper { } }) ) - core.debug(`Creating tree for local commit ${commit.sha}`) + core.info(`Creating tree for local commit ${commit.sha}`) const {data: tree} = await this.octokit.rest.git.createTree({ ...repository, base_tree: commit.parents[0], tree: treeObjects }) treeSha = tree.sha - core.debug(`Created tree ${treeSha} for local commit ${commit.sha}`) + core.info(`Created tree ${treeSha} for local commit ${commit.sha}`) } const {data: remoteCommit} = await this.octokit.rest.git.createCommit({ @@ -258,7 +251,7 @@ export class GitHubHelper { tree: treeSha, message: `${commit.subject}\n\n${commit.body}` }) - core.debug( + core.info( `Created commit ${remoteCommit.sha} for local commit ${commit.sha}` ) return remoteCommit.sha @@ -270,10 +263,10 @@ export class GitHubHelper { newHead: string ) { const repository = this.parseRepository(branchRepository) - const branchExists = await this.octokit.rest.git - .getRef({ + const branchExists = await this.octokit.rest.repos + .getBranch({ ...repository, - ref: branch + branch: branch }) .then( () => true, @@ -281,14 +274,14 @@ export class GitHubHelper { ) if (branchExists) { - core.debug(`Branch ${branch} exists, updating ref`) + core.info(`Branch ${branch} exists; Updating ref`) await this.octokit.rest.git.updateRef({ ...repository, sha: newHead, ref: `heads/${branch}` }) } else { - core.debug(`Branch ${branch} does not exist, creating ref`) + core.info(`Branch ${branch} does not exist; Creating ref`) await this.octokit.rest.git.createRef({ ...repository, sha: newHead, @@ -296,171 +289,4 @@ export class GitHubHelper { }) } } - - async pushSignedCommit( - branchRepository: string, - branch: string, - base: string, - commitMessage: string, - branchFileChanges?: BranchFileChanges - ): Promise { - core.info(`Use API to push a signed commit`) - - const [repoOwner, repoName] = branchRepository.split('/') - core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`) - const refQuery = ` - query GetRefId($repoName: String!, $repoOwner: String!, $branchName: String!) { - repository(owner: $repoOwner, name: $repoName){ - id - ref(qualifiedName: $branchName){ - id - name - prefix - target{ - id - oid - commitUrl - commitResourcePath - abbreviatedOid - } - } - }, - } - ` - - let branchRef = await this.octokit.graphql<{repository: TempRepository}>( - refQuery, - { - repoOwner: repoOwner, - repoName: repoName, - branchName: branch - } - ) - core.debug( - `Fetched information for branch '${branch}' - '${JSON.stringify(branchRef)}'` - ) - - // if the branch does not exist, then first we need to create the branch from base - if (branchRef.repository.ref == null) { - core.debug(`Branch does not exist - '${branch}'`) - branchRef = await this.octokit.graphql<{repository: TempRepository}>( - refQuery, - { - repoOwner: repoOwner, - repoName: repoName, - branchName: base - } - ) - core.debug( - `Fetched information for base branch '${base}' - '${JSON.stringify(branchRef)}'` - ) - - core.info( - `Creating new branch '${branch}' from '${base}', with ref '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'` - ) - if (branchRef.repository.ref != null) { - core.debug(`Send request for creating new branch`) - const newBranchMutation = ` - mutation CreateNewBranch($branchName: String!, $oid: GitObjectID!, $repoId: ID!) { - createRef(input: { - name: $branchName, - oid: $oid, - repositoryId: $repoId - }) { - ref { - id - name - prefix - } - } - } - ` - const newBranch = await this.octokit.graphql<{createRef: {ref: Ref}}>( - newBranchMutation, - { - repoId: branchRef.repository.id, - oid: branchRef.repository.ref.target!.oid, - branchName: 'refs/heads/' + branch - } - ) - core.debug( - `Created new branch '${branch}': '${JSON.stringify(newBranch.createRef.ref)}'` - ) - } - } - core.info( - `Hash ref of branch '${branch}' is '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'` - ) - - const fileChanges = { - additions: branchFileChanges!.additions, - deletions: branchFileChanges!.deletions - } - - const pushCommitMutation = ` - mutation PushCommit( - $repoNameWithOwner: String!, - $branchName: String!, - $headOid: GitObjectID!, - $commitMessage: String!, - $fileChanges: FileChanges - ) { - createCommitOnBranch(input: { - branch: { - repositoryNameWithOwner: $repoNameWithOwner, - branchName: $branchName, - } - fileChanges: $fileChanges - message: { - headline: $commitMessage - } - expectedHeadOid: $headOid - }){ - clientMutationId - ref{ - id - name - prefix - } - commit{ - id - abbreviatedOid - oid - } - } - } - ` - const pushCommitVars = { - branchName: branch, - repoNameWithOwner: repoOwner + '/' + repoName, - headOid: branchRef.repository.ref!.target!.oid, - commitMessage: commitMessage, - fileChanges: fileChanges - } - - const pushCommitVarsWithoutContents = { - ...pushCommitVars, - fileChanges: { - ...pushCommitVars.fileChanges, - additions: pushCommitVars.fileChanges.additions?.map(addition => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const {contents, ...rest} = addition - return rest - }) - } - } - - core.debug( - `Push commit with payload: '${JSON.stringify(pushCommitVarsWithoutContents)}'` - ) - - const commit = await this.octokit.graphql<{ - createCommitOnBranch: {ref: Ref; commit: CommitTemp} - }>(pushCommitMutation, pushCommitVars) - - core.debug(`Pushed commit - '${JSON.stringify(commit)}'`) - core.info( - `Pushed commit with hash - '${commit.createCommitOnBranch.commit.oid}' on branch - '${commit.createCommitOnBranch.ref.name}'` - ) - } }