Skip to content

Correct issue introduced in commit ee6a4f5 (related to #343) #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolargo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correct issue introduced in commit ee6a4f5 (related to #343) #344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ if [ "${format}" == "sarif" ] && [ "${limitSeveritiesForSARIF}" != "true" ]; the
trivy --quiet ${scanType} --format sarif --output ${output} $SARIF_ARGS ${artifactRef}
elif [ $trivyConfig ]; then
echo "Running Trivy with trivy.yaml config from: " $trivyConfig
trivy --config $trivyConfig ${scanType} ${ARGS}" ${artifactRef}
trivy --config $trivyConfig ${scanType} ${ARGS} ${artifactRef}
Copy link
Copy Markdown

@aitrics-ray aitrics-ray Apr 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're at it, it'd be nice to meet conventions.

Suggested change
trivy --config $trivyConfig ${scanType} ${ARGS} ${artifactRef}
echo "Running Trivy with trivy.yaml config from: ${trivyConfig}"
trivy --config "${trivyConfig}" "${scanType}" "${ARGS}" "${artifactRef}"

FYI
https://google.github.io/styleguide/shellguide.html#s5.6-variable-expansion

Copy link
Copy Markdown

@AkselAllas AkselAllas Apr 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be "${trivyConfig}" "${scanType}" "${ARGS}" "${artifactRef}" unless ARGS really needs to be unquoted.

Copy link
Copy Markdown

@aitrics-ray aitrics-ray Apr 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed

else
echo "Running trivy with options: trivy ${scanType} ${ARGS}" "${artifactRef}"
echo "Global options: " "${GLOBAL_ARGS}"
Expand Down