Fix getRepositoriesByProperty

Author: decyjphr

lib/settings.js

@@ -321,61 +321,48 @@ ${this.results.reduce((x, y) => {
       }
     }
 
-        // Overlay repo config
+    // Overlay repo config
     // RepoConfigs should be preloaded but checking anyway
     const overrideRepoConfig = this.repoConfigs[`${repo.repo}.yml`]?.repository || this.repoConfigs[`${repo.repo}.yaml`]?.repository
     if (overrideRepoConfig) {
       repoConfig = this.mergeDeep.mergeDeep({}, repoConfig, overrideRepoConfig)
     }
-    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
-
-        const archivePlugin = new Archive(this.nop, this.github, repo, repoConfig, this.log)
-        const { shouldArchive, shouldUnarchive } = await archivePlugin.getState()
-
-        if (shouldUnarchive) {
-          this.log.debug(`Unarchiving repo ${repo.repo}`)
-          const unArchiveResults = await archivePlugin.sync()
-          this.appendToResults(unArchiveResults)
-        }
-
-        const repoResults = await new RepoPlugin(this.nop, this.github, repo, repoConfig, this.installation_id, this.log, this.errors).sync()
-        this.appendToResults(repoResults)
-
-        const childResults = await Promise.all(
-          childPlugins.map(([Plugin, config]) => {
-            return new Plugin(this.nop, this.github, repo, config, this.log, this.errors).sync()
+    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)
           })
-        )
-        this.appendToResults(childResults)
-
-        if (shouldArchive) {
-          this.log.debug(`Archiving repo ${repo.repo}`)
-          const archiveResults = await archivePlugin.sync()
-          this.appendToResults(archiveResults)
-        }
-      } 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
+        } 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)
+          })
+        }))
       }
-    } 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)
-        })
-      }))
     }
   }
 
@@ -906,6 +893,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