chore: cleanup eslint and logging functions (#9)

Update eslint, fix all flagged eslint issues

Fix logging function calls

Author: maxflintoff-tomtom

.eslintrc.json

@@ -8,7 +8,7 @@
         "standard"
     ],
     "parserOptions": {
-        "ecmaVersion": 12
+        "ecmaVersion": 2022
     },
     "rules": {
       "space-before-function-paren": "off",

index.js

@@ -10,7 +10,6 @@ const env = require('./lib/env')
 let deploymentConfig
 
 module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) => {
-  let appName = 'safe-settings'
   let appSlug = 'safe-settings'
   async function syncAllSettings (nop, context, repo = context.repo(), ref) {
     const log = robot.log.child({ context: 'index', repository: repo.repo })
@@ -236,7 +235,6 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
       const installation = installations[0]
       const github = await robot.auth(installation.id)
       const app = await github.apps.getAuthenticated()
-      appName = app.data.name
       appSlug = app.data.slug
       log.debug(`Validated the app is configured properly = \n${JSON.stringify(app.data, null, 2)}`)
     }
@@ -388,7 +386,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
       log.debug(`Repository member edited by Bot: ${sender.login}`)
       return
     }
-    log.debug(`Repository member edited by a Human: ${sender.login}'`)
+    log.debug(`Repository member edited by a Human: ${sender.login}`)
     return syncSettings(false, context)
   })
 
@@ -457,7 +455,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
               repo: env.ADMIN_REPO,
               path: newPath,
               name: `${payload.repository.name}.yml`,
-              content: content,
+              content,
               message: `Repo Renamed and safe-settings renamed the file from ${payload.changes.repository.name.from} to ${payload.repository.name}`,
               sha: repofile.data.sha,
               headers: {

lib/deploymentConfig.js

@@ -8,46 +8,43 @@ const env = require('./env')
  * The settings are loaded from the deployment-settings.yml file during initialization and stored as static properties.
  */
 class DeploymentConfig {
-    //static config
-    static configvalidators = {}
-    static overridevalidators = {}
+  // static config
+  static configvalidators = {}
+  static overridevalidators = {}
 
-    static {
-        const deploymentConfigPath = process.env.DEPLOYMENT_CONFIG_FILE ? process.env.DEPLOYMENT_CONFIG_FILE : 'deployment-settings.yml'
-        if (fs.existsSync(deploymentConfigPath)) {
-          this.config = yaml.load(fs.readFileSync(deploymentConfigPath))
-        } else {
-          this.config = { restrictedRepos: ['admin', '.github', 'safe-settings'] }
-        }
-
-        const overridevalidators = this.config.overridevalidators
-        if (this.isIterable(overridevalidators)) {
-          for (const validator of overridevalidators) {
-            // eslint-disable-next-line no-new-func
-            const f = new Function('baseconfig', 'overrideconfig', 'githubContext', validator.script)
-            this.overridevalidators[validator.plugin] = { canOverride: f, error: validator.error }
-          }
-        }
-        const configvalidators = this.config.configvalidators
-        if (this.isIterable(configvalidators)) {
-          for (const validator of configvalidators) {
-            // eslint-disable-next-line no-new-func
-            const f = new Function('baseconfig', 'githubContext', validator.script)
-            this.configvalidators[validator.plugin] = { isValid: f, error: validator.error }
-          }
-        }
+  static {
+    const deploymentConfigPath = process.env.DEPLOYMENT_CONFIG_FILE ? process.env.DEPLOYMENT_CONFIG_FILE : 'deployment-settings.yml'
+    if (fs.existsSync(deploymentConfigPath)) {
+      this.config = yaml.load(fs.readFileSync(deploymentConfigPath))
+    } else {
+      this.config = { restrictedRepos: ['admin', '.github', 'safe-settings'] }
     }
 
-    static isIterable (obj) {
-        // checks for null and undefined
-        if (obj == null) {
-          return false
-        }
-        return typeof obj[Symbol.iterator] === 'function'
+    const overridevalidators = this.config.overridevalidators
+    if (this.isIterable(overridevalidators)) {
+      for (const validator of overridevalidators) {
+        // eslint-disable-next-line no-new-func
+        const f = new Function('baseconfig', 'overrideconfig', 'githubContext', validator.script)
+        this.overridevalidators[validator.plugin] = { canOverride: f, error: validator.error }
+      }
+    }
+    const configvalidators = this.config.configvalidators
+    if (this.isIterable(configvalidators)) {
+      for (const validator of configvalidators) {
+        // eslint-disable-next-line no-new-func
+        const f = new Function('baseconfig', 'githubContext', validator.script)
+        this.configvalidators[validator.plugin] = { isValid: f, error: validator.error }
       }
+    }
+  }
 
-    constructor (nop, context, repo, config, ref, suborg) {
+  static isIterable (obj) {
+    // checks for null and undefined
+    if (obj == null) {
+      return false
     }
+    return typeof obj[Symbol.iterator] === 'function'
+  }
 }
 DeploymentConfig.FILE_NAME = `${env.CONFIG_PATH}/settings.yml`
 

lib/plugins/branches.js

@@ -150,7 +150,7 @@ module.exports = class Branches extends ErrorStash {
                     return this.github.repos
                       .updateBranchProtection(params)
                       .then((res) =>
-                        this.log(
+                        this.log.info(
                           `Branch protection applied successfully ${JSON.stringify(
                             res.url
                           )}`

lib/plugins/rulesets.js

@@ -25,7 +25,7 @@ module.exports = class Rulesets extends Diffable {
         org: this.repo.owner,
         headers: version
       })
-      this.log(listOptions)
+      this.log.debug(listOptions)
       return this.github.paginate(listOptions)
         .then(res => {
           const rulesets = res.map(ruleset => {
@@ -50,7 +50,7 @@ module.exports = class Rulesets extends Diffable {
         repo: this.repo.repo,
         headers: version
       })
-      this.log(listOptions)
+      this.log.debug(listOptions)
       return this.github.paginate(listOptions)
         .then(res => {
           const rulesets = res
@@ -97,7 +97,7 @@ module.exports = class Rulesets extends Diffable {
       }
       this.log.debug(`Updating Ruleset with the following values ${JSON.stringify(parms, null, 2)}`)
       return this.github.request('PUT /orgs/{org}/rulesets/{id}', parms).then(res => {
-        this.log(`Ruleset updated successfully ${JSON.stringify(res.url)}`)
+        this.log.info(`Ruleset updated successfully ${JSON.stringify(res.url)}`)
         return res
       }).catch(e => {
         return this.handleError(e)
@@ -110,7 +110,7 @@ module.exports = class Rulesets extends Diffable {
       }
       this.log.debug(`Updating Ruleset with the following values ${JSON.stringify(parms, null, 2)}`)
       return this.github.request('PUT /repos/{owner}/{repo}/rulesets/{id}', parms).then(res => {
-        this.log(`Ruleset updated successfully ${JSON.stringify(res.url)}`)
+        this.log.info(`Ruleset updated successfully ${JSON.stringify(res.url)}`)
         return res
       }).catch(e => {
         return this.handleError(e)
@@ -127,7 +127,7 @@ module.exports = class Rulesets extends Diffable {
       }
       this.log.debug(`Creating Rulesets with the following values ${JSON.stringify(attrs, null, 2)}`)
       return this.github.request('POST /orgs/{org}/rulesets', this.wrapAttrs(attrs)).then(res => {
-        this.log(`Ruleset created successfully ${JSON.stringify(res.url)}`)
+        this.log.info(`Ruleset created successfully ${JSON.stringify(res.url)}`)
         return res
       }).catch(e => {
         return this.handleError(e)
@@ -140,7 +140,7 @@ module.exports = class Rulesets extends Diffable {
       }
       this.log.debug(`Creating Rulesets with the following values ${JSON.stringify(attrs, null, 2)}`)
       return this.github.request('POST /repos/{owner}/{repo}/rulesets', this.wrapAttrs(attrs)).then(res => {
-        this.log(`Ruleset created successfully ${JSON.stringify(res.url)}`)
+        this.log.info(`Ruleset created successfully ${JSON.stringify(res.url)}`)
         return res
       }).catch(e => {
         return this.handleError(e)
@@ -158,7 +158,7 @@ module.exports = class Rulesets extends Diffable {
       }
       this.log.debug(`Deleting Ruleset with the following values ${JSON.stringify(parms, null, 2)}`)
       return this.github.request('DELETE /orgs/{org}/rulesets/{id}', parms).then(res => {
-        this.log(`Ruleset deleted successfully ${JSON.stringify(res.url)}`)
+        this.log.info(`Ruleset deleted successfully ${JSON.stringify(res.url)}`)
         return res
       }).catch(e => {
         return this.handleError(e)
@@ -171,7 +171,7 @@ module.exports = class Rulesets extends Diffable {
       }
       this.log.debug(`Deleting Ruleset with the following values ${JSON.stringify(parms, null, 2)}`)
       return this.github.request('DELETE /repos/{owner}/{repo}/rulesets/{id}', parms).then(res => {
-        this.log(`Ruleset deleted successfully ${JSON.stringify(res.url)}`)
+        this.log.info(`Ruleset deleted successfully ${JSON.stringify(res.url)}`)
         return res
       }).catch(e => {
         if (e.status === 404) {