Merge pull request #43 from ubiquity-os-marketplace/development

Merge development into main

.github/workflows/compute.yml

@@ -20,6 +20,7 @@ on:
 
 jobs:
   compute:
+    environment: ${{ github.ref == 'refs/heads/main' && 'main' || 'development' }}
     permissions: write-all
     name: User Activity Watcher
     runs-on: ubuntu-latest

src/helpers/remind-and-remove.ts

@@ -58,12 +58,28 @@ async function remindAssignees(context: ContextPlugin, issue: ListIssueForRepo)
     });
   } else {
     const pullRequests = await collectLinkedPullRequests(context, { repo, owner, issue_number });
+    let shouldPostToMainIssue = false;
     for (const pullRequest of pullRequests) {
       const { owner: prOwner, repo: prRepo, issue_number: prNumber } = parseIssueUrl(pullRequest.url);
+      try {
+        await octokit.rest.issues.createComment({
+          owner: prOwner,
+          repo: prRepo,
+          issue_number: prNumber,
+          body: [logMessage.logMessage.raw, metadata].join("\n"),
+        });
+      } catch (e) {
+        logger.error(`Could not post to ${pullRequest.url} will post to the issue instead.`, { e });
+        shouldPostToMainIssue = true;
+      }
+    }
+    // This is a fallback if we failed to post the reminder to a pull-request, which can happen when posting cross
+    // organizations, so we post to the parent issue instead, to make sure the user got a reminder.
+    if (shouldPostToMainIssue) {
       await octokit.rest.issues.createComment({
-        owner: prOwner,
-        repo: prRepo,
-        issue_number: prNumber,
+        owner,
+        repo,
+        issue_number,
         body: [logMessage.logMessage.raw, metadata].join("\n"),
       });
     }

src/index.ts

@@ -11,6 +11,7 @@ createActionsPlugin<PluginSettings, Env, SupportedEvents>(
     envSchema: envSchema,
     settingsSchema: pluginSettingsSchema,
     logLevel: process.env.LOG_LEVEL || LOG_LEVEL.INFO,
+    postCommentOnError: false,
     ...(process.env.KERNEL_PUBLIC_KEY && { kernelPublicKey: process.env.KERNEL_PUBLIC_KEY }),
   }
 ).catch(console.error);

tests/comment.test.ts

@@ -0,0 +1,91 @@
+import { beforeEach, describe, expect, it, jest } from "@jest/globals";
+import { RestEndpointMethodTypes } from "@octokit/rest";
+import { Logs } from "@ubiquity-os/ubiquity-os-logger";
+import { ListIssueForRepo } from "../src/types/github-types";
+import { ContextPlugin } from "../src/types/plugin-input";
+
+jest.unstable_mockModule("../src/helpers/collect-linked-pulls", () => []);
+jest.unstable_mockModule("../src/helpers/github-url", () => ({
+  parseIssueUrl: jest.fn(() => ({
+    repo: "repo",
+    owner: "owner",
+    issue_number: 1,
+  })),
+}));
+jest.unstable_mockModule("../src/helpers/structured-metadata", () => ({
+  createStructuredMetadata: jest.fn(() => ""),
+}));
+
+describe("remindAssigneesForIssue", () => {
+  let context: ContextPlugin;
+  let issue: ListIssueForRepo;
+
+  beforeEach(() => {
+    context = {
+      logger: new Logs("debug"),
+      octokit: {
+        rest: {
+          issues: {
+            createComment: jest.fn(),
+            removeAssignees: jest.fn(),
+          },
+        },
+      },
+      config: {
+        warning: 1,
+        disqualification: 1,
+        pullRequestRequired: false,
+      },
+    } as unknown as ContextPlugin;
+
+    issue = {
+      html_url: "https://github.com/owner/repo/issues/1",
+      assignees: [{ login: "ubiquity-os", id: 1 }],
+    } as unknown as ListIssueForRepo;
+  });
+
+  it("should post a comment to the parent issue if posting to the pull request fails", async () => {
+    context.config.pullRequestRequired = true;
+    jest.unstable_mockModule("../src/helpers/collect-linked-pulls", () => {
+      return {
+        collectLinkedPullRequests: jest.fn(() => [
+          {
+            url: "https://github.com/owner/repo/pull/1",
+            body: "",
+            id: "1",
+            login: "ubiquity-os",
+            number: 1,
+            state: "OPEN",
+            title: "title",
+          },
+        ]),
+      };
+    });
+
+    const mockedError = new Error("Failed to post comment");
+
+    (context.octokit.rest.issues.createComment as jest.MockedFunction<typeof context.octokit.rest.issues.createComment>)
+      .mockRejectedValueOnce(mockedError)
+      .mockResolvedValueOnce({} as unknown as RestEndpointMethodTypes["issues"]["createComment"]["response"]);
+
+    const { remindAssigneesForIssue } = await import("../src/helpers/remind-and-remove");
+    await remindAssigneesForIssue(context, issue);
+
+    expect(context.octokit.rest.issues.createComment).toHaveBeenCalledWith(
+      expect.objectContaining({
+        owner: "owner",
+        repo: "repo",
+        issue_number: 1,
+      })
+    );
+
+    expect(context.octokit.rest.issues.createComment).toHaveBeenCalledWith(
+      expect.objectContaining({
+        owner: "owner",
+        repo: "repo",
+        issue_number: 1,
+        body: expect.stringContaining("this task has been idle for a while"),
+      })
+    );
+  });
+});