Merge branch 'main-enterprise' of https://github.com/avelizmu/safe-settings into decyjphr/pr-622

Author: decyjphr

lib/plugins/diffable.js

@@ -22,6 +22,7 @@
 const ErrorStash = require('./errorStash')
 const MergeDeep = require('../mergeDeep')
 const NopCommand = require('../nopcommand')
+const Glob = require('../glob')
 const ignorableFields = ['id', 'node_id', 'default', 'url']
 module.exports = class Diffable extends ErrorStash {
   constructor (nop, github, repo, entries, log, errors) {
@@ -39,7 +40,10 @@ module.exports = class Diffable extends ErrorStash {
     // this.log.debug(` entries ${JSON.stringify(filteredEntries)}`)
     filteredEntries = filteredEntries.filter(attrs => {
       if (Array.isArray(attrs.exclude)) {
-        if (!attrs.exclude.includes(this.repo.repo)) {
+        const excludeGlobs = attrs.exclude.map(exc => new Glob(exc));
+        const excludeGlobsMatch = excludeGlobs.some(glob => !!this.repo.repo.match(glob));
+
+        if (!attrs.exclude.includes(this.repo.repo) && !excludeGlobsMatch) {
           // this.log.debug(`returning not excluded entry = ${JSON.stringify(attrs)} for repo ${this.repo.repo}`)
           return true
         } else {
@@ -53,7 +57,10 @@ module.exports = class Diffable extends ErrorStash {
     })
     filteredEntries = filteredEntries.filter(attrs => {
       if (Array.isArray(attrs.include)) {
-        if (attrs.include.includes(this.repo.repo)) {
+        const includeGlobs = attrs.include.map(inc => new Glob(inc));
+        const includeGlobsMatch = includeGlobs.some(glob => !!this.repo.repo.match(glob));
+
+        if (attrs.include.includes(this.repo.repo) || includeGlobsMatch) {
           // this.log.debug(`returning included entry  = ${JSON.stringify(attrs)} for repo ${this.repo.repo}`)
           return true
         } else {