fix

.github/supersetbot/.eslintrc.json

@@ -5,5 +5,9 @@
     "import/prefer-default-export": 0,
     "func-names": 0,
     "no-console": 0
+  },
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module"
   }
 }

.github/supersetbot/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "main": "src/index.js",
   "scripts": {
-    "test": "jest",
+    "test": "node --experimental-vm-modules node_modules/.bin/jest",
     "eslint": "eslint",
     "supersetbot": "supersetbot"
   },
@@ -18,6 +18,9 @@
     "string-argv": "^0.3.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
+    "babel-jest": "^29.7.0",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.29.1",

.github/supersetbot/src/cli.js

@@ -29,10 +29,10 @@ export default function getCLI(envContext) {
   program.command('orglabel')
     .description('Add an org label based on the author')
     .option(...issueOptionParams)
-    .action(async function (commandOptions) {
+    .action(async function () {
       const opts = envContext.processOptions(this, ['issue', 'repo']);
       const wrapped = envContext.commandWrapper({
-        func: commands.unlabel,
+        func: commands.assignOrgLabel,
         successMsg: 'SUCCESS: added the right labels',
         errorMsg: 'FAILED at stuff',
         verbose: opts.verbose,

.github/supersetbot/src/commands.js

@@ -7,19 +7,19 @@ function unPackRepo(longRepo) {
 }
 
 function isLabelProtected(label) {
-  return PROTECTED_LABEL_PATTERNS.some(pattern => new RegExp(pattern).test(label));
+  return PROTECTED_LABEL_PATTERNS.some((pattern) => new RegExp(pattern).test(label));
 }
 
 async function checkIfUserInTeam(username, team, context, verbose) {
-  const [org, team_slug] = team.split('/');
+  const [org, teamSlug] = team.split('/');
   const wrapped = context.commandWrapper({
     func: context.github.teams.getMembershipForUserInOrg,
-    errorMsg: "User is not authorized to alter protected labels.",
+    errorMsg: `User "${username}" is not authorized to alter protected labels.`,
     verbose,
   });
   const resp = await wrapped({
     org,
-    team_slug,
+    team_slug: teamSlug,
     username,
   });
   return resp?.data?.state === 'active';
@@ -29,43 +29,48 @@ async function checkIfUserInTeam(username, team, context, verbose) {
 // Individual commands
 // -------------------------------------
 export async function label(longRepo, issueNumber, label, context, actor = null, verbose = false) {
+  let hasPerm = true;
   if (actor && isLabelProtected(label)) {
-    checkIfUserInTeam(actor, COMMITTER_TEAM, context, verbose);
+    hasPerm = await checkIfUserInTeam(actor, COMMITTER_TEAM, context, verbose);
+  }
+  if (hasPerm) {
+    const addLabelWrapped = context.commandWrapper({
+      func: context.github.rest.issues.addLabels,
+      successMsg: `SUCCESS: label "${label}" added to issue ${issueNumber}`,
+      verbose,
+    });
+    await addLabelWrapped({
+      ...unPackRepo(longRepo),
+      issue_number: issueNumber,
+      labels: [label],
+    });
   }
-  const addLabelWrapped = context.commandWrapper({
-    func: context.github.rest.issues.addLabels,
-    successMsg:`SUCCESS: label "${label}" added to issue ${issueNumber}`,
-    verbose,
-  });
-  await addLabelWrapped({
-    ...unPackRepo(longRepo),
-    issue_number: issueNumber,
-    labels: [label],
-  });
 }
 
-export async function unlabel(longRepo, issueNumber, label, context, actor = null, verbose = false) {
+export async function unlabel(repo, issueNumber, label, context, actor = null, verbose = false) {
+  let hasPerm = true;
   if (actor && isLabelProtected(label)) {
-    checkIfUserInTeam(actor, COMMITTER_TEAM, context, verbose);
+    const hasPerm = await checkIfUserInTeam(actor, COMMITTER_TEAM, context, verbose);
+  }
+  if (hasPerm) {
+    const addLabelWrapped = context.commandWrapper({
+      func: context.github.rest.issues.removeLabel,
+      successMsg: `SUCCESS: label "${label}" removed from issue ${issueNumber}`,
+      verbose,
+    });
+    await addLabelWrapped({
+      ...unPackRepo(repo),
+      issue_number: issueNumber,
+      name: label,
+    });
   }
-  const addLabelWrapped = context.commandWrapper({
-    func: context.github.rest.issues.removeLabel,
-    successMsg:`SUCCESS: label "${label}" removed from issue ${issueNumber}`,
-    verbose,
-  });
-  await addLabelWrapped({
-    ...unPackRepo(longRepo),
-    issue_number: issueNumber,
-    name: label,
-  });
 }
 
 export async function assignOrgLabel(repo, issueNumber, context) {
   const issue = await context.github.rest.issues.get({
     ...unPackRepo(repo),
     issue_number: issueNumber,
   });
-
   const username = issue.data.user.login;
   const orgs = await context.github.orgs.listForUser({ username });
   const orgNames = orgs.data.map((v) => v.login);

.github/supersetbot/src/context.js

@@ -2,11 +2,10 @@ import { Octokit } from '@octokit/rest';
 
 class Context {
   constructor(source) {
-
+    this.hasErrors = false;
     if (!process.env.GITHUB_TOKEN) {
       const msg = 'GITHUB_TOKEN is not set. Please set the GITHUB_TOKEN environment variable.';
       this.logError(msg);
-      process.exit(1);
     }
     this.github = new Octokit({ auth: `token ${process.env.GITHUB_TOKEN}` });
 
@@ -15,28 +14,33 @@ class Context {
     this.options = {};
     this.errorLogs = [];
     this.logs = [];
+    this.hasError = false;
   }
+
   requireOption(optionName, options) {
     const optionValue = options[optionName];
     if (optionValue === undefined || optionValue === null) {
       this.logError(`🔴 ERROR: option [${optionName}] is required`);
-      process.exit(1);
+      this.hasError = true;
     }
   }
+
   requireOptions(optionNames, options) {
     optionNames.forEach((optionName) => {
       this.requireOption(optionName, options);
     });
   }
+
   log(msg) {
     console.log(msg);
     this.logs.push(msg);
   }
+
   processOptions(command, requiredOptions) {
     const raw = command.parent?.rawArgs;
     this.command = '???';
     if (raw) {
-      this.command = raw.map(s => s.includes(' ') ? `"${s}"` : s).join(' ').replace('node ', '');
+      this.command = raw.map((s) => (s.includes(' ') ? `"${s}"` : s)).join(' ').replace('node ', '');
     }
     this.options = { ...command.opts(), ...command.parent.opts() };
     this.requireOptions(requiredOptions, this.options);
@@ -49,48 +53,47 @@ class Context {
 
     return this.options;
   }
+
   logError(msg) {
+    this.hasErrors = true;
     console.error(msg);
     this.errorLogs.push(msg);
   }
 
-  preCommand() {
-  }
-
-  commandWrapper({func, successMsg, errorMsg = null, verbose = false, exitOnError = true}) {
+  commandWrapper({
+    func, successMsg, errorMsg = null, verbose = false,
+  }) {
     return async (...args) => {
-      this.preCommand();
       let resp;
       try {
         resp = await func(...args);
+        if (verbose) {
+          console.log(resp);
+        }
       } catch (error) {
         if (errorMsg) {
           this.logError(`🔴 ERROR: ${errorMsg}`);
         } else {
           this.logError(`🔴 ERROR: ${error}`);
         }
-        if (exitOnError) {
-          process.exit(1);
-        }
       }
       if (successMsg) {
         this.log(`🟢 ${successMsg}`);
       }
-      await this.onDone();
       return resp;
     };
   }
-  reconstructCommand() {
-  }
-  async onDone(msg) {
+
+  async onDone() {
     if (this.source === 'GHA') {
-      const [owner, repo] = this.repo.split('/')
       let body = '';
-      body += `> \`${this.command}\`\n\n`
-      body += "```\n"
-      body += this.logs.join('\n')
-      body += this.errorLogs.join('\n')
-      body += "```"
+      body += `> \`${this.command}\`\n\n`;
+      body += '```\n';
+      body += this.logs.join('\n');
+      body += this.errorLogs.join('\n');
+      body += '```';
+
+      const [owner, repo] = this.repo.split('/');
       await this.github.rest.issues.createComment({
         owner,
         repo,
@@ -99,7 +102,6 @@ class Context {
       });
     }
   }
-
 }
 
 export default Context;

.github/supersetbot/src/index.js

@@ -9,7 +9,8 @@ export async function runCommandFromGithubAction(rawCommand) {
   // Make rawCommand look like argv
   const cmd = rawCommand.trim().replace('@supersetbot', 'supersetbot');
   const args = parseArgsStringToArgv(cmd);
-  const resp = await cli.parseAsync(['node', ...args]);
+  await cli.parseAsync(['node', ...args]);
+  envContext.onDone();
 }
 
 const supersetbot = {

.github/supersetbot/src/metadata.js

@@ -11,4 +11,4 @@ export const PROTECTED_LABEL_PATTERNS = [
   'protected.*',
   '^v\\d+(\\.\\d+)*$',
 ];
-export const COMMITTER_TEAM = "apache/superset-committers";
+export const COMMITTER_TEAM = 'apache/superset-committers';