Commit a479214b authored by Clement Bois's avatar Clement Bois
Browse files

Merge branch 'fix/trivy-download-template' into 'master' 

fix(trivy): extract codequality template

Closes #117

See merge request to-be-continuous/python!165
parents 6af065b2 4714a633

templates/gitlab-ci-python.yml

+5 −3
Original line number Diff line number Diff line
@@ -1472,15 +1472,17 @@ py-trivy: 
        log_info "... use latest Trivy version: \\e[32m$PYTHON_TRIVY_DIST_URL\\e[0m"

      fi

      python_trivy="$XDG_CACHE_HOME/trivy-$(echo "$PYTHON_TRIVY_DIST_URL" | md5sum | cut -d" " -f1)"

      if [[ -f $python_trivy ]]

      python_trivy_codequality_tpl="$python_trivy.gitlab-codequality.tpl"

      if [[ -f $python_trivy ]] && [[ -f $python_trivy_codequality_tpl ]]

      then

        log_info "Trivy found in cache (\\e[32m$PYTHON_TRIVY_DIST_URL\\e[0m): reuse"

      else

        log_info "Trivy not found in cache (\\e[32m$PYTHON_TRIVY_DIST_URL\\e[0m): download"

        python3 -c 'import urllib.request;urllib.request.urlretrieve("'$PYTHON_TRIVY_DIST_URL'","trivy.tar.gz")'

        tar zxf trivy.tar.gz trivy

        tar zxf trivy.tar.gz trivy contrib/gitlab-codequality.tpl

        mkdir -p $XDG_CACHE_HOME

        mv ./trivy $python_trivy

        mv ./contrib/gitlab-codequality.tpl $python_trivy_codequality_tpl

      fi

    - |

      case "$PYTHON_BUILD_SYSTEM" in
@@ -1524,7 +1526,7 @@ py-trivy: 
      rm ./reports/trivy.log



      # Generate a report in the Code Quality format

      $python_trivy convert --format template --template "@/contrib/gitlab-codequality.tpl" --output reports/py-trivy.gitlab-codequality.json reports/py-trivy.trivy.json

      $python_trivy convert --format template --template "@$python_trivy_codequality_tpl" --output reports/py-trivy.gitlab-codequality.json reports/py-trivy.trivy.json



      # console output

      $python_trivy convert --format table reports/py-trivy.trivy.json