Hotfix Alexa Labeller (#19379)

* Fix Docker Process for Alexa labeller

- Update Docker image
- Also rename main function utility module for index.js
  - Accidently overwrote global variable "process"

* Fix typo in index.js

Author: zoracon

utils/labeller/Dockerfile

@@ -6,6 +6,8 @@ WORKDIR /opt
 COPY package.json .
 RUN npm install
 COPY index.js .
+COPY utils.js .
+COPY test.js .
 COPY config.json.example .
 RUN mv config.json.example config.json
 

utils/labeller/README.md

@@ -31,7 +31,7 @@ Enter your GitHub token info into `config.json`.
 
 Set your `$GITHUB_TOKEN` with "repo, write:discussion" permissions, and run
 
-    docker run -it -v $(pwd)/state_dir:/opt/state_dir -e GITHUB_TOKEN=$GITHUB_TOKEN labeller
+    docker run -it -e GITHUB_TOKEN=$GITHUB_TOKEN labeller
 
 ### Without Docker
 

utils/labeller/index.js

@@ -1,13 +1,14 @@
 "use strict";
 
 const { Octokit } = require('@octokit/rest');
-const process = require('./process');
+const utils = require('./utils');
 const axios = require('axios');
 const unzip = require('unzipper');
 const config = require('./config');
+const token = config.github_token || process.env.GITHUB_TOKEN;
 
 const octokit = new Octokit({
-  auth: config.github_token,
+  auth: token,
   userAgent: 'Labeller v2'
 });
 const httpse = {
@@ -18,7 +19,7 @@ const httpse = {
 let ProgressBar = require('progress');
 
 // Background process functions for logic flow below
-let Process = new process.Process(octokit, httpse);
+let Utils = new utils.Utils(octokit, httpse);
 
 /**
  * @description Fetch the Alexa top 1M sites and push it to an array `alexa` via streams
@@ -95,7 +96,7 @@ function get_prs(alexa) {
  * @description Labels Pull Requests
  */
 function process_prs(alexa, prs) {
-  let filtered_prs = prs.filter(Process.labelled);
+  let filtered_prs = prs.filter(Utils.labelled);
 
   prs.forEach(pr => {
 
@@ -105,11 +106,11 @@ function process_prs(alexa, prs) {
       ...httpse,
       pull_number: pr.number,
     }).then(files => {
-      let rank_number = Process.files(files, alexa);
+      let rank_number = Utils.files(files, alexa);
       if(rank_number !== null) {
-        let determined_label = Process.return_label(rank_number);
+        let determined_label = Utils.return_label(rank_number);
         // pr is interchangeable with issue in API ¯\_(ツ)_/¯
-        Process.add_label(determined_label, pr.number);
+        Utils.add_label(determined_label, pr.number);
       }
     })
   });

utils/labeller/state_dir/.gitignore

@@ -1,17 +1,17 @@
 'use strict';
 
 const assert = require('chai').assert;
-const process = require('./process.js');
+const utils = require('./utils.js');
 
 describe('index.js', () => {
-  describe('Process.return_label', () => {
+  describe('Utils.return_label', () => {
     it('returns proper rank label', () => {
-      let testProcess = new process.Process();
-      assert.equal(testProcess.return_label(89), 'top-100', "doesn't match label");
-      assert.equal(testProcess.return_label(899), 'top-1k', "doesn't match label");
-      assert.equal(testProcess.return_label(8999), 'top-10k', "doesn't match label");
-      assert.equal(testProcess.return_label(89999), 'top-100k', "doesn't match label");
-      assert.equal(testProcess.return_label(899999), 'top-1m', "doesn't match label");
+      let testUtils = new utils.Utils();
+      assert.equal(testUtils.return_label(89), 'top-100', "doesn't match label");
+      assert.equal(testUtils.return_label(899), 'top-1k', "doesn't match label");
+      assert.equal(testUtils.return_label(8999), 'top-10k', "doesn't match label");
+      assert.equal(testUtils.return_label(89999), 'top-100k', "doesn't match label");
+      assert.equal(testUtils.return_label(899999), 'top-1m', "doesn't match label");
     });
   });
 });

utils/labeller/test.js

@@ -1,9 +1,9 @@
 'use strict';
-// Process Functions for Labeller
 
+// Process Functions for Labeller
 const alexa_labels = ['top-1m', 'top-100k', 'top-10k', 'top-1k', 'top-100'];
 
-class Process {
+class Utils {
   constructor(octokit, httpse) {
     this.octokit = octokit;
     this.httpse = httpse;
@@ -77,5 +77,5 @@ class Process {
 }
 
 module.exports = {
-  Process: Process
+  Utils: Utils
 }