feat: support out-format as args (#769)

Co-authored-by: Fernandez Ludovic <[email protected]>
golangci · Jun 12, 2023 · 322510a · 322510a
1 parent 185e7a2
commit 322510a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 26 deletions.
diff --git a/dist/post_run/index.js b/dist/post_run/index.js
@@ -66639,16 +66639,23 @@ function runLint(lintPath, patchPath) {
         }
         const userArgs = core.getInput(`args`);
         const addedArgs = [];
-        const userArgNames = new Set(userArgs
+        const userArgsList = userArgs
             .trim()
             .split(/\s+/)
-            .map((arg) => arg.split(`=`)[0])
             .filter((arg) => arg.startsWith(`-`))
-            .map((arg) => arg.replace(/^-+/, ``)));
-        if (userArgNames.has(`out-format`)) {
-            throw new Error(`please, don't change out-format for golangci-lint: it can be broken in a future`);
-        }
-        addedArgs.push(`--out-format=github-actions`);
+            .map((arg) => arg.replace(/^-+/, ``))
+            .map((arg) => arg.split(/=(.*)/, 2))
+            .map(([key, value]) => [key.toLowerCase(), value !== null && value !== void 0 ? value : ""]);
+        const userArgsMap = new Map(userArgsList);
+        const userArgNames = new Set(userArgsList.map(([key]) => key));
+        const formats = (userArgsMap.get("out-format") || "")
+            .trim()
+            .split(",")
+            .filter((f) => f.length > 0)
+            .filter((f) => !f.startsWith(`github-actions`))
+            .concat("github-actions")
+            .join(",");
+        addedArgs.push(`--out-format=${formats}`);
         if (patchPath) {
             if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
                 throw new Error(`please, don't specify manually --new* args when requesting only new issues`);

diff --git a/dist/run/index.js b/dist/run/index.js
@@ -66639,16 +66639,23 @@ function runLint(lintPath, patchPath) {
         }
         const userArgs = core.getInput(`args`);
         const addedArgs = [];
-        const userArgNames = new Set(userArgs
+        const userArgsList = userArgs
             .trim()
             .split(/\s+/)
-            .map((arg) => arg.split(`=`)[0])
             .filter((arg) => arg.startsWith(`-`))
-            .map((arg) => arg.replace(/^-+/, ``)));
-        if (userArgNames.has(`out-format`)) {
-            throw new Error(`please, don't change out-format for golangci-lint: it can be broken in a future`);
-        }
-        addedArgs.push(`--out-format=github-actions`);
+            .map((arg) => arg.replace(/^-+/, ``))
+            .map((arg) => arg.split(/=(.*)/, 2))
+            .map(([key, value]) => [key.toLowerCase(), value !== null && value !== void 0 ? value : ""]);
+        const userArgsMap = new Map(userArgsList);
+        const userArgNames = new Set(userArgsList.map(([key]) => key));
+        const formats = (userArgsMap.get("out-format") || "")
+            .trim()
+            .split(",")
+            .filter((f) => f.length > 0)
+            .filter((f) => !f.startsWith(`github-actions`))
+            .concat("github-actions")
+            .join(",");
+        addedArgs.push(`--out-format=${formats}`);
         if (patchPath) {
             if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
                 throw new Error(`please, don't specify manually --new* args when requesting only new issues`);

diff --git a/src/run.ts b/src/run.ts
@@ -121,18 +121,26 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
   const userArgs = core.getInput(`args`)
   const addedArgs: string[] = []
 
-  const userArgNames = new Set<string>(
-    userArgs
-      .trim()
-      .split(/\s+/)
-      .map((arg) => arg.split(`=`)[0])
-      .filter((arg) => arg.startsWith(`-`))
-      .map((arg) => arg.replace(/^-+/, ``))
-  )
-  if (userArgNames.has(`out-format`)) {
-    throw new Error(`please, don't change out-format for golangci-lint: it can be broken in a future`)
-  }
-  addedArgs.push(`--out-format=github-actions`)
+  const userArgsList = userArgs
+    .trim()
+    .split(/\s+/)
+    .filter((arg) => arg.startsWith(`-`))
+    .map((arg) => arg.replace(/^-+/, ``))
+    .map((arg) => arg.split(/=(.*)/, 2))
+    .map<[string, string]>(([key, value]) => [key.toLowerCase(), value ?? ""])
+
+  const userArgsMap = new Map<string, string>(userArgsList)
+  const userArgNames = new Set<string>(userArgsList.map(([key]) => key))
+
+  const formats = (userArgsMap.get("out-format") || "")
+    .trim()
+    .split(",")
+    .filter((f) => f.length > 0)
+    .filter((f) => !f.startsWith(`github-actions`))
+    .concat("github-actions")
+    .join(",")
+
+  addedArgs.push(`--out-format=${formats}`)
 
   if (patchPath) {
     if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {