Always output valid JSON containing paths-ignore

owen-mc · owen-mc · commit 47a536c85d2a · 2023-07-31T16:09:47.000+01:00
diff --git a/go/codeql-tools/baseline-config-empty.json b/go/codeql-tools/baseline-config-empty.json
@@ -0,0 +1,3 @@
+{
+    "paths-ignore": []
+}
diff --git a/go/codeql-tools/baseline-config-vendor.json b/go/codeql-tools/baseline-config-vendor.json
diff --git a/go/codeql-tools/configure-baseline.cmd b/go/codeql-tools/configure-baseline.cmd
@@ -1,4 +1,6 @@
 @echo off
 if exist vendor\modules.txt (
-  type %CODEQL_EXTRACTOR_GO_ROOT%\codeql-tools\baseline-config.json
+  type %CODEQL_EXTRACTOR_GO_ROOT%\codeql-tools\baseline-config-vendor.json
+) else (
+  type %CODEQL_EXTRACTOR_GO_ROOT%\codeql-tools\baseline-config-empty.json
 )
diff --git a/go/codeql-tools/configure-baseline.sh b/go/codeql-tools/configure-baseline.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
 if [ -f vendor/modules.txt ]; then
-  cat $CODEQL_EXTRACTOR_GO_ROOT/codeql-tools/baseline-config.json
+  cat $CODEQL_EXTRACTOR_GO_ROOT/codeql-tools/baseline-config-vendor.json
+else
+  cat $CODEQL_EXTRACTOR_GO_ROOT/codeql-tools/baseline-config-empty.json
 fi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`@echo off`
`2`	`2`	`if exist vendor\modules.txt (`
`3`		`- type %CODEQL_EXTRACTOR_GO_ROOT%\codeql-tools\baseline-config.json`
	`3`	`+ type %CODEQL_EXTRACTOR_GO_ROOT%\codeql-tools\baseline-config-vendor.json`
	`4`	`+) else (`
	`5`	`+ type %CODEQL_EXTRACTOR_GO_ROOT%\codeql-tools\baseline-config-empty.json`
`4`	`6`	`)`