Merge branch 'main-enterprise' into pull-request-full-context

Author: stokkie90

.github/workflows/create-pre-release.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2
       - name: Log in to the Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/create-release.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2
       - name: Log in to the Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/rc-release.yml

@@ -60,7 +60,7 @@ jobs:
       - run: echo ${{ github.actor }}
 
       - name: Log in to the Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

lib/settings.js

@@ -169,10 +169,10 @@ class Settings {
 
     // remove duplicate rows in this.results
     this.results = this.results.filter((thing, index, self) => {
-      return index === self.findIndex((t) => {
-        return t.type === thing.type && t.repo === thing.repo && t.plugin === thing.plugin
+        return index === self.findIndex((t) => {
+          return t.type === thing.type && t.repo === thing.repo && t.plugin === thing.plugin
+        })
       })
-    })
 
     let error = false
     // Different logic
@@ -299,12 +299,13 @@ ${this.results.reduce((x, y) => {
     }
   }
 
-  async updateRepos (repo) {
+  async updateRepos(repo) {
     this.subOrgConfigs = this.subOrgConfigs || await this.getSubOrgConfigs()
-    // Create a fresh copy of the base repository config
-    let repoConfig = this.config.repository ? Object.assign({}, this.config.repository) : {}
+    // Keeping this as is instead of doing an object assign as that would cause `Cannot read properties of undefined (reading 'startsWith')` error
+    // Copilot code review would recoommend using object assign but that would cause the error
+    let repoConfig = this.config.repository
     if (repoConfig) {
-      repoConfig = Object.assign({}, repoConfig, { name: repo.repo, org: repo.owner })
+      repoConfig = Object.assign(repoConfig, { name: repo.repo, org: repo.owner })
     }
 
     const subOrgConfig = this.getSubOrgConfig(repo.repo)
@@ -318,9 +319,9 @@ ${this.results.reduce((x, y) => {
     this.log.debug(`Process normally... Not a SubOrg config change or SubOrg config was changed and this repo is part of it. ${JSON.stringify(repo)} suborg config ${JSON.stringify(this.subOrgConfigMap)}`)
 
     if (subOrgConfig) {
-      let suborgRepoConfig = subOrgConfig.repository ? Object.assign({}, subOrgConfig.repository) : {}
+      let suborgRepoConfig = subOrgConfig.repository
       if (suborgRepoConfig) {
-        suborgRepoConfig = Object.assign({}, suborgRepoConfig, { name: repo.repo, org: repo.owner })
+        suborgRepoConfig = Object.assign(suborgRepoConfig, { name: repo.repo, org: repo.owner })
         repoConfig = this.mergeDeep.mergeDeep({}, repoConfig, suborgRepoConfig)
       }
     }
@@ -331,45 +332,42 @@ ${this.results.reduce((x, y) => {
     if (overrideRepoConfig) {
       repoConfig = this.mergeDeep.mergeDeep({}, repoConfig, overrideRepoConfig)
     }
-    const { shouldContinue, nopCommands } = await new Archive(this.nop, this.github, repo, repoConfig, this.log).sync()
-    if (nopCommands) this.appendToResults(nopCommands)
-    if (shouldContinue) {
-      if (repoConfig) {
-        try {
-          this.log.debug(`found a matching repoconfig for this repo ${JSON.stringify(repoConfig)}`)
-          const childPlugins = this.childPluginsList(repo)
-          const RepoPlugin = Settings.PLUGINS.repository
-          return new RepoPlugin(this.nop, this.github, repo, repoConfig, this.installation_id, this.log, this.errors).sync().then(res => {
-            this.appendToResults(res)
-            return Promise.all(
-              childPlugins.map(([Plugin, config]) => {
-                return new Plugin(this.nop, this.github, repo, config, this.log, this.errors).sync()
-              }))
-          }).then(res => {
-            this.appendToResults(res)
-          })
-        } catch (e) {
-          if (this.nop) {
-            const nopcommand = new NopCommand(this.constructor.name, this.repo, null, `${e}`, 'ERROR')
-            this.log.error(`NOPCOMMAND ${JSON.stringify(nopcommand)}`)
-            this.appendToResults([nopcommand])
-            // throw e
-          } else {
-            throw e
-          }
-        }
-      } else {
-        this.log.debug(`Didnt find any a matching repoconfig for this repo ${JSON.stringify(repo)} in ${JSON.stringify(this.repoConfigs)}`)
+    if (repoConfig) {
+      try {
+        this.log.debug(`found a matching repoconfig for this repo ${JSON.stringify(repoConfig)}`)
         const childPlugins = this.childPluginsList(repo)
-        return Promise.all(childPlugins.map(([Plugin, config]) => {
-          return new Plugin(this.nop, this.github, repo, config, this.log, this.errors).sync().then(res => {
-            this.appendToResults(res)
-          })
-        }))
+        const RepoPlugin = Settings.PLUGINS.repository
+        return new RepoPlugin(this.nop, this.github, repo, repoConfig, this.installation_id, this.log, this.errors).sync().then(res => {
+          this.appendToResults(res)
+          return Promise.all(
+            childPlugins.map(([Plugin, config]) => {
+              return new Plugin(this.nop, this.github, repo, config, this.log, this.errors).sync()
+            }))
+        }).then(res => {
+          this.appendToResults(res)
+        })
+      } catch (e) {
+        if (this.nop) {
+          const nopcommand = new NopCommand(this.constructor.name, this.repo, null, `${e}`, 'ERROR')
+          this.log.error(`NOPCOMMAND ${JSON.stringify(nopcommand)}`)
+          this.appendToResults([nopcommand])
+          // throw e
+        } else {
+          throw e
+        }
       }
+    } else {
+      this.log.debug(`Didnt find any a matching repoconfig for this repo ${JSON.stringify(repo)} in ${JSON.stringify(this.repoConfigs)}`)
+      const childPlugins = this.childPluginsList(repo)
+      return Promise.all(childPlugins.map(([Plugin, config]) => {
+        return new Plugin(this.nop, this.github, repo, config, this.log, this.errors).sync().then(res => {
+          this.appendToResults(res)
+        })
+      }))
     }
   }
 
+
   async updateAll () {
     // this.subOrgConfigs = this.subOrgConfigs || await this.getSubOrgConfigs(this.github, this.repo, this.log)
     // this.repoConfigs = this.repoConfigs || await this.getRepoConfigs(this.github, this.repo, this.log)
@@ -490,47 +488,17 @@ ${this.results.reduce((x, y) => {
 
   async eachRepositoryRepos (github, log) {
     log.debug('Fetching repositories')
-
-    const processedRepos = new Set()
-    const results = []
-
-    // Process existing repositories
-    const existingRepoResults = await github.paginate('GET /installation/repositories')
-      .then(repositories => {
-        return Promise.all(repositories.map(repository => {
-          if (this.isRestricted(repository.name)) {
-            return null
-          }
-          const { owner, name } = repository
-          processedRepos.add(`${owner.login}/${name}`)
-          return this.updateRepos({ owner: owner.login, repo: name })
-        }))
-      })
-
-    // Process missing repositories
-    const repoInConfigs = Object.values(this.repoConfigs)
-      .filter(config => config.repository?.name)
-      .map(config => {
-        return {
-          name: config.repository.name,
-          owner: config.repository.organization || this.repo.owner
+    return github.paginate('GET /installation/repositories').then(repositories => {
+      return Promise.all(repositories.map(repository => {
+        if (this.isRestricted(repository.name)) {
+          return null
         }
-      })
-    const missingRepoResults = await Promise.all(
-      repoInConfigs
-        .filter(repo => !this.isRestricted(repo.name))
-        .filter(repo => !processedRepos.has(`${repo.owner}/${repo.name}`))
-        .map(repo => {
-          processedRepos.add(`${repo.owner}/${repo.name}`)
-          return this.updateRepos({ owner: repo.owner, repo: repo.name })
-        })
-    )
-
-    results
-      .concat(existingRepoResults || [], missingRepoResults || [])
-      .filter(result => result !== null)
 
-    return results
+        const { owner, name } = repository
+        return this.updateRepos({ owner: owner.login, repo: name })
+      })
+      )
+    })
   }
 
   /**
@@ -793,7 +761,7 @@ ${this.results.reduce((x, y) => {
           }
           )) {
             delete subOrgConfigs[key]
-          }
+          } 
         }
       }
       return subOrgConfigs
@@ -897,6 +865,7 @@ ${this.results.reduce((x, y) => {
       throw new Error(`Failed to filter repositories for property ${name}: ${error.message}`)
     }
   }
+  
 
   async getSubOrgRepositories (subOrgProperties) {
     const organizationName = this.repo.owner
@@ -943,6 +912,7 @@ function prettify (obj) {
   return JSON.stringify(obj, null, 2).replaceAll('\n', '<br>').replaceAll(' ', '&nbsp;')
 }
 
+Settings.FILE_NAME = path.posix.join(CONFIG_PATH, env.SETTINGS_FILE_PATH)
 Settings.FILE_PATH = path.posix.join(CONFIG_PATH, env.SETTINGS_FILE_PATH)
 Settings.SUB_ORG_PATTERN = new Glob(`${CONFIG_PATH}/suborgs/*.yml`)
 Settings.REPO_PATTERN = new Glob(`${CONFIG_PATH}/repos/*.yml`)