From d845fa9f8fee0ea26d74205521d4497aa5ee1795 Mon Sep 17 00:00:00 2001 From: Guy Sheffer Date: Mon, 19 Feb 2024 17:27:45 +0200 Subject: [PATCH 1/2] Initial work for tar path feature --- utils/cliutils/commandsflags.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index a5fe38b87..e80ca2a94 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -483,6 +483,7 @@ const ( ExclusionsAudit = auditPrefix + exclusions repoPath = "repo-path" licenses = "licenses" + useTar = "tar" vuln = "vuln" ExtendedTable = "extended-table" MinSeverity = "min-severity" @@ -1380,6 +1381,10 @@ var flagsMap = map[string]cli.Flag{ Name: licenses, Usage: "[Default: false] Set to true if you'd like to receive licenses from Xray scanning.` `", }, + useTar: cli.BoolFlag{ + Name: useTar, + Usage: "[Default: false] In a docker scan use a tar file directly without saving an existing image` `", + }, vuln: cli.BoolFlag{ Name: vuln, Usage: "[Default: false] Set to true if you'd like to receive an additional view of all vulnerabilities, regardless of the policy configured in Xray. Ignored if provided 'format' is 'sarif'.` `", @@ -1818,7 +1823,7 @@ var commandFlags = map[string][]string{ }, Docker: { buildName, buildNumber, module, Project, - serverId, skipLogin, threads, detailedSummary, watches, repoPath, licenses, xrOutput, fail, ExtendedTable, BypassArchiveLimits, MinSeverity, FixableOnly, + serverId, skipLogin, threads, detailedSummary, watches, repoPath, licenses, useTar, xrOutput, fail, ExtendedTable, BypassArchiveLimits, MinSeverity, FixableOnly, }, DockerPush: { buildName, buildNumber, module, Project, From 9df15258fb9dd539e91519175fab48827c092ea3 Mon Sep 17 00:00:00 2001 From: Guy Sheffer <144031599+guyshe-jfrog@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:32:06 +0200 Subject: [PATCH 2/2] Fix phrasing of docs Co-authored-by: Assaf Attias <49212512+attiasas@users.noreply.github.com> --- utils/cliutils/commandsflags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index e80ca2a94..ee924443e 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -1383,7 +1383,7 @@ var flagsMap = map[string]cli.Flag{ }, useTar: cli.BoolFlag{ Name: useTar, - Usage: "[Default: false] In a docker scan use a tar file directly without saving an existing image` `", + Usage: "[Default: false] Set to true to force request docker scan on a .tar file instead of an image.` `", }, vuln: cli.BoolFlag{ Name: vuln,