Merge pull request #7 from TheCleric/master

Update with latest enhance-debugging changes
nrccua · Aug 25, 2020 · 19f9ecd · 19f9ecd
2 parents 46182fc + b32d6ac
commit 19f9ecd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 34 deletions.
diff --git a/__tests__/shared.ts b/__tests__/shared.ts
@@ -2,9 +2,11 @@ import * as core from "@actions/core";
 import { readFileSync } from "fs";
 import "jest-extended";
 
-// Dump core debug/error to console debug so that --silent works
+// Dump core messaging to console so that --silent works
 jest.spyOn(core, 'debug').mockImplementation(console.debug);
-jest.spyOn(core, 'error').mockImplementation(console.debug);
+jest.spyOn(core, 'info').mockImplementation(console.info);
+jest.spyOn(core, 'error').mockImplementation(console.error);
+jest.spyOn(core, 'warning').mockImplementation(console.warn);
 
 function encodeContent(content: Buffer | ArrayBuffer | SharedArrayBuffer) {
     return Buffer.from(content).toString("base64");

diff --git a/lib/ConfigEntry.js b/lib/ConfigEntry.js
@@ -29,35 +29,24 @@ class ConfigEntry {
     getLabel(headRef, baseRef) {
         const headMatches = ConfigEntry.getMatches(headRef, this.head, this.headRegExp);
         const baseMatches = ConfigEntry.getMatches(baseRef, this.base, this.baseRegExp);
-        core.debug('*** getLabel ***');
-        core.debug(JSON.stringify(this));
-        core.debug('headRef');
-        core.debug(headRef);
-        core.debug('headMatches');
-        core.debug(JSON.stringify(headMatches));
-        core.debug('baseRef');
-        core.debug(baseRef);
-        core.debug('baseMatches');
-        core.debug(JSON.stringify(baseMatches));
         if ((this.head || this.headRegExp) && (this.base || this.baseRegExp)) {
             if (headMatches && baseMatches) {
                 const label = this.getLabelFromMatches(headMatches.concat(baseMatches));
-                core.debug(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp.toString()}" and "${baseRef}" to "${this.base ? this.base : this.baseRegExp.toString()}". Setting label to "${label}"`);
+                core.info(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp.toString()}" and "${baseRef}" to "${this.base ? this.base : this.baseRegExp.toString()}". Setting label to "${label}"`);
                 return label;
             }
             return undefined;
         }
         if ((this.head || this.headRegExp) && headMatches) {
             const label = this.getLabelFromMatches(headMatches);
-            core.debug(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp.toString()}". Setting label to "${label}"`);
+            core.info(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp.toString()}". Setting label to "${label}"`);
             return label;
         }
         if ((this.base || this.baseRegExp) && baseMatches) {
             const label = this.getLabelFromMatches(baseMatches);
-            core.debug(`Matched "${baseRef}" to "${this.base ? this.base : this.baseRegExp.toString()}". Setting label to "${label}"`);
+            core.info(`Matched "${baseRef}" to "${this.base ? this.base : this.baseRegExp.toString()}". Setting label to "${label}"`);
             return label;
         }
-        //core.debug('label', undefined);
         return undefined;
     }
     getLabelFromMatches(matches) {

diff --git a/lib/config.js b/lib/config.js
@@ -25,7 +25,6 @@ const ConfigEntry_1 = require("./ConfigEntry");
 const CONFIG_PATH = ".github";
 function getConfig(github, fileName, context) {
     return __awaiter(this, void 0, void 0, function* () {
-        // console.log('getConfig context', context);
         try {
             const configFile = {
                 owner: context.repo.owner,
@@ -44,6 +43,7 @@ function getConfig(github, fileName, context) {
             return parseConfig(response.data.content);
         }
         catch (error) {
+            core.debug(`getConfig error: ${JSON.stringify(error)}`);
             if (error.status === 404) {
                 return [];
             }

diff --git a/src/ConfigEntry.ts b/src/ConfigEntry.ts
@@ -29,39 +29,27 @@ export class ConfigEntry implements ConfigEntryParams {
     const headMatches = ConfigEntry.getMatches(headRef, this.head, this.headRegExp);
     const baseMatches = ConfigEntry.getMatches(baseRef, this.base, this.baseRegExp);
 
-    core.debug('*** getLabel ***');
-    core.debug(JSON.stringify(this));
-    core.debug('headRef');
-    core.debug(headRef);
-    core.debug('headMatches');
-    core.debug(JSON.stringify(headMatches));
-    core.debug('baseRef');
-    core.debug(baseRef);
-    core.debug('baseMatches');
-    core.debug(JSON.stringify(baseMatches));
-
     if ((this.head || this.headRegExp) && (this.base || this.baseRegExp)) {
       if (headMatches && baseMatches) {
         const label = this.getLabelFromMatches(headMatches.concat(baseMatches));
-        core.debug(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp!.toString()}" and "${baseRef}" to "${this.base ? this.base : this.baseRegExp!.toString()}". Setting label to "${label}"`);
+        core.info(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp!.toString()}" and "${baseRef}" to "${this.base ? this.base : this.baseRegExp!.toString()}". Setting label to "${label}"`);
         return label;
       }
       return undefined;
     }
 
     if ((this.head || this.headRegExp) && headMatches) {
       const label = this.getLabelFromMatches(headMatches);
-      core.debug(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp!.toString()}". Setting label to "${label}"`);
+      core.info(`Matched "${headRef}" to "${this.head ? this.head : this.headRegExp!.toString()}". Setting label to "${label}"`);
       return label;
     }
 
     if ((this.base || this.baseRegExp) && baseMatches) {
       const label = this.getLabelFromMatches(baseMatches);
-      core.debug(`Matched "${baseRef}" to "${this.base ? this.base : this.baseRegExp!.toString()}". Setting label to "${label}"`);
+      core.info(`Matched "${baseRef}" to "${this.base ? this.base : this.baseRegExp!.toString()}". Setting label to "${label}"`);
       return label;
     }
 
-    //core.debug('label', undefined);
     return undefined;
   }
 

diff --git a/src/config.ts b/src/config.ts
@@ -7,8 +7,6 @@ import { ConfigEntry } from "./ConfigEntry";
 const CONFIG_PATH = ".github";
 
 export async function getConfig(github: github.GitHub, fileName: string, context: Context.Context): Promise<ConfigEntry[]> {
-  // console.log('getConfig context', context);
-
   try {
     const configFile = {
       owner: context.repo.owner,
@@ -26,6 +24,7 @@ export async function getConfig(github: github.GitHub, fileName: string, context
     }
     return parseConfig(response.data.content);
   } catch (error) {
+    core.debug(`getConfig error: ${JSON.stringify(error)}`);
     if (error.status === 404) {
       return [];
     }