Merge pull request github#292 from nicacioliveira/fix/repository-security-update

Does fix bug inside of the Repository plugin related to updateRepo function ambiguity

Author: decyjphr

.gitignore

@@ -5,3 +5,5 @@ node_modules/
 private-key.pem
 .env
 *.pem
+
+.vscode

lib/plugins/repository.js

@@ -43,7 +43,7 @@ const ignorableFields = [
 ]
 
 module.exports = class Repository {
-  constructor (nop, github, repo, settings, installationId, log) {
+  constructor(nop, github, repo, settings, installationId, log) {
     this.installationId = installationId
     this.github = github
     this.settings = Object.assign({ mediaType: { previews: ['nebula-preview'] } }, settings, repo)
@@ -59,7 +59,7 @@ module.exports = class Repository {
     delete this.settings.template
   }
 
-  sync () {
+  sync() {
     const resArray = []
     this.log.debug(`Syncing Repo ${this.settings.name}`)
     this.settings.name = this.settings.name || this.settings.repo
@@ -100,9 +100,18 @@ module.exports = class Repository {
           }
           // Remove topics as it would be handled seperately
           delete this.settings.topics
-          promises.push(this.updaterepo(resArray).then((resp) => {
-            return this.updateSecurity(resp.data, resArray)
-          }))
+
+          promises.push(async () => {
+
+            this.log.debug(`Updating repo with settings ${JSON.stringify(this.topics)} ${JSON.stringify(this.settings)}`)
+
+            if (this.nop) {
+              resArray.push(new NopCommand(this.constructor.name, this.repo, this.github.repos.update.endpoint(this.settings), 'Update Repo'))
+              return this.updateSecurity(resp.data, resArray)
+            }
+
+            return this.updateSecurity(await this.github.repos.update(this.settings), resArray)
+          })
         }
         if (topicChanges.hasChanges) {
           promises.push(this.updatetopics(resp.data, resArray))
@@ -156,7 +165,7 @@ module.exports = class Repository {
       })
   }
 
-  renameBranch (oldname, newname) {
+  renameBranch(oldname, newname) {
     const parms = {
       owner: this.settings.owner,
       repo: this.settings.repo,
@@ -172,16 +181,7 @@ module.exports = class Repository {
     return this.github.repos.renameBranch(parms)
   }
 
-  updaterepo (resArray) {
-    this.log.debug(`Updating repo with settings ${JSON.stringify(this.topics)} ${JSON.stringify(this.settings)}`)
-    if (this.nop) {
-      resArray.push(new NopCommand(this.constructor.name, this.repo, this.github.repos.update.endpoint(this.settings), 'Update Repo'))
-      return Promise.resolve(resArray)
-    }
-    return this.github.repos.update(this.settings)
-  }
-
-  updatetopics (repoData, resArray) {
+  updatetopics(repoData, resArray) {
     const parms = {
       owner: this.settings.owner,
       repo: this.settings.repo,
@@ -212,7 +212,7 @@ module.exports = class Repository {
   }
 
   // Added support for Code Security and Analysis
-  updateSecurity (repoData, resArray) {
+  updateSecurity(repoData, resArray) {
     if (this.security) {
       this.log(`Found repo with security settings ${JSON.stringify(this.security)}`)
       if (this.security?.enableVulnerabilityAlerts === true || this.security?.enableVulnerabilityAlerts === false) {

package.json

@@ -5,7 +5,7 @@
   "repository": "https://github.com/github/safe-settings.git",
   "main": "index.js",
   "scripts": {
-    "dev": "nodemon",
+    "dev": "nodemon --inspect",
     "start": "probot run ./index.js",
     "test": "npm-run-all --print-label --parallel lint:* --parallel test:*",
     "lint:es": "eslint .",