Reorder task inputs

rhyskoedijk · Nov 8, 2024 · 09f7f5a · 09f7f5a
1 parent bbb7d76
commit 09f7f5a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/task/index.ts b/task/index.ts
@@ -12,6 +12,7 @@ async function run() {
           buildSourcePath: getInputRequired('buildSourcePath'),
           buildArtifactPath: getInputRequired('buildArtifactPath'),
           buildFileList: getInput('buildFileList', false),
+          buildDockerImagesToScan: getInput('buildDockerImagesToScan', false),
           manifestOutputPath: getInput('manifestOutputPath', false),
           enableManifestGraphGeneration: getBoolInput('enableManifestGraphGeneration', false),
           enablePackageMetadataParsing: getBoolInput('enablePackageMetadataParsing', false),
@@ -23,7 +24,6 @@ async function run() {
           packageSupplier: getInputRequired('packageSupplier'),
           packageNamespaceUriBase: getInput('packageNamespaceUriBase', false),
           packageNamespaceUriUniquePart: getInput('packageNamespaceUriUniquePart', false),
-          dockerImagesToScan: getInput('dockerImagesToScan', false),
           additionalComponentDetectorArgs: getInput('additionalComponentDetectorArgs', false),
           externalDocumentReferenceListFile: getInput('externalDocumentReferenceListFile', false),
         });

diff --git a/task/task.json b/task/task.json
@@ -70,6 +70,15 @@
       "helpMarkDown": "The list of file paths (one per line) for which the SBOM file will describe. If specified, this overrides `buildArtifactPath`, only files listed here will be included in the generated SBOM.",
       "visibleRule": "command=generate"
     },
+    {
+      "name": "buildDockerImagesToScan",
+      "type": "string",
+      "label": "Build Docker Images To Scan",
+      "defaultValue": "",
+      "required": false,
+      "helpMarkDown": "Comma separated list of docker image names or hashes to be scanned for package dependencies. For example, `ubuntu:16.04, 56bab49eef2ef07505f6a1b0d5bd3a601dfc3c76ad4460f24c91d6fa298369ab`.",
+      "visibleRule": "command=generate"
+    },
     {
       "name": "manifestOutputPath",
       "type": "string",
@@ -183,16 +192,6 @@
       "helpMarkDown": "A unique valid URI part that will be appended to the SBOM namespace URI. If specified, this value should be globally unique.",
       "visibleRule": "command=generate"
     },
-    {
-      "groupName": "advanced",
-      "name": "dockerImagesToScan",
-      "type": "string",
-      "label": "Docker Images To Scan",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "Comma separated list of docker image names or hashes to be scanned for package dependencies. For example, `ubuntu:16.04, 56bab49eef2ef07505f6a1b0d5bd3a601dfc3c76ad4460f24c91d6fa298369ab`.",
-      "visibleRule": "command=generate"
-    },
     {
       "groupName": "advanced",
       "name": "additionalComponentDetectorArgs",
@@ -219,4 +218,4 @@
       "target": "index.js"
     }
   }
-}
+}
diff --git a/task/utils/spdx/sbomTool.ts b/task/utils/spdx/sbomTool.ts
@@ -16,6 +16,7 @@ export interface SbomGenerateArgs {
   buildSourcePath: string;
   buildArtifactPath: string;
   buildFileList?: string;
+  buildDockerImagesToScan?: string;
   manifestOutputPath?: string;
   enableManifestGraphGeneration?: boolean;
   enablePackageMetadataParsing?: boolean;
@@ -27,7 +28,6 @@ export interface SbomGenerateArgs {
   packageSupplier: string;
   packageNamespaceUriBase?: string;
   packageNamespaceUriUniquePart?: string;
-  dockerImagesToScan?: string;
   additionalComponentDetectorArgs?: string;
   externalDocumentReferenceListFile?: string;
 }
@@ -59,6 +59,9 @@ export class SbomTool {
     if (args.buildFileList) {
       sbomToolArguments.push('-bl', await createTemporaryFileAsync('build-file-list', args.buildFileList));
     }
+    if (args.buildDockerImagesToScan) {
+      sbomToolArguments.push('-di', args.buildDockerImagesToScan);
+    }
     if (args.manifestOutputPath) {
       sbomToolArguments.push('-m', args.manifestOutputPath);
     }
@@ -86,9 +89,6 @@ export class SbomTool {
     if (args.packageNamespaceUriUniquePart) {
       sbomToolArguments.push('-nsu', args.packageNamespaceUriUniquePart);
     }
-    if (args.dockerImagesToScan) {
-      sbomToolArguments.push('-di', args.dockerImagesToScan);
-    }
     if (args.additionalComponentDetectorArgs) {
       sbomToolArguments.push('-cd', args.additionalComponentDetectorArgs);
     }