From c7091bb9aeaecc81d2ce6e115abcfc0338b38257 Mon Sep 17 00:00:00 2001 From: Justin Hutchings Date: Fri, 20 Jan 2023 00:05:59 +0000 Subject: [PATCH] Remove dead code, use module --- index.ts | 66 +++----------------------------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/index.ts b/index.ts index 0d9cd36..a0f4f29 100644 --- a/index.ts +++ b/index.ts @@ -13,8 +13,10 @@ import { submitSnapshot } from '@github/dependency-submission-toolkit' +import CondaParser from './condaParser'; + async function run() { - let manifests = getManifestsFromEnvironmentFiles(searchFiles()); + let manifests = CondaParser.getManifestsFromEnvironmentFiles(CondaParser.searchFiles()); let snapshot = new Snapshot({ name: "conda-dependency-submission-action", @@ -34,66 +36,4 @@ async function run() { submitSnapshot(snapshot); } -function getManifestFromEnvironmentFile(document, fileName) { - core.debug(`getManifestFromEnvironmentFile processing ${fileName}`); - - let manifest = new Manifest("Environment", fileName); - - -/** - let manifest = new Manifest(document.name, fileName); - - core.debug(`Processing ${document.packages?.length} packages`); - - document.packages?.forEach(pkg => { - let packageName = pkg.name; - let packageVersion = pkg.packageVersion; - let referenceLocator = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator; - let genericPurl = `pkg:generic/${packageName}@${packageVersion}`; - // SPDX 2.3 defines a purl field - let purl; - if (pkg.purl != undefined) { - purl = pkg.purl; - } else if (referenceLocator != undefined) { - purl = referenceLocator; - } else { - purl = genericPurl; - } - - // Working around weird encoding issues from an SBOM generator - // Find the last instance of %40 and replace it with @ - purl = replaceVersionEscape(purl); - - let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage"); - if (relationships != null && relationships.length > 0) { - manifest.addIndirectDependency(new Package(purl)); - } else { - manifest.addDirectDependency(new Package(purl)); - } - }); - return manifest; - */ -} - -function getManifestsFromEnvironmentFiles(files) { - core.debug(`Processing ${files.length} files`); - let manifests = []; - files?.forEach(file => { - core.debug(`Processing ${file}`); - manifests.push(getManifestFromEnvironmentFile(yaml.parse(file))); - }); - return manifests; -} - -function searchFiles(filePath = false, filePattern = false) { - if (!filePath) { - let filePath = core.getInput('filePath'); - } - if (!filePattern) { - let filePattern = core.getInput('filePattern'); - } - - return glob.sync(`${filePath}/${filePattern}`, {}); -} - run();