apply changes from suggestion

Author: shortcuts

scripts/ci/codegen/cleanGeneratedBranch.ts

@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 import { run } from '../../common';
 
-import { branchExists } from './common';
-
 /**
- * Deletes a branch for it's `generated/headRef` name on origin.
+ * Deletes a branch for it's `generated/${headRef}` name on origin.
  *
  * @param headRef - The name of the branch to search for.
  */
@@ -15,19 +13,17 @@ export async function cleanGeneratedBranch(headRef?: string): Promise<void> {
 
   const generatedCodeBranch = `generated/${process.env.HEAD_REF || headRef}`;
 
-  if (!(await branchExists(generatedCodeBranch))) {
+  if (!(await run(`git ls-remote --heads origin ${generatedCodeBranch}`))) {
     console.log(`No branch named '${generatedCodeBranch}' was found.`);
 
     return;
   }
 
   // Delete previous generations to avoid conflicts and out of date code
-  if (await branchExists(generatedCodeBranch)) {
-    console.log(`Deleting generated branch: '${generatedCodeBranch}'`);
+  console.log(`Deleting generated branch: '${generatedCodeBranch}'`);
 
-    await run(`git fetch origin ${generatedCodeBranch}`);
-    await run(`git push -d origin ${generatedCodeBranch}`);
-  }
+  await run(`git fetch origin ${generatedCodeBranch}`);
+  await run(`git push -d origin ${generatedCodeBranch}`);
 }
 
 if (process.env.HEAD_REF) {

scripts/ci/codegen/common.ts

@@ -2,7 +2,7 @@
 import { Octokit } from '@octokit/rest';
 
 import { run } from '../../common';
-import { configureGitHubAuthor } from '../../release/common';
+import { configureGitHubAuthor, OWNER, REPO } from '../../release/common';
 
 import { cleanGeneratedBranch } from './cleanGeneratedBranch';
 
@@ -12,7 +12,6 @@ if (!process.env.GITHUB_TOKEN) {
 
 const PR_NUMBER = parseInt(process.env.PR_NUMBER || '0', 10);
 const FOLDERS_TO_CHECK = ['clients', 'specs/bundled'];
-const REPOSITORY_URL = `https://github.com/algolia/api-clients-automation`;
 // this should be changed to the bot name once we have the logs
 const BOT_NAME = 'shortcuts';
 
@@ -21,9 +20,10 @@ const octokit = new Octokit({
 });
 
 async function getCommentBody(commit: string, branch: string): Promise<string> {
+  const repoUrl = `https://github.com/${OWNER}/${REPO}`;
   const generatedCommit = await run('git show -s --format=%H');
-  const header = `✔️ codegen triggered on commit [${commit}](${REPOSITORY_URL}/pull/${PR_NUMBER}/commits/${commit}).`;
-  const body = `🔍 Browse the generated code on branch [${branch}](${REPOSITORY_URL}/tree/${branch}): [${generatedCommit}](${REPOSITORY_URL}/commit/${generatedCommit}).`;
+  const header = `✔️ codegen triggered on commit [${commit}](${repoUrl}/pull/${PR_NUMBER}/commits/${commit}).`;
+  const body = `🔍 Browse the generated code on branch [${branch}](${repoUrl}/tree/${branch}): [${generatedCommit}](${repoUrl}/commit/${generatedCommit}).`;
 
   return `${header}
 
@@ -33,13 +33,13 @@ ${body}`;
 /**
  * Add or update comment to the current `PR_NUMBER`.
  */
-async function addCommentToPullRequest(
+async function upsertCommentToPullRequest(
   baseCommit: string,
   generatedCodeBranch: string
 ): Promise<void> {
   const baseOctokitConfig = {
-    owner: 'algolia',
-    repo: 'api-clients-automation',
+    owner: OWNER,
+    repo: REPO,
     issue_number: PR_NUMBER,
   };
 
@@ -126,7 +126,7 @@ Co-authored-by: %an <%ae>"`);
   await run(`git push origin ${generatedCodeBranch}`);
 
   if (PR_NUMBER) {
-    await addCommentToPullRequest(baseCommit, generatedCodeBranch);
+    await upsertCommentToPullRequest(baseCommit, generatedCodeBranch);
   }
 }
 

scripts/ci/codegen/pushGeneratedCode.ts

@@ -31,8 +31,8 @@ export function getMarkdownSection(markdown: string, title: string): string {
 }
 
 export async function configureGitHubAuthor(cwd?: string): Promise<void> {
-  await run(`git config user.name "${getGitAuthor().name}"`, { cwd });
-  await run(`git config user.email "${getGitAuthor().email}"`, {
-    cwd,
-  });
+  const { name, email } = getGitAuthor();
+
+  await run(`git config user.name "${name}"`, { cwd });
+  await run(`git config user.email "${email}"`, { cwd });
 }