Skip to content
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

Jump to bottom

feat: include server for self hosted #326

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: include server for self hosted #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74d9247
feat: include server for self hosted
polarpoint Apr 1, 2024
e3c9bb0
Merge branch 'aquasecurity:master' into feat/add-server-config
bainss Apr 1, 2024
7f3d1ae
feat: trivy client with server endpoint
polarpoint Apr 1, 2024
e28188f
fix: ensure ARGS are updated
polarpoint Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Expand Up @@ -540,6 +540,7 @@ Following inputs can be used as `step.with` keys:
| `scan-type` | String | `image` | Scan type, e.g. `image` or `fs` |
| `input` | String | | Tar reference, e.g. `alpine-latest.tar` |
| `image-ref` | String | | Image reference, e.g. `alpine:3.10.2` |
| `server` | String | | server host, e.g. `https://scan.example.com` |
| `scan-ref` | String | `/github/workspace/` | Scan reference, e.g. `/github/workspace/` or `.` |
| `format` | String | `table` | Output format (`table`, `json`, `sarif`, `github`) |
| `template` | String | | Output template (`@/contrib/gitlab.tpl`, `@/contrib/junit.tpl`) |
Expand Down
4 changes: 4 additions & 0 deletions action.yaml
View file
Open in desktop
Expand Up @@ -91,6 +91,9 @@ inputs:
tf-vars:
description: "path to terraform tfvars file"
required: false
server:
description: "server host"
required: false
limit-severities-for-sarif:
description: 'limit severities for SARIF format'
required: false
Expand Down Expand Up @@ -122,4 +125,5 @@ runs:
- '-u ${{ inputs.github-pat }}'
- '-v ${{ inputs.trivy-config }}'
- '-x ${{ inputs.tf-vars }}'
- '-y ${{ inputs.server }}'
- '-z ${{ inputs.limit-severities-for-sarif }}'
16 changes: 12 additions & 4 deletions entrypoint.sh
View file
Open in desktop
@@ -1,6 +1,6 @@
#!/bin/bash
set -e
while getopts "a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:x:z:" o; do
while getopts "a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:x:y:z:" o; do
case "${o}" in
a)
export scanType=${OPTARG}
Expand Down Expand Up @@ -71,6 +71,9 @@ while getopts "a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:x:z:" o; do
x)
export tfVars=${OPTARG}
;;
y)
export server=${OPTARG}
;;
z)
export limitSeveritiesForSARIF=${OPTARG}
;;
Expand Down Expand Up @@ -137,7 +140,7 @@ if [ $skipDirs ];then
fi
if [ $tfVars ] && [ "$scanType" == "config" ];then
ARGS="$ARGS --tf-vars $tfVars"
fi
fi

if [ $trivyIgnores ];then
for f in $(echo $trivyIgnores | tr "," "\n")
Expand All @@ -162,14 +165,19 @@ if [ $ignorePolicy ];then
SARIF_ARGS="$SARIF_ARGS --ignore-policy $ignorePolicy"
fi
if [ "$hideProgress" == "true" ];then
ARGS="$ARGS --quiet"
SARIF_ARGS="$SARIF_ARGS --quiet"
ARGS="$ARGS --no-progress"
SARIF_ARGS="$SARIF_ARGS --no-progress"
fi

listAllPkgs=$(echo $listAllPkgs | tr -d '\r')
if [ "$listAllPkgs" == "true" ];then
ARGS="$ARGS --list-all-pkgs"
fi

if [ $server ] ;then
ARGS="$ARGS --server $server"
fi

if [ "$skipFiles" ];then
for i in $(echo $skipFiles | tr "," "\n")
do
Expand Down