Merge pull request #189 from lerna/nm-handle-401-responses

Abort process when github response is not OK
lerna · Dec 16, 2019 · b22c6fb · b22c6fb
2 parents aaf93c8 + cccc244
commit b22c6fb
Show file tree

Hide file tree

Showing 7 changed files with 254 additions and 127 deletions.
diff --git a/src/__mocks__/fetch.ts b/src/__mocks__/fetch.ts
@@ -1,16 +1,31 @@
 "use strict";
 
-let mockResponses: { [url: string]: string } = {};
+type Json = { [key: string]: unknown };
+type MockResponse = { status: number; statusText: string; ok: boolean; body: Json };
+
+let mockResponses: { [url: string]: Partial<MockResponse> } = {};
+
+const defaultMockResponseParams = {
+  status: 200,
+  statusText: "OK",
+  ok: true,
+};
 
 export default async function fetch(url: string) {
   const mockResponse = mockResponses[url];
   if (mockResponse) {
-    return { json: () => mockResponse };
+    const fullMockResponse = { ...defaultMockResponseParams, ...mockResponse };
+    return {
+      status: fullMockResponse.status,
+      statusText: fullMockResponse.statusText,
+      ok: fullMockResponse.ok,
+      json: () => Promise.resolve(fullMockResponse.body),
+    };
   }
   throw new Error(`Unknown URL: ${url}`);
 }
 
-export function __setMockResponses(newMockResponses: { [url: string]: string }) {
+export function __setMockResponses(newMockResponses: { [url: string]: Partial<MockResponse> }) {
   mockResponses = newMockResponses;
 }
 

diff --git a/src/changelog.spec.ts b/src/changelog.spec.ts
@@ -69,17 +69,21 @@ describe("Changelog", () => {
 
       const usersCache = {
         "https://api.github.com/users/test-user": {
-          login: "test-user",
-          html_url: "https://github.com/test-user",
-          name: "Test User",
+          body: {
+            login: "test-user",
+            html_url: "https://github.com/test-user",
+            name: "Test User",
+          },
         },
       };
       const issuesCache = {
         "https://api.github.com/repos/lerna/lerna-changelog/issues/2": {
-          number: 2,
-          title: "This is the commit title for the issue (#2)",
-          labels: [{ name: "Type: New Feature" }, { name: "Status: In Progress" }],
-          user: usersCache["https://api.github.com/users/test-user"],
+          body: {
+            number: 2,
+            title: "This is the commit title for the issue (#2)",
+            labels: [{ name: "Type: New Feature" }, { name: "Status: In Progress" }],
+            user: usersCache["https://api.github.com/users/test-user"].body,
+          },
         },
       };
       require("./fetch").__setMockResponses({
@@ -107,24 +111,32 @@ describe("Changelog", () => {
 
       const usersCache = {
         "https://api.github.com/users/test-user": {
-          login: "test-user",
-          html_url: "https://github.com/test-user",
-          name: "Test User",
+          body: {
+            login: "test-user",
+            html_url: "https://github.com/test-user",
+            name: "Test User",
+          },
         },
         "https://api.github.com/users/test-user-1": {
-          login: "test-user-1",
-          html_url: "https://github.com/test-user-1",
-          name: "Test User 1",
+          body: {
+            login: "test-user-1",
+            html_url: "https://github.com/test-user-1",
+            name: "Test User 1",
+          },
         },
         "https://api.github.com/users/test-user-2": {
-          login: "test-user-2",
-          html_url: "https://github.com/test-user-2",
-          name: "Test User 2",
+          body: {
+            login: "test-user-2",
+            html_url: "https://github.com/test-user-2",
+            name: "Test User 2",
+          },
         },
         "https://api.github.com/users/user-bot": {
-          login: "user-bot",
-          html_url: "https://github.com/user-bot",
-          name: "User Bot",
+          body: {
+            login: "user-bot",
+            html_url: "https://github.com/user-bot",
+            name: "User Bot",
+          },
         },
       };
       require("./fetch").__setMockResponses(usersCache);

diff --git a/src/changelog.ts b/src/changelog.ts
@@ -215,17 +215,19 @@ export default class Changelog {
   private async fillInPackages(commits: CommitInfo[]) {
     progressBar.init("Mapping commits to packages…", commits.length);
 
-    await pMap(
-      commits,
-      async (commit: CommitInfo) => {
-        commit.packages = await this.getListOfUniquePackages(commit.commitSHA);
-
-        progressBar.tick();
-      },
-      { concurrency: 5 }
-    );
-
-    progressBar.terminate();
+    try {
+      await pMap(
+        commits,
+        async (commit: CommitInfo) => {
+          commit.packages = await this.getListOfUniquePackages(commit.commitSHA);
+
+          progressBar.tick();
+        },
+        { concurrency: 5 }
+      );
+    } finally {
+      progressBar.terminate();
+    }
   }
 
   private async fillInContributors(releases: Release[]) {

diff --git a/src/cli.ts b/src/cli.ts
@@ -88,5 +88,7 @@ export async function run() {
     } else {
       console.log(chalk.red(e.stack));
     }
+
+    process.exitCode = 1;
   }
 }
diff --git a/src/functional/markdown-empty.spec.ts b/src/functional/markdown-empty.spec.ts
@@ -50,48 +50,60 @@ const listOfFileForEachCommit: { [id: string]: string[] } = {
 
 const usersCache = {
   "https://api.github.com/users/luke": {
-    login: "luke",
-    html_url: "https://github.com/luke",
-    name: "Luke Skywalker",
+    body: {
+      login: "luke",
+      html_url: "https://github.com/luke",
+      name: "Luke Skywalker",
+    },
   },
   "https://api.github.com/users/vader": {
-    login: "vader",
-    html_url: "https://github.com/vader",
-    name: "Darth Vader",
+    body: {
+      login: "vader",
+      html_url: "https://github.com/vader",
+      name: "Darth Vader",
+    },
   },
   "https://api.github.com/users/gtarkin": {
-    login: "gtarkin",
-    html_url: "https://github.com/gtarkin",
-    name: "Governor Tarkin",
+    body: {
+      login: "gtarkin",
+      html_url: "https://github.com/gtarkin",
+      name: "Governor Tarkin",
+    },
   },
 };
 const issuesCache = {
   "https://api.github.com/repos/lerna/lerna-changelog/issues/1": {
-    number: 1,
-    title: "feat: May the force be with you",
-    labels: [{ name: "Type: New Feature" }],
-    pull_request: {
-      html_url: "https://github.com/lerna/lerna-changelog/pull/1",
+    body: {
+      number: 1,
+      title: "feat: May the force be with you",
+      labels: [{ name: "Type: New Feature" }],
+      pull_request: {
+        html_url: "https://github.com/lerna/lerna-changelog/pull/1",
+      },
+      user: usersCache["https://api.github.com/users/luke"],
     },
-    user: usersCache["https://api.github.com/users/luke"],
   },
   "https://api.github.com/repos/lerna/lerna-changelog/issues/2": {
-    number: 2,
-    title: "chore: Terminate her... immediately!",
-    labels: [{ name: "Type: Breaking Change" }],
-    pull_request: {
-      html_url: "https://github.com/lerna/lerna-changelog/pull/2",
+    body: {
+      number: 2,
+      title: "chore: Terminate her... immediately!",
+      labels: [{ name: "Type: Breaking Change" }],
+      pull_request: {
+        html_url: "https://github.com/lerna/lerna-changelog/pull/2",
+      },
+      user: usersCache["https://api.github.com/users/gtarkin"],
     },
-    user: usersCache["https://api.github.com/users/gtarkin"],
   },
   "https://api.github.com/repos/lerna/lerna-changelog/issues/3": {
-    number: 3,
-    title: "fix: Get me the rebels base!",
-    labels: [{ name: "Type: Bug" }],
-    pull_request: {
-      html_url: "https://github.com/lerna/lerna-changelog/pull/3",
+    body: {
+      number: 3,
+      title: "fix: Get me the rebels base!",
+      labels: [{ name: "Type: Bug" }],
+      pull_request: {
+        html_url: "https://github.com/lerna/lerna-changelog/pull/3",
+      },
+      user: usersCache["https://api.github.com/users/vader"],
     },
-    user: usersCache["https://api.github.com/users/vader"],
   },
 };