address code review

microsoft · Jul 1, 2024 · f4e63f8 · f4e63f8
1 parent ec60553
commit f4e63f8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 31 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,7 +43,8 @@ jobs:
         run: TYPESCRIPT_BOT_TOKEN=secret node packages/mergebot/dist/functions/index.js
 
       - name: Create zip
-        run: zip -r ${{ env.FUNCTION_ZIP_NAME }} packagaes/mergebot/dist packages/mergebot/host.json packages/mergebot/package.json
+        working-directory: packages/mergebot
+        run: zip -r ${{ env.GITHUB_WORKSPACE }}/${{ env.FUNCTION_ZIP_NAME }} dist host.json package.json
 
       - name: Upload artifact for deployment job
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
@@ -57,6 +58,7 @@ jobs:
     environment:
       name: 'Production'
     permissions:
+      contents: read
       id-token: write
 
     steps:

diff --git a/packages/mergebot/LICENSE b/packages/mergebot/LICENSE
diff --git a/packages/mergebot/package.json b/packages/mergebot/package.json
@@ -8,7 +8,8 @@
   "main": "dist/functions/index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/microsoft/definitelytyped-tools.git"
+    "url": "https://github.com/microsoft/definitelytyped-tools.git",
+    "directory": "packages/mergebot"
   },
   "bugs": {
     "url": "https://github.com/microsoft/definitelytyped-tools/issues"

diff --git a/packages/mergebot/src/_tests/fixturedActions.test.ts b/packages/mergebot/src/_tests/fixturedActions.test.ts
@@ -17,7 +17,7 @@ expect.extend({ toMatchFile });
 
 /* You can use the following command to add/update fixtures with an existing PR
  *
- *     TYPESCRIPT_BOT_TOKEN=XYZ pnpm run create-fixture -- 43164
+ *     BOT_AUTH_TOKEN=XYZ pnpm run create-fixture -- 43164
  */
 
 async function testFixture(dir: string) {

diff --git a/packages/mergebot/src/execute-pr-actions.ts b/packages/mergebot/src/execute-pr-actions.ts
@@ -180,7 +180,7 @@ function doRestCall(call: RestMutation): Promise<void> {
   const url = `https://api.github.com/repos/DefinitelyTyped/DefinitelyTyped/${call.op}`;
   const headers = {
     accept: "application/vnd.github.v3+json",
-    authorization: `token ${process.env.TYPESCRIPT_BOT_TOKEN}`,
+    authorization: `token ${process.env.BOT_AUTH_TOKEN}`,
     "user-agent": "mergebot",
   };
   return new Promise((resolve, reject) => {

diff --git a/packages/mergebot/src/graphql-client.ts b/packages/mergebot/src/graphql-client.ts
@@ -36,13 +36,9 @@ export function createMutation<T>(
 function getAuthToken() {
   if (process.env.JEST_WORKER_ID) return "FAKE_TOKEN";
 
-  const result =
-    process.env.BOT_AUTH_TOKEN ||
-    process.env.AUTH_TOKEN ||
-    process.env.DT_BOT_AUTH_TOKEN ||
-    process.env.TYPESCRIPT_BOT_TOKEN;
+  const result = process.env.BOT_AUTH_TOKEN || process.env.AUTH_TOKEN || process.env.DT_BOT_AUTH_TOKEN;
   if (typeof result !== "string") {
-    throw new Error("Set either BOT_AUTH_TOKEN or TYPESCRIPT_BOT_TOKEN to a valid auth token");
+    throw new Error("Set BOT_AUTH_TOKEN or AUTH_TOKEN to a valid auth token");
   }
   return result.trim();
 }