diff --git a/src/reports/repoReports/dependencyReports/dockerfileImageReports/getImagePartsFromFile.ts b/src/reports/repoReports/dependencyReports/dockerfileImageReports/getImagePartsFromFile.ts index 5865bc4..bd1b380 100644 --- a/src/reports/repoReports/dependencyReports/dockerfileImageReports/getImagePartsFromFile.ts +++ b/src/reports/repoReports/dependencyReports/dockerfileImageReports/getImagePartsFromFile.ts @@ -10,7 +10,7 @@ export default function (ruleFile: RuleFile): DockerfileImageParts | null { let imageParts: DockerfileImageParts | null = null if (validDockerfile.Check(ruleFile) && ruleFile.fileType === FileTypeEnum.DOCKERFILE) { const imageArray = ruleFile.image.split(':') - const image = imageArray[0].replace(/\//g, '_') // slashes in image name will mess with file structure + const image = imageArray[0] let version = '?' let tag = '?' diff --git a/src/reports/repoReports/dependencyReports/ghActionModuleReports/getGhActionModulePartsFromFile.ts b/src/reports/repoReports/dependencyReports/ghActionModuleReports/getGhActionModulePartsFromFile.ts index 7e41995..285b75f 100644 --- a/src/reports/repoReports/dependencyReports/ghActionModuleReports/getGhActionModulePartsFromFile.ts +++ b/src/reports/repoReports/dependencyReports/ghActionModuleReports/getGhActionModulePartsFromFile.ts @@ -15,7 +15,7 @@ export default function (ruleFile: RuleFile): GHActionModuleParts[] { if (step.uses != null) { const moduleString = step.uses.split('@') if (moduleString[1] != null) { - const moduleName: string = moduleString[0].replace(/\//g, '_') // slashes in action name will mess with file structure + const moduleName: string = moduleString[0] const version = moduleString[1] parts.push({ name: moduleName, diff --git a/src/reports/repoReports/dependencyReports/npmDependencyReports/getNPMDependencyPartsFromFile.ts b/src/reports/repoReports/dependencyReports/npmDependencyReports/getNPMDependencyPartsFromFile.ts index e9cbab0..18c473b 100644 --- a/src/reports/repoReports/dependencyReports/npmDependencyReports/getNPMDependencyPartsFromFile.ts +++ b/src/reports/repoReports/dependencyReports/npmDependencyReports/getNPMDependencyPartsFromFile.ts @@ -12,7 +12,7 @@ export default function (ruleFile: RuleFile): NPMDependencyParts[] { const allDeps: Record = combineDeps(ruleFile) for (const name in allDeps) { - const dependencyName = name.replace(/\//g, '_') // slashes in dep name will mess with file structure + const dependencyName = name if (!(allDeps[name]).includes('file:')) { // we don't care about intra-repo dependencies parts.push({ name: dependencyName, diff --git a/src/reports/repoReports/dependencyReports/npmDependencyReports/npmDependencyCondensedReport.ts b/src/reports/repoReports/dependencyReports/npmDependencyReports/npmDependencyCondensedReport.ts index 58c1739..b89c600 100644 --- a/src/reports/repoReports/dependencyReports/npmDependencyReports/npmDependencyCondensedReport.ts +++ b/src/reports/repoReports/dependencyReports/npmDependencyReports/npmDependencyCondensedReport.ts @@ -24,7 +24,6 @@ export class NPMDependencyCondensedReport extends DependencyCondensedReport { } async getNPMPackageInfo (name: string): Promise { - name = name.replace('_', '/') // we removed slashes for file system reasons but need to add them back here try { const res: any = await fetch(`https://registry.npmjs.org/${name}`).then(async res => await res.json()) if (res.error != null) { diff --git a/src/reports/repoReports/dependencyReports/pipDependencyReports/getPIPDependencyPartsFromFile.ts b/src/reports/repoReports/dependencyReports/pipDependencyReports/getPIPDependencyPartsFromFile.ts index 5073076..5b995e4 100644 --- a/src/reports/repoReports/dependencyReports/pipDependencyReports/getPIPDependencyPartsFromFile.ts +++ b/src/reports/repoReports/dependencyReports/pipDependencyReports/getPIPDependencyPartsFromFile.ts @@ -10,9 +10,8 @@ export default function (ruleFile: RuleFile): PIPDependencyParts[] { const parts: PIPDependencyParts[] = [] if (validPIPRequirementsFile.Check(ruleFile) && ruleFile.fileType === FileTypeEnum.PIP_REQUIREMENTS) { for (const name in ruleFile.dependencies) { - const dependencyName = name.replace(/\//g, '_') // slashes in dep name will mess with file structure parts.push({ - name: dependencyName, + name: name, version: removeComparatorsInVersion(ruleFile.dependencies[name].version) }) }