Resolve more linting and reduce app loads

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Author: peterzhuamazon

.eslintrc.js

@@ -27,6 +27,7 @@ module.exports = {
     'max-classes-per-file': 'off',
     'no-new': 'off',
     "no-console": "off",
+    "no-underscore-dangle": 'off',
     'max-len': ['error', { code: 160, ignoreComments: true }],
   },
 };

package-lock.json

@@ -28,7 +28,6 @@
     "dedent": "^1.5.1",
     "js-yaml": "^4.1.0",
     "probot": "^13.0.1",
-    "randomized-string": "^2.0.1",
     "randomstring": "^1.3.0",
     "ts-yaml": "^1.0.0"
   },
@@ -39,6 +38,7 @@
     "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.0.0",
+    "@types/randomstring": "^1.3.0",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "eslint": "^8.57.1",

package.json

@@ -4,7 +4,7 @@ import { load, YAMLException } from 'js-yaml';
 import { readFileSync, realpathSync } from 'fs';
 import { ResourceData, OperationData } from './types';
 
-export abstract class Config {
+export class Config {
   protected configType: string;
 
   protected configData: ResourceData | OperationData;
@@ -15,10 +15,10 @@ export abstract class Config {
     this.configType = configType;
   }
 
-  protected readConfig(filePath: string): any {
+  protected static readConfig(filePath: string): any {
     const realFilePath = realpathSync(filePath);
     try {
-      console.log(`Loading ${this.configType} config: ${realFilePath}`);
+      console.log(`Loading config: ${realFilePath}`);
       // Easier to convert YAML to JSON then parse and validate
       const yaml2json = JSON.stringify(load(readFileSync(realFilePath, 'utf-8')));
       console.log(yaml2json);
@@ -29,10 +29,11 @@ export abstract class Config {
       } else {
         console.error('Error:', e);
       }
+      return null;
     }
   }
 
-  protected validateConfig(data: ResourceData | OperationData, schema: any): void {
+  protected static validateConfig(data: ResourceData | OperationData, schema: any): void {
     console.log('Validating Schema......');
     const ajv = new Ajv();
     addFormats(ajv);

src/config/config.ts

@@ -46,31 +46,30 @@ export class OperationConfig extends Config {
 
   constructor(configPath: string, app: Probot) {
     super('OperationConfig');
-    this.configData = super.readConfig(configPath);
+    this.configData = OperationConfig.readConfig(configPath);
     this.configSchema = OperationConfig.configSchema;
-    super.validateConfig(this.configData, this.configSchema);
+    OperationConfig.validateConfig(this.configData, this.configSchema);
     this.app = app;
   }
 
   public getApp(): Probot {
     return this.app;
   }
 
-  private async _initTasks(taskDataArray: TaskData[]): Promise<Task[]> {
-    const taskObjArray: Task[] = [];
-    for (const taskData of taskDataArray) {
+  private static async _initTasks(taskDataArray: TaskData[]): Promise<Task[]> {
+    const taskObjArray = taskDataArray.map((taskData) => {
       const taskObj = new Task(taskData.call, taskData.args, taskData.name);
       console.log(`Setup Task: ${taskObj.getName()}`);
-      taskObjArray.push(taskObj);
-    }
+      return taskObj;
+    });
     return taskObjArray;
   }
 
   public async initOperation(): Promise<Operation> {
     const opObj = new Operation(
       (this.configData as OperationData).name,
       (this.configData as OperationData).events,
-      await this._initTasks((this.configData as OperationData).tasks),
+      await OperationConfig._initTasks((this.configData as OperationData).tasks),
     );
     console.log(`Setup Operation: ${opObj.getName()}`);
     return opObj;

src/config/operation-config.ts

@@ -70,9 +70,9 @@ export class ResourceConfig extends Config {
 
   constructor(configPath: string, octokit: ProbotOctokit) {
     super('ResourceConfig');
-    this.configData = super.readConfig(configPath);
+    this.configData = ResourceConfig.readConfig(configPath);
     this.configSchema = ResourceConfig.configSchema;
-    super.validateConfig(this.configData, this.configSchema);
+    ResourceConfig.validateConfig(this.configData, this.configSchema);
     this.octokit = octokit;
   }
 

src/config/resource-config.ts

@@ -1,3 +1,4 @@
+import randomstring from 'randomstring';
 import { TaskArgData } from '../../config/types';
 
 export class Task {
@@ -11,14 +12,9 @@ export class Task {
 
   constructor(call: string, callArgs: TaskArgData, name?: string) {
     const callArray = call.trim().split('@');
-    this.callName = callArray[0];
-    this.callFunc = callArray[1];
+    [this.callName, this.callFunc] = callArray;
     this.callArgs = callArgs;
-    const randomString = require('randomstring');
-    const namePostfix = randomString.generate({
-      length: 8,
-      charset: 'alphanumeric',
-    });
+    const namePostfix = randomstring.generate(8);
     this.name = name ? `${name}#${namePostfix}` : `${this.callName}#${namePostfix}`;
   }