diff --git a/backend/lambdas/api/repo/repo/util/const.py b/backend/lambdas/api/repo/repo/util/const.py index 593ebcb4..f33dac43 100644 --- a/backend/lambdas/api/repo/repo/util/const.py +++ b/backend/lambdas/api/repo/repo/util/const.py @@ -25,7 +25,7 @@ "owasp_dependency_check": None, "php_sensio_security_checker": None, "bundler_audit": None, - "trivy_image": None, + "trivy": None, "trivy_sca": None, }, "secret": {"gitsecrets": None, "truffle_hog": None}, @@ -94,7 +94,7 @@ # Add the Aqua plugin if it is enabled PLUGIN_LIST_BY_CATEGORY["vulnerability"]["aqua_cli_scanner"] = None for i in QUALIFIED_PLUGINS["vulnerability"]: - if i == ["trivy_image" or "trivy_sca"]: + if i == ["trivy" or "trivy_sca"]: # Set aqua_cli_scanner as an alternate option to trivy for qualification i.append("aqua_cli_scanner") else: diff --git a/ui/src/app/scanPlugins.ts b/ui/src/app/scanPlugins.ts index 652fae15..bfa9ef45 100644 --- a/ui/src/app/scanPlugins.ts +++ b/ui/src/app/scanPlugins.ts @@ -179,8 +179,8 @@ export const vulnPluginsKeys: ScanPluginKeys = { }, snyk: { displayName: t`Snyk`, apiName: "snyk", group: GROUP_VULN }, trivy_image: { - displayName: t`Trivy Container Images`, - apiName: "trivy_image", + displayName: t`Trivy Container Image`, + apiName: "trivy", group: GROUP_VULN, }, trivy_sca: { diff --git a/ui/src/locale/en/messages.po b/ui/src/locale/en/messages.po index 0b424ae0..0a79e0f1 100644 --- a/ui/src/locale/en/messages.po +++ b/ui/src/locale/en/messages.po @@ -343,8 +343,8 @@ msgid "Component name must be less than {COMPONENT_NAME_LENGTH} characters" msgstr "Component name must be less than {COMPONENT_NAME_LENGTH} characters" #: src/app/scanPlugins.ts:182 -msgid "Trivy Container Images" -msgstr "Trivy Container Images" +#~ msgid "Trivy Container Images" +#~ msgstr "Trivy Container Images" #: src/pages/UsersPage.tsx:410 msgid "Artemis - User Management" @@ -832,6 +832,10 @@ msgstr "Results may vary compared to scans run with other options. View scan res msgid "Remove this hidden finding? This finding will again appear in scan results for this repository." msgstr "Remove this hidden finding? This finding will again appear in scan results for this repository." +#: src/app/scanPlugins.ts:182 +msgid "Trivy Container Image" +msgstr "Trivy Container Image" + #: src/pages/ResultsPage.tsx:4789 msgid "Show line numbers" msgstr "Show line numbers"