fix: in windows os, golang creates output with newlines of linux anyway

Signed-off-by: Zvi Grinberg <zgrinber@redhat.com>
RHEcosystemAppEng · Jul 16, 2024 · 27b0d2e · 27b0d2e
1 parent 47d2464
commit 27b0d2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/analysis.js b/src/analysis.js
@@ -111,7 +111,7 @@ async function requestComponent(provider, data, url, opts = {}, path = '') {
 
 		}
 	} else {
-		throw new Error(`Got error response from exhort backend - http return code : ${resp.status},  error message =>  ${await resp.text()}`)
+		throw new Error(`Got error response from exhort backend - http return code : ${resp.status}, ex-request-id: ${resp.headers.get("ex-request-id")}  error message =>  ${await resp.text()}`)
 	}
 
 	return Promise.resolve(result)

diff --git a/src/providers/golang_gomodules.js b/src/providers/golang_gomodules.js
@@ -149,7 +149,7 @@ function extractPackageName(line) {
  */
 function getIgnoredDeps(manifest) {
 	let goMod = fs.readFileSync(manifest).toString().trim()
-	let lines = goMod.split(EOL);
+	let lines = goMod.split(getLineSeparatorGolang());
 	return lines.filter(line => ignoredLine(line)).map(line=> extractPackageName(line)).map(dep => toPurl(dep,/[ ]{1,3}/,undefined))
 }
 
@@ -235,7 +235,7 @@ function collectAllDepsFromManifest(lines, goMod) {
  */
 function performManifestVersionsCheck(rootElementName, goModGraphOutputRows, manifest) {
 	let goMod = fs.readFileSync(manifest).toString().trim()
-	let lines = goMod.split(EOL);
+	let lines = goMod.split(getLineSeparatorGolang());
 	let comparisonLines = goModGraphOutputRows.filter((line)=> line.startsWith(rootElementName)).map((line)=> getChildVertexFromEdge(line))
 	let manifestDeps = collectAllDepsFromManifest(lines,goMod)
 	try {
@@ -286,7 +286,7 @@ function getSBOM(manifest, opts = {}, includeTransitive) {
 	let ignoredDeps = getIgnoredDeps(manifest);
 	let allIgnoredDeps = ignoredDeps.map((dep) => dep.toString())
 	let sbom = new Sbom();
-	let rows = goGraphOutput.split(EOL);
+	let rows = goGraphOutput.split(getLineSeparatorGolang());
 	let root = getParentVertexFromEdge(rows[0])
 	let matchManifestVersions = getCustom("MATCH_MANIFEST_VERSIONS","false",opts);
 	if(matchManifestVersions === "true") {
@@ -383,7 +383,7 @@ function getFinalPackagesVersionsForModule(rows,manifestPath,goBin) {
 	execSync(`${handleSpacesInPath(goBin)} mod download`, options)
 	let finalVersionsForAllModules = execSync(`${handleSpacesInPath(goBin)} list -m all`, options).toString()
 	let finalVersionModules = new Map()
-	finalVersionsForAllModules.split(EOL).filter(string => string.trim()!== "")
+	finalVersionsForAllModules.split(getLineSeparatorGolang()).filter(string => string.trim()!== "")
 		.filter(string => string.trim().split(" ").length === 2)
 		.forEach((dependency) => {
 			let dep = dependency.split(" ")
@@ -421,6 +421,11 @@ function getPackageName(fullPackage) {
 	return fullPackage.split("@")[0]
 }
 
+function getLineSeparatorGolang() {
+	let reg = /\n|\r\n/
+	return reg
+}
+
 // /**
 //  *
 //  * @param {string} fullPackage - full package with its name and version-