Improve CODEOWNER style glob support

CODEOWNERS

@@ -1,3 +1,3 @@
 # Repository CODEOWNERS
 
-* @mdzhang
+/src @mdzhang

src/api.ts

@@ -90,9 +90,10 @@ export async function getCodeowners(
       // @ts-expect-error false positive
       result.data.encoding
     ).toString()
-    core.debug(`codeowners fileContent is:\n${fileContent}`)
   } catch (error: any) {
-    core.warning(`Could not find pull request #${prNumber}, skipping`)
+    core.warning(
+      `Could not find pull request #${prNumber}, skipping (${error.message})`
+    )
     return []
   }
 
@@ -102,8 +103,30 @@ export async function getCodeowners(
     .filter(l => l.trim().length > 0)
     .filter(l => !l.startsWith('#'))
     .map(l => l.split(' '))
+    .filter(([glob, team]) => {
+      if (team === undefined) {
+        core.warning(`CODEOWNERS had glob ${glob} w/o matching team`)
+      }
 
-  core.debug(`codeowners is ${codeowners}`)
+      return team !== undefined
+    })
+    .map(([glob, team]) => {
+      // do some munging to support CODEOWNER format globs
+      let finalGlob = glob
+
+      // convert directories like foo/ to foo/**
+      if (finalGlob.endsWith('/')) {
+        finalGlob += '**'
+      } else {
+        // convert directories like foo to foo/**
+        const last = finalGlob.split('\\').pop()?.split('/').pop()
+        if (!last?.includes('.')) {
+          finalGlob += '/**'
+        }
+      }
+
+      return [finalGlob, team]
+    })
 
   if (!codeowners.length) {
     core.warning(`Pull request #${prNumber} has no codeowners`)

src/main.ts

@@ -56,7 +56,7 @@ async function labeler() {
 
   core.debug(`labelsToOwner is ${labelsToOwner}`)
   const labelMap: Map<any, any> = flip(JSON.parse(labelsToOwner))
-  core.debug(`labelMap is ${labelMap}`)
+  core.debug(`labelMap is ${JSON.stringify(Object.fromEntries(labelMap))}`)
   const preexistingLabels = pullRequest.data.labels.map(
     (l: { name: string }) => l.name
   )
@@ -109,21 +109,17 @@ export function getMatchingCodeownerLabels(
   entries: string[][],
   labelMap: Map<string, string>
 ): Set<string> {
-  // const repoUrlPrefix = `https://github.com/${github.context.repo.owner}/${github.context.repo.repo}/blob`;
   const allLabels: Set<string> = new Set<string>()
 
   for (const changedFile of changedFiles) {
-    // const refPath = changedFile.blob_url.replace(repoUrlPrefix, '');
-    // const i = refPath.indexOf('/');
-    // const [_, path] = [refPath.slice(0,i), refPath.slice(i+1)];
-
     core.debug(`checking path ${changedFile}`)
     for (const entry of entries) {
       const [glob, team] = entry
-      core.debug(`-- checking glob ${glob}, team ${team}`)
-      if (minimatch(changedFile, glob)) {
+      if (minimatch(`/${changedFile}`, glob)) {
+        core.debug(`-- matched glob ${glob}, team ${team}`)
         const label = labelMap.get(team)
         if (label !== undefined) {
+          core.debug(`-- adding label ${label}`)
           allLabels.add(label)
         }
       }