Merge pull request #119 from aquasecurity/transfer

Transfer repositoriy

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
           command: goreleaser --rm-dist
       - run:
           name: Clone trivy repository
-          command: git clone git@github.com:knqyf263/trivy-repo.git
+          command: git clone git@github.com:aquasecurity/trivy-repo.git
       - run:
           name: Setup git settings
           command: |

README.md

@@ -1,8 +1,8 @@
 <img src="imgs/logo.png" width="300">
 
-[![GitHub release](https://img.shields.io/github/release/knqyf263/trivy.svg)](https://github.com/knqyf263/trivy/releases/latest)
-[![CircleCI](https://circleci.com/gh/knqyf263/trivy.svg?style=svg)](https://circleci.com/gh/knqyf263/trivy)
-[![Go Report Card](https://goreportcard.com/badge/github.com/knqyf263/trivy)](https://goreportcard.com/report/github.com/knqyf263/trivy)
+[![GitHub release](https://img.shields.io/github/release/aquasecurity/trivy.svg)](https://github.com/aquasecurity/trivy/releases/latest)
+[![CircleCI](https://circleci.com/gh/aquasecurity/trivy.svg?style=svg)](https://circleci.com/gh/aquasecurity/trivy)
+[![Go Report Card](https://goreportcard.com/badge/github.com/aquasecurity/trivy)](https://goreportcard.com/report/github.com/aquasecurity/trivy)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 
 
@@ -93,7 +93,7 @@ Add repository setting to `/etc/yum.repos.d`.
 $ sudo vim /etc/yum.repos.d/trivy.repo
 [trivy]
 name=Trivy repository
-baseurl=https://knqyf263.github.io/trivy-repo/rpm/releases/$releasever/$basearch/
+baseurl=https://aquasecurity.github.io/trivy-repo/rpm/releases/$releasever/$basearch/
 gpgcheck=0
 enabled=1
 $ sudo yum -y update
@@ -103,7 +103,7 @@ $ sudo yum -y install trivy
 or
 
 ```
-$ rpm -ivh https://github.com/knqyf263/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.rpm
+$ rpm -ivh https://github.com/aquasecurity/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.rpm
 ```
 
 ## Debian/Ubuntu
@@ -116,8 +116,8 @@ CODE_NAME: wheezy, jessie, stretch, buster, trusty, xenial, bionic
 
 ```
 $ sudo apt-get install apt-transport-https gnupg
-$ wget -qO - https://knqyf263.github.io/trivy-repo/deb/public.key | sudo apt-key add -
-$ echo deb https://knqyf263.github.io/trivy-repo/deb [CODE_NAME] main | sudo tee -a /etc/apt/sources.list.d/trivy.list
+$ wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
+$ echo deb https://aquasecurity.github.io/trivy-repo/deb [CODE_NAME] main | sudo tee -a /etc/apt/sources.list.d/trivy.list
 $ sudo apt-get update
 $ sudo apt-get install trivy
 ```
@@ -126,7 +126,7 @@ or
 
 ```
 $ sudo apt-get install rpm
-$ wget https://github.com/knqyf263/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.deb
+$ wget https://github.com/aquasecurity/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.deb
 $ sudo dpkg -i trivy_0.0.15_Linux-64bit.deb
 ```
 ## Arch Linux
@@ -144,21 +144,21 @@ yay -Sy trivy-bin
 You can use homebrew on Mac OS.
 
 ```
-$ brew install knqyf263/trivy/trivy
+$ brew install aquasecurity/trivy/trivy
 ```
 
 ## Binary (Including Windows)
 
-Get the latest version from [this page](https://github.com/knqyf263/trivy/releases/latest), and download the archive file for your operating system/architecture. Unpack the archive, and put the binary somewhere in your `$PATH` (on UNIX-y systems, /usr/local/bin or the like). Make sure it has execution bits turned on.
+Get the latest version from [this page](https://github.com/aquasecurity/trivy/releases/latest), and download the archive file for your operating system/architecture. Unpack the archive, and put the binary somewhere in your `$PATH` (on UNIX-y systems, /usr/local/bin or the like). Make sure it has execution bits turned on.
 
 You need to install `rpm` command for scanning RHEL/CentOS.
 
 ## From source
 
 ```sh
-$ mkdir -p $GOPATH/src/github.com/knqyf263
-$ cd $GOPATH/src/github.com/knqyf263
-$ git clone https://github.com/knqyf263/trivy
+$ mkdir -p $GOPATH/src/github.com/aquasecurity
+$ cd $GOPATH/src/github.com/aquasecurity
+$ git clone https://github.com/aquasecurity/trivy
 $ cd trivy/cmd/trivy/
 $ export GO111MODULE=on
 $ go install
@@ -206,23 +206,23 @@ Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
 Replace [YOUR_CACHE_DIR] with the cache directory on your machine.
 
 ```
-$ docker run --rm -v [YOUR_CACHE_DIR]:/root/.cache/ knqyf263/trivy [YOUR_IMAGE_NAME]
+$ docker run --rm -v [YOUR_CACHE_DIR]:/root/.cache/ aquasecurity/trivy [YOUR_IMAGE_NAME]
 ```
 
 Example for macOS:
 
 ```
-$ docker run --rm -v $HOME/Library/Caches:/root/.cache/ knqyf263/trivy python:3.4-alpine
+$ docker run --rm -v $HOME/Library/Caches:/root/.cache/ aquasecurity/trivy python:3.4-alpine
 ```
 
 If you would like to scan the image on your host machine, you need to mount `docker.sock`.
 
 ```
 $ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
-    -v $HOME/Library/Caches:/root/.cache/ knqyf263/trivy python:3.4-alpine
+    -v $HOME/Library/Caches:/root/.cache/ aquasecurity/trivy python:3.4-alpine
 ```
 
-Please re-pull latest `knqyf263/trivy` if an error occured.
+Please re-pull latest `aquasecurity/trivy` if an error occured.
 
 <details>
 <summary>Result</summary>
@@ -252,7 +252,7 @@ Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
 Simply specify an image name (and a tag).
 
 ```
-$ trivy knqyf263/test-image:1.2.3
+$ trivy aquasecurity/test-image:1.2.3
 ```
 
 <details>
@@ -272,7 +272,7 @@ $ trivy knqyf263/test-image:1.2.3
 2019-05-16T12:59:10.285+0900    INFO    Updating pipenv Security DB...
 2019-05-16T12:59:11.487+0900    INFO    Detecting pipenv vulnerabilities...
 
-knqyf263/test-image:1.2.3 (alpine 3.7.1)
+aquasecurity/test-image:1.2.3 (alpine 3.7.1)
 ========================================
 Total: 26 (UNKNOWN: 0, LOW: 3, MEDIUM: 16, HIGH: 5, CRITICAL: 2)
 
@@ -1085,8 +1085,8 @@ env:
 
 before_install:
   - docker build -t trivy-ci-test:${COMMIT} .
-  - export VERSION=$(curl --silent "https://api.github.com/repos/knqyf263/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
-  - wget https://github.com/knqyf263/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
+  - export VERSION=$(curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
+  - wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
   - tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
 script:
   - ./trivy --exit-code 0 --severity HIGH --quiet --auto-refresh trivy-ci-test:${COMMIT}
@@ -1096,8 +1096,8 @@ cache:
     - $HOME/.cache/trivy
 ```
 
-Example: https://travis-ci.org/knqyf263/trivy-ci-test  
-Repository: https://github.com/knqyf263/trivy-ci-test
+Example: https://travis-ci.org/aquasecurity/trivy-ci-test  
+Repository: https://github.com/aquasecurity/trivy-ci-test
 
 ## CircleCI
 
@@ -1120,12 +1120,12 @@ jobs:
           command: |
             apk add --update curl
             VERSION=$(
-                curl --silent "https://api.github.com/repos/knqyf263/trivy/releases/latest" | \
+                curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | \
                 grep '"tag_name":' | \
                 sed -E 's/.*"v([^"]+)".*/\1/'
             )
 
-            wget https://github.com/knqyf263/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
+            wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
             tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
             mv trivy /usr/local/bin
       - run:
@@ -1142,8 +1142,8 @@ workflows:
       - build
 ```
 
-Example: https://circleci.com/gh/knqyf263/trivy-ci-test  
-Repository: https://github.com/knqyf263/trivy-ci-test
+Example: https://circleci.com/gh/aquasecurity/trivy-ci-test  
+Repository: https://github.com/aquasecurity/trivy-ci-test
 
 ## Authorization for Private Docker Registry
 
@@ -1220,7 +1220,7 @@ The unfixed/unfixable vulnerabilities mean that the patch has not yet been provi
 
 The path of these files does not matter.
 
-Example: https://npm.pkg.github.com/knqyf263/trivy-ci-test/blob/master/Dockerfile
+Example: https://npm.pkg.github.com/aquasecurity/trivy-ci-test/blob/master/Dockerfile
 
 ### Data source
 - PHP
@@ -1284,7 +1284,7 @@ However, the purpose of this database is to make it possible to know what packag
 As README says, it is not a complete database of all security issues in Alpine.
 
 `Trivy` collects vulnerability information in Alpine Linux from [Alpine Linux aports repository](https://gitlab.alpinelinux.org/alpine/aports).
-Then, those vulnerabilities will be saved on [vuln-list](https://github.com/knqyf263/vuln-list/tree/master/alpine).
+Then, those vulnerabilities will be saved on [vuln-list](https://github.com/aquasecurity/vuln-list/tree/master/alpine).
 
 `alpine-secdb` has 6959 vulnerabilities (as of 2019/05/12).
 `vuln-list` has 11101 vulnerabilities related with Alpine Linux (as of 2019/05/12).
@@ -1327,7 +1327,7 @@ As `Quay` seems to use `Clair` internally, it has the same accuracy than `Clair`
 ### Error: Your macOS keychain GitHub credentials do not have sufficient scope!
 
 ```
-$ brew tap knqyf263/trivy
+$ brew tap aquasecurity/trivy
 Error: Your macOS keychain GitHub credentials do not have sufficient scope!
 Scopes they need: none
 Scopes they have:
@@ -1342,20 +1342,20 @@ Try:
 $ printf "protocol=https\nhost=github.com\n" | git credential-osxkeychain erase
 ```
 
-### Error: knqyf263/trivy/trivy 64 already installed
+### Error: aquasecurity/trivy/trivy 64 already installed
 
 ```
 $ brew upgrade
 ...
-Error: knqyf263/trivy/trivy 64 already installed
+Error: aquasecurity/trivy/trivy 64 already installed
 ```
 
 Try:
 
 ```
 $ brew unlink trivy && brew uninstall trivy
 ($ rm -rf /usr/local/Cellar/trivy/64)
-$ brew install knqyf263/trivy/trivy
+$ brew install aquasecurity/trivy/trivy
 ```
 
 ## Others
@@ -1378,13 +1378,13 @@ $ trivy --reset
 
 # Related Projects
 
-- [Remic](https://github.com/knqyf263/remic)
+- [Remic](https://github.com/aquasecurity/remic)
   - Vulnerability Scanner for Detecting Publicly Disclosed Vulnerabilities in Application Dependencies
 
 # Contribute
 
-1. fork a repository: github.com/knqyf263/trivy to github.com/you/repo
-2. get original code: `go get github.com/knqyf263/trivy`
+1. fork a repository: github.com/aquasecurity/trivy to github.com/you/repo
+2. get original code: `go get github.com/aquasecurity/trivy`
 3. work on original code
 4. add remote to your repo: git remote add myfork https://github.com/you/repo.git
 5. push your changes: git push myfork
@@ -1406,4 +1406,4 @@ AGPLv3
 
 # Author
 
-Teppei Fukuda (knqyf263)
+Teppei Fukuda (aquasecurity)

cmd/trivy/main.go

@@ -5,14 +5,14 @@ import (
 	"os"
 	"strings"
 
-	"github.com/knqyf263/trivy/pkg/utils"
+	"github.com/aquasecurity/trivy/pkg/utils"
 
-	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+	"github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
 
 	"github.com/urfave/cli"
 
-	"github.com/knqyf263/trivy/pkg"
-	"github.com/knqyf263/trivy/pkg/log"
+	"github.com/aquasecurity/trivy/pkg"
+	"github.com/aquasecurity/trivy/pkg/log"
 )
 
 var (

go.mod

@@ -1,19 +1,19 @@
-module github.com/knqyf263/trivy
+module github.com/aquasecurity/trivy
 
 go 1.12
 
 require (
 	github.com/BurntSushi/toml v0.3.1
+	github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6
+	github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b
 	github.com/briandowns/spinner v0.0.0-20190319032542-ac46072a5a91
 	github.com/caarlos0/env/v6 v6.0.0
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/etcd-io/bbolt v1.3.2
 	github.com/fatih/color v1.7.0
 	github.com/genuinetools/reg v0.16.0
 	github.com/gliderlabs/ssh v0.1.3 // indirect
-	github.com/knqyf263/fanal v0.0.0-20190706175150-0e953d070757
 	github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
-	github.com/knqyf263/go-dep-parser v0.0.0-20190521150559-1ef8521d17a0
 	github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936
 	github.com/knqyf263/go-version v1.1.1
 	github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348

go.sum

@@ -22,6 +22,10 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6 h1:pkl+kEW4KeLDPLfDtzjXa+zHOcS4YWSQuSTZ2kWO2GE=
+github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6/go.mod h1:enEz4FFetw4XAbkffaYgyCVq1556R9Ry+noqT4rq9BE=
+github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b h1:55Ulc/gvfWm4ylhVaR7MxOwujRjA6et7KhmUbSgUFf4=
+github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b/go.mod h1:BpNTD9vHfrejKsED9rx04ldM1WIbeyXGYxUrqTVwxVQ=
 github.com/aws/aws-sdk-go v1.19.11 h1:tqaTGER6Byw3QvsjGW0p018U2UOqaJPeJuzoaF7jjoQ=
 github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
@@ -124,12 +128,8 @@ github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/knqyf263/berkeleydb v0.0.0-20190501065933-fafe01fb9662/go.mod h1:bu1CcN4tUtoRcI/B/RFHhxMNKFHVq/c3SV+UTyduoXg=
-github.com/knqyf263/fanal v0.0.0-20190706175150-0e953d070757 h1:+GxAt32Vfj1v2KPUvA44zcTRwZrJbUu5BVvtiU7Y1vo=
-github.com/knqyf263/fanal v0.0.0-20190706175150-0e953d070757/go.mod h1:kdmitQCmUcpPs1JZA3/kBuxu0AeN9OnVLl7SRkPUoGU=
 github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d h1:X4cedH4Kn3JPupAwwWuo4AzYp16P0OyLO9d7OnMZc/c=
 github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d/go.mod h1:o8sgWoz3JADecfc/cTYD92/Et1yMqMy0utV1z+VaZao=
-github.com/knqyf263/go-dep-parser v0.0.0-20190521150559-1ef8521d17a0 h1:DOQ2UbTciy48dV9vpZ25BOiShrWIWZwBdMOy7SD1Wow=
-github.com/knqyf263/go-dep-parser v0.0.0-20190521150559-1ef8521d17a0/go.mod h1:gSiqSkOFPstUZu/qZ4wnNJS69PtQQnPl397vxKHJ5mQ=
 github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 h1:HDjRqotkViMNcGMGicb7cgxklx8OwnjtCBmyWEqrRvM=
 github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0=
 github.com/knqyf263/go-rpmdb v0.0.0-20190501070121-10a1c42a10dc/go.mod h1:MrSSvdMpTSymaQWk1yFr9sxFSyQmKMj6jkbvGrchBV8=

goreleaser.yml

@@ -28,8 +28,8 @@ nfpm:
     - rpm
   dependencies:
     - rpm
-  vendor: "knqyf263"
-  homepage: "https://github.com/knqyf263"
+  vendor: "aquasecurity"
+  homepage: "https://github.com/aquasecurity"
   maintainer: "Teppei Fukuda <knqyf263@gmail.com>"
   description: "A Fast Vulnerability Scanner for Containers"
   license: "MIT"
@@ -71,11 +71,11 @@ archive:
 
 brew:
   github:
-    owner: knqyf263
+    owner: aquasecurity
     name: homebrew-trivy
   dependencies:
     - rpm
-  homepage: "https://github.com/knqyf263/trivy"
+  homepage: "https://github.com/aquasecurity/trivy"
   description: ""
   test: |
     system "#{bin}/program --version"

pkg/db/db.go

@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/knqyf263/trivy/pkg/log"
+	"github.com/aquasecurity/trivy/pkg/log"
 
 	"golang.org/x/xerrors"
 
-	"github.com/knqyf263/trivy/pkg/utils"
+	"github.com/aquasecurity/trivy/pkg/utils"
 
 	bolt "github.com/etcd-io/bbolt"
 )

pkg/git/git.go

@@ -5,10 +5,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/knqyf263/trivy/pkg/db"
+	"github.com/aquasecurity/trivy/pkg/db"
 
-	"github.com/knqyf263/trivy/pkg/log"
-	"github.com/knqyf263/trivy/pkg/utils"
+	"github.com/aquasecurity/trivy/pkg/log"
+	"github.com/aquasecurity/trivy/pkg/utils"
 	"golang.org/x/xerrors"
 	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"

pkg/report/writer.go

@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability"
+	"github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
 
 	"github.com/olekukonko/tablewriter"
 )