Allow type "file:..."

Signed-off-by: Malte Poll <mp@edgeless.systems>
anchore · Oct 1, 2022 · cdc29e7 · cdc29e7
1 parent 6218d4f
commit cdc29e7
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 20 deletions.
diff --git a/action.yml b/action.yml
@@ -7,7 +7,7 @@ branding:
 inputs:
   path:
     required: false
-    description: "A path on the filesystem to scan"
+    description: "A path on the filesystem to scan. Can be a file or directory."
     default: "."
 
   image:

diff --git a/dist/attachReleaseAssets/index.js b/dist/attachReleaseAssets/index.js
diff --git a/dist/downloadSyft/index.js b/dist/downloadSyft/index.js
diff --git a/dist/runSyftAction/index.js b/dist/runSyftAction/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,6 +67,6 @@
     "pretty-quick": "^3.1.3",
     "ts-jest": "^29.0.1",
     "type-fest": "^2.19.0",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   }
 }
diff --git a/src/Syft.ts b/src/Syft.ts
@@ -1,7 +1,7 @@
 /**
- * Used for filesystem directory input to Syft
+ * Used for filesystem directory/file input to Syft
  */
-export interface SyftDirectoryInput {
+export interface SyftPathInput {
   path: string;
 }
 
@@ -24,7 +24,7 @@ export interface SyftImageInput {
  * Syft invocation options
  */
 export interface SyftOptions {
-  input: SyftDirectoryInput | SyftRegistryInput | SyftImageInput;
+  input: SyftPathInput | SyftRegistryInput | SyftImageInput;
   format:
     | "spdx"
     | "spdx-tag-value"

diff --git a/src/github/SyftGithubAction.ts b/src/github/SyftGithubAction.ts
@@ -133,10 +133,24 @@ async function executeSyft({
     } else {
       args = [...args, `${input.image}`];
     }
-  } else if ("path" in input && input.path) {
+  } else if (
+    "path" in input &&
+    input.path &&
+    fs.existsSync(input.path) &&
+    fs.lstatSync(input.path).isDirectory()
+  ) {
     args = [...args, `dir:${input.path}`];
+  } else if (
+    "path" in input &&
+    input.path &&
+    fs.existsSync(input.path) &&
+    fs.lstatSync(input.path).isFile()
+  ) {
+    args = [...args, `file:${input.path}`];
   } else {
-    throw new Error("Invalid input, no image or path specified");
+    throw new Error(
+      "Invalid input, no image or path specified or path does not exist"
+    );
   }
 
   args = [...args, "-o", format];