feat: Artifact types

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>

Dockerfile

@@ -1,5 +0,0 @@
-FROM aquasec/trivy:latest
-COPY entrypoint.sh /
-RUN apk --no-cache add bash
-RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -12,8 +12,6 @@
 
 - [Usage](#usage)
   - [Workflow](#workflow)
-  - [Docker Image Scanning](#using-trivy-with-github-code-scanning)
-  - [Git Repository Scanning](#using-trivy-to-scan-your-git-repo)
 - [Customizing](#customizing)
   - [Inputs](#inputs)
 
@@ -88,45 +86,6 @@ jobs:
 
 You can find a more in-depth example here: https://github.com/aquasecurity/trivy-sarif-demo/blob/master/.github/workflows/scan.yml
 
-### Using Trivy to scan your Git repo
-It's also possible to scan your git repos with Trivy's built-in repo scan. This can be handy if you want to run Trivy as a build time check on each PR that gets opened in your repo. This helps you identify potential vulnerablites that might get introduced with each PR.
-
-If you have [GitHub code scanning](https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) available you can use Trivy as a scanning tool as follows:
-```yaml
-name: build
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-18.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Build an image from Dockerfile
-        run: |
-          docker build -t docker.io/my-organization/my-app:${{ github.sha }} .
-
-      - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@master
-        with:
-          scan-type: 'fs'
-          ignore-unfixed: true
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          output: 'trivy-results.sarif'
-          severity: 'CRITICAL'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: 'trivy-results.sarif'
-```
-
 ## Customizing
 
 ### inputs
@@ -135,10 +94,7 @@ Following inputs can be used as `step.with` keys:
 
 | Name             | Type    | Default                            | Description                                   |
 |------------------|---------|------------------------------------|-----------------------------------------------|
-| `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`         |
-| `scan-ref`       | String  | `/github/workspace/`               | Scan reference, e.g. `/github/workspace/` or `.`|
 | `format`         | String  | `table`                            | Output format (`table`, `json`, `template`)   |
 | `template`       | String  |                                    | Output template (`@/contrib/sarif.tpl`, `@/contrib/gitlab.tpl`, `@/contrib/junit.tpl`)|
 | `output`         | String  |                                    | Save results to a file                        |
@@ -146,9 +102,7 @@ Following inputs can be used as `step.with` keys:
 | `ignore-unfixed` | Boolean | false                              | Ignore unpatched/unfixed vulnerabilities      |
 | `vuln-type`      | String  | `os,library`                       | Vulnerability types (os,library)              |
 | `severity`       | String  | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | Severities of vulnerabilities to be displayed |
-| `skip-dirs`       | String  |                                   | Comma separated list of directories where traversal is skipped |
-| `cache-dir`      | String  |                                    | Cache directory                               |
-| `timeout`        | String  | `2m0s`                             | Scan timeout duration                         |
+
 [release]: https://github.com/aquasecurity/trivy-action/releases/latest
 [release-img]: https://img.shields.io/github/release/aquasecurity/trivy-action.svg?logo=github
 [marketplace]: https://github.com/marketplace/actions/aqua-security-trivy

action.yaml

@@ -2,21 +2,16 @@ name: 'Aqua Security Trivy'
 description: 'Scans container images for vulnerabilities with Trivy'
 author: 'Aqua Security'
 inputs:
-  scan-type:
-    description: 'Scan type to use for scanning vulnerability'
-    required: false
-    default: 'image'
   image-ref:
-    description: 'image reference(for backward compatibility)'
+    description: 'image reference'
+    required: true
+  artifact-type:
+    description: 'artifact type (image or fs)'
+    required: true
+    default: "image"
+  aritfact-ref:
+    description: 'artifact reference (image reference or file path)'
     required: true
-  input:
-    description: 'reference of tar file to scan'
-    required: false
-    default: ''
-  scan-ref:
-    description: 'Scan reference'
-    required: false
-    default: '.'
   exit-code:
     description: 'exit code when vulnerabilities were found'
     required: false
@@ -24,7 +19,7 @@ inputs:
   ignore-unfixed:
     description: 'ignore unfixed vulnerabilities'
     required: false
-    default: 'false'
+    default: "false"
   vuln-type:
     description: 'comma-separated list of vulnerability types (os,library)'
     required: false
@@ -45,33 +40,16 @@ inputs:
     description: 'writes results to a file with the specified file name'
     required: false
     default: ''
-  skip-dirs:
-    description: 'comma separated list of directories where traversal is skipped'
-    required: false
-    default: ''
-  cache-dir:
-    description: 'specify where the cache is stored'
-    required: false
-    default: ''
-  timeout:
-    description: 'timeout (default 2m0s)'
-    required: false
-    default: ''
 runs:
   using: 'docker'
-  image: "Dockerfile"
+  image: 'docker://docker.io/aquasec/trivy:latest'
   args:
-    - '-a ${{ inputs.scan-type }}'
-    - '-b ${{ inputs.format }}'
-    - '-c ${{ inputs.template }}'
-    - '-d ${{ inputs.exit-code }}'
-    - '-e ${{ inputs.ignore-unfixed }}'
-    - '-f ${{ inputs.vuln-type }}'
-    - '-g ${{ inputs.severity }}'
-    - '-h ${{ inputs.output }}'
-    - '-i ${{ inputs.image-ref }}'
-    - '-j ${{ inputs.scan-ref }}'
-    - '-k ${{ inputs.skip-dirs }}'
-    - '-l ${{ inputs.input }}'
-    - '-m ${{ inputs.cache-dir }}'
-    - '-n ${{ inputs.timeout }}'
+    - '${{ inputs.artifact-type }}'
+    - '--format=${{ inputs.format }}'
+    - '--template=${{ inputs.template }}'
+    - '--exit-code=${{ inputs.exit-code }}'
+    - '--ignore-unfixed=${{ inputs.ignore-unfixed }}'
+    - '--vuln-type=${{ inputs.vuln-type }}'
+    - '--severity=${{ inputs.severity }}'
+    - '--output=${{ inputs.output }}'
+    - '${{ inputs.artifact-ref }}'

entrypoint.sh

@@ -1,94 +0,0 @@
-#!/bin/bash
-set -e
-while getopts "a:b:c:d:e:f:g:h:i:j:k:l:m:n:" o; do
-   case "${o}" in
-       a)
-         export scanType=${OPTARG}
-       ;;
-       b)
-         export format=${OPTARG}
-       ;;
-       c)
-         export template=${OPTARG}
-       ;;
-       d)
-         export exitCode=${OPTARG}
-       ;;
-       e)
-         export ignoreUnfixed=${OPTARG}
-       ;;
-       f)
-         export vulnType=${OPTARG}
-       ;;
-       g)
-         export severity=${OPTARG}
-       ;;
-       h)
-         export output=${OPTARG}
-       ;;
-       i)
-         export imageRef=${OPTARG}
-       ;;
-       j)
-         export scanRef=${OPTARG}
-       ;;
-       k)
-         export skipDirs=${OPTARG}
-       ;;
-       l)
-         export input=${OPTARG}
-       ;;
-       m)
-         export cacheDir=${OPTARG}
-       ;;
-       n)
-         export timeout=${OPTARG}
-       ;;
-  esac
-done
-
-scanType=$(echo $scanType | tr -d '\r')
-export artifactRef="${imageRef}"
-if [ "${scanType}" = "fs" ];then
-  artifactRef=$(echo $scanRef | tr -d '\r')
-fi
-input=$(echo $input | tr -d '\r')
-if [ $input ]; then
-  artifactRef="--input $input"
-fi
-ignoreUnfixed=$(echo $ignoreUnfixed | tr -d '\r')
-
-ARGS=""
-if [ $format ];then
- ARGS="$ARGS --format $format"
-fi
-if [ $template ] ;then
- ARGS="$ARGS --template $template"
-fi
-if [ $exitCode ];then
- ARGS="$ARGS --exit-code $exitCode"
-fi
-if [ "$ignoreUnfixed" == "true" ];then
-  ARGS="$ARGS --ignore-unfixed"
-fi
-if [ $vulnType ];then
-  ARGS="$ARGS --vuln-type $vulnType"
-fi
-if [ $severity ];then
-  ARGS="$ARGS --severity $severity"
-fi
-if [ $output ];then
-  ARGS="$ARGS --output $output"
-fi
-if [ $skipDirs ];then
-  ARGS="$ARGS --skip-dirs $skipDirs"
-fi
-if [ $cacheDir ];then
-  ARGS="$ARGS --cache-dir $cacheDir"
-fi
-if [ $timeout ];then
-  ARGS="$ARGS --timeout $timeout"
-fi
-
-echo "Running trivy with options: " --no-progress "${ARGS}" "${artifactRef}"
-trivy ${scanType} --no-progress $ARGS ${artifactRef}