Refactor the filePath/filePattern handling

Author: jhutchings1

condaParser.ts

@@ -15,58 +15,10 @@ import {
 } from '@github/dependency-submission-toolkit'
 import { YAMLMap } from 'yaml';
 
-/**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;
-}*/
-
-/***/
-
 export default class CondaParser {
 
   static searchFiles(filePath = "", filePattern = "") {
-    if (filePath == "") {
-        let filePath = core.getInput('filePath');
-    }
-    if (filePattern == "") {
-        let filePattern = core.getInput('filePattern');
-    }
-
+    core.debug(`Searching for files in ${filePath} with pattern ${filePattern}`);
     return glob.sync(`${filePath}/${filePattern}`, {});
   }
 

dist/condaParser.d.ts

@@ -13,7 +13,8 @@ import {
 import CondaParser from './condaParser';
 
 async function run() {
-  let manifests = CondaParser.getManifestsFromEnvironmentFiles(CondaParser.searchFiles());
+  let manifests = CondaParser.getManifestsFromEnvironmentFiles(
+    CondaParser.searchFiles(core.getInput('filePath'), core.getInput('filePattern')));
 
   let snapshot = new Snapshot({
       name: "conda-dependency-submission-action",