From 07d70ebb9fb923827920d57948c40e27684fc7d3 Mon Sep 17 00:00:00 2001 From: cdatla Date: Thu, 5 Mar 2026 17:47:59 +0530 Subject: [PATCH 1/2] chore: Add validation for --aviator-app-mapping option --- .../com/fortify/cli/ssc/actions/zip/bulkaudit.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml index 4b9cf0eb18..f800f30c35 100644 --- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml +++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml @@ -96,6 +96,12 @@ steps: - var.set: module: ssc + # Validate --aviator-app-mapping value + - if: ${!('app'.equals(cli['aviator-app-mapping']) || 'version'.equals(cli['aviator-app-mapping']))} + do: + - log.progress: "ERROR: Invalid --aviator-app-mapping value '${cli['aviator-app-mapping']}'. Valid values are: app, version" + - throw: "Invalid --aviator-app-mapping value '${cli['aviator-app-mapping']}'. Valid values are: app, version" + # Validate that at least one of --tag-mapping or --add-aviator-tags is specified - if: ${(cli['tag-mapping'] == null || cli['tag-mapping'] == '') && !cli['add-aviator-tags']} do: From cf8ea172d9f8e2cbc0070fe1af471ebbc56f065c Mon Sep 17 00:00:00 2001 From: cdatla Date: Fri, 6 Mar 2026 18:02:15 +0530 Subject: [PATCH 2/2] chore: Simplify validation logic for --aviator-app-mapping and --tag-mapping options --- .../com/fortify/cli/ssc/actions/zip/bulkaudit.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml index f800f30c35..0d8c3b8974 100644 --- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml +++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml @@ -97,16 +97,12 @@ steps: module: ssc # Validate --aviator-app-mapping value - - if: ${!('app'.equals(cli['aviator-app-mapping']) || 'version'.equals(cli['aviator-app-mapping']))} - do: - - log.progress: "ERROR: Invalid --aviator-app-mapping value '${cli['aviator-app-mapping']}'. Valid values are: app, version" - - throw: "Invalid --aviator-app-mapping value '${cli['aviator-app-mapping']}'. Valid values are: app, version" + - if: ${!(cli['aviator-app-mapping'] matches 'app|version')} + throw: "Invalid --aviator-app-mapping value '${cli['aviator-app-mapping']}'. Valid values are: app, version" # Validate that at least one of --tag-mapping or --add-aviator-tags is specified - if: ${(cli['tag-mapping'] == null || cli['tag-mapping'] == '') && !cli['add-aviator-tags']} - do: - - log.progress: "ERROR: Either --tag-mapping or --add-aviator-tags must be specified." - - throw: "Either --tag-mapping or --add-aviator-tags must be specified." + throw: "Either --tag-mapping or --add-aviator-tags must be specified." - log.progress: "Using Aviator app mapping: ${cli['aviator-app-mapping']}"