diff --git a/.travis.yml b/.travis.yml index cbc6824e26..8c71bd97ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - go get golang.org/x/tools/cmd/cover script: - env GO111MODULE=on go test -v -covermode=count -coverprofile=coverage.out ./... - - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN; fi + # - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN; fi addons: apt: diff --git a/README.md b/README.md index bc69916bd0..947d8e5de9 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # fanal Static Analysis Library for Containers -[![GoDoc](https://godoc.org/github.com/knqyf263/fanal?status.svg)](https://godoc.org/github.com/knqyf263/fanal) -[![Build Status](https://travis-ci.org/knqyf263/fanal.svg?branch=master)](https://travis-ci.org/knqyf263/fanal) -[![Coverage Status](https://coveralls.io/repos/github/knqyf263/fanal/badge.svg?branch=master)](https://coveralls.io/github/knqyf263/fanal?branch=master) -[![Go Report Card](https://goreportcard.com/badge/github.com/knqyf263/fanal)](https://goreportcard.com/report/github.com/knqyf263/fanal) -[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/knqyf263/fanal/blob/master/LICENSE) +[![GoDoc](https://godoc.org/github.com/aquasecurity/fanal?status.svg)](https://godoc.org/github.com/aquasecurity/fanal) +[![Build Status](https://travis-ci.org/aquasecurity/fanal.svg?branch=master)](https://travis-ci.org/aquasecurity/fanal) + +[![Go Report Card](https://goreportcard.com/badge/github.com/aquasecurity/fanal)](https://goreportcard.com/report/github.com/aquasecurity/fanal) +[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/aquasecurity/fanal/blob/master/LICENSE) ## Feature - Detect OS @@ -28,25 +28,25 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/cache" + "github.com/aquasecurity/fanal/cache" - "github.com/knqyf263/fanal/analyzer" - _ "github.com/knqyf263/fanal/analyzer/library/bundler" - _ "github.com/knqyf263/fanal/analyzer/library/composer" - _ "github.com/knqyf263/fanal/analyzer/library/npm" - _ "github.com/knqyf263/fanal/analyzer/library/pipenv" - _ "github.com/knqyf263/fanal/analyzer/library/poetry" - _ "github.com/knqyf263/fanal/analyzer/library/yarn" - _ "github.com/knqyf263/fanal/analyzer/library/cargo" - _ "github.com/knqyf263/fanal/analyzer/os/alpine" - _ "github.com/knqyf263/fanal/analyzer/os/amazonlinux" - _ "github.com/knqyf263/fanal/analyzer/os/debianbase" - _ "github.com/knqyf263/fanal/analyzer/os/opensuse" - _ "github.com/knqyf263/fanal/analyzer/os/redhatbase" - _ "github.com/knqyf263/fanal/analyzer/pkg/apk" - _ "github.com/knqyf263/fanal/analyzer/pkg/dpkg" - _ "github.com/knqyf263/fanal/analyzer/pkg/rpm" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + _ "github.com/aquasecurity/fanal/analyzer/library/bundler" + _ "github.com/aquasecurity/fanal/analyzer/library/composer" + _ "github.com/aquasecurity/fanal/analyzer/library/npm" + _ "github.com/aquasecurity/fanal/analyzer/library/pipenv" + _ "github.com/aquasecurity/fanal/analyzer/library/poetry" + _ "github.com/aquasecurity/fanal/analyzer/library/yarn" + _ "github.com/aquasecurity/fanal/analyzer/library/cargo" + _ "github.com/aquasecurity/fanal/analyzer/os/alpine" + _ "github.com/aquasecurity/fanal/analyzer/os/amazonlinux" + _ "github.com/aquasecurity/fanal/analyzer/os/debianbase" + _ "github.com/aquasecurity/fanal/analyzer/os/opensuse" + _ "github.com/aquasecurity/fanal/analyzer/os/redhatbase" + _ "github.com/aquasecurity/fanal/analyzer/pkg/apk" + _ "github.com/aquasecurity/fanal/analyzer/pkg/dpkg" + _ "github.com/aquasecurity/fanal/analyzer/pkg/rpm" + "github.com/aquasecurity/fanal/extractor" "golang.org/x/crypto/ssh/terminal" ) diff --git a/analyzer/analyzer.go b/analyzer/analyzer.go index 9087057510..eaa818d07d 100644 --- a/analyzer/analyzer.go +++ b/analyzer/analyzer.go @@ -5,13 +5,13 @@ import ( "io" "time" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/types" "golang.org/x/xerrors" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/extractor/docker" - godeptypes "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/extractor/docker" + godeptypes "github.com/aquasecurity/go-dep-parser/pkg/types" ) var ( diff --git a/analyzer/command/apk/apk.go b/analyzer/command/apk/apk.go index 7cdbaf450b..1dda397e90 100644 --- a/analyzer/command/apk/apk.go +++ b/analyzer/command/apk/apk.go @@ -11,13 +11,13 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/extractor/docker" + "github.com/aquasecurity/fanal/extractor/docker" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer/os" "github.com/pkg/errors" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/command/apk/apk_test.go b/analyzer/command/apk/apk_test.go index b1c148531e..aa08479b4e 100644 --- a/analyzer/command/apk/apk_test.go +++ b/analyzer/command/apk/apk_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/extractor" "github.com/kylelemons/godebug/pretty" - "github.com/knqyf263/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer" ) func TestAnalyze(t *testing.T) { diff --git a/analyzer/library/bundler/bundler.go b/analyzer/library/bundler/bundler.go index 969596de57..c4b5f4acdd 100644 --- a/analyzer/library/bundler/bundler.go +++ b/analyzer/library/bundler/bundler.go @@ -4,11 +4,11 @@ import ( "bytes" "path/filepath" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/bundler" - "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/bundler" + "github.com/aquasecurity/go-dep-parser/pkg/types" "golang.org/x/xerrors" ) diff --git a/analyzer/library/cargo/cargo.go b/analyzer/library/cargo/cargo.go index c5078832ff..357d36b54b 100644 --- a/analyzer/library/cargo/cargo.go +++ b/analyzer/library/cargo/cargo.go @@ -4,11 +4,11 @@ import ( "bytes" "path/filepath" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/cargo" - "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/cargo" + "github.com/aquasecurity/go-dep-parser/pkg/types" "golang.org/x/xerrors" ) diff --git a/analyzer/library/composer/composer.go b/analyzer/library/composer/composer.go index 25d3a50547..2a85282e18 100644 --- a/analyzer/library/composer/composer.go +++ b/analyzer/library/composer/composer.go @@ -4,11 +4,11 @@ import ( "bytes" "path/filepath" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/composer" - "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/composer" + "github.com/aquasecurity/go-dep-parser/pkg/types" "golang.org/x/xerrors" ) diff --git a/analyzer/library/npm/npm.go b/analyzer/library/npm/npm.go index 3ba53719c6..ac9a3f3aee 100644 --- a/analyzer/library/npm/npm.go +++ b/analyzer/library/npm/npm.go @@ -5,11 +5,11 @@ import ( "path/filepath" "strings" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/npm" - "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/npm" + "github.com/aquasecurity/go-dep-parser/pkg/types" "golang.org/x/xerrors" ) diff --git a/analyzer/library/pipenv/pipenv.go b/analyzer/library/pipenv/pipenv.go index 97f377d612..f49285f54f 100644 --- a/analyzer/library/pipenv/pipenv.go +++ b/analyzer/library/pipenv/pipenv.go @@ -4,11 +4,11 @@ import ( "bytes" "path/filepath" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/pipenv" - "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/pipenv" + "github.com/aquasecurity/go-dep-parser/pkg/types" "golang.org/x/xerrors" ) diff --git a/analyzer/library/poetry/poetry.go b/analyzer/library/poetry/poetry.go index cb23afbdd4..602e205c84 100644 --- a/analyzer/library/poetry/poetry.go +++ b/analyzer/library/poetry/poetry.go @@ -4,11 +4,11 @@ import ( "bytes" "path/filepath" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/poetry" - "github.com/knqyf263/go-dep-parser/pkg/types" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/poetry" + "github.com/aquasecurity/go-dep-parser/pkg/types" "golang.org/x/xerrors" ) diff --git a/analyzer/library/yarn/yarn.go b/analyzer/library/yarn/yarn.go index 83f60e1770..f9b2e30a08 100644 --- a/analyzer/library/yarn/yarn.go +++ b/analyzer/library/yarn/yarn.go @@ -5,11 +5,11 @@ import ( "path/filepath" "strings" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/utils" - "github.com/knqyf263/go-dep-parser/pkg/types" - "github.com/knqyf263/go-dep-parser/pkg/yarn" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/utils" + "github.com/aquasecurity/go-dep-parser/pkg/types" + "github.com/aquasecurity/go-dep-parser/pkg/yarn" "golang.org/x/xerrors" ) diff --git a/analyzer/os/alpine/alpine.go b/analyzer/os/alpine/alpine.go index 6e94d87105..4a15e8a6ac 100644 --- a/analyzer/os/alpine/alpine.go +++ b/analyzer/os/alpine/alpine.go @@ -6,10 +6,10 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer/os" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/os/amazonlinux/amazonlinux.go b/analyzer/os/amazonlinux/amazonlinux.go index 90419febba..1abff1b5e3 100644 --- a/analyzer/os/amazonlinux/amazonlinux.go +++ b/analyzer/os/amazonlinux/amazonlinux.go @@ -8,10 +8,10 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer/os" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/os/common.go b/analyzer/os/common.go index 579c5bf90c..8273246078 100644 --- a/analyzer/os/common.go +++ b/analyzer/os/common.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/extractor" "golang.org/x/xerrors" ) diff --git a/analyzer/os/debianbase/debianbase.go b/analyzer/os/debianbase/debianbase.go index 1de7d6bd7a..8f865d75a7 100644 --- a/analyzer/os/debianbase/debianbase.go +++ b/analyzer/os/debianbase/debianbase.go @@ -7,10 +7,10 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer/os" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/os/debianbase/debianbase_test.go b/analyzer/os/debianbase/debianbase_test.go index c4592b357e..dee2d63b95 100644 --- a/analyzer/os/debianbase/debianbase_test.go +++ b/analyzer/os/debianbase/debianbase_test.go @@ -6,8 +6,8 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer/os" ) func TestAnalyze(t *testing.T) { diff --git a/analyzer/os/opensuse/opensuse.go b/analyzer/os/opensuse/opensuse.go index 0e2df070f1..fbecc5f460 100644 --- a/analyzer/os/opensuse/opensuse.go +++ b/analyzer/os/opensuse/opensuse.go @@ -7,10 +7,10 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer/os" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/os/redhatbase/redhatbase.go b/analyzer/os/redhatbase/redhatbase.go index 20eda7d96b..dd85a31d1c 100644 --- a/analyzer/os/redhatbase/redhatbase.go +++ b/analyzer/os/redhatbase/redhatbase.go @@ -9,10 +9,10 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer/os" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/os/redhatbase/redhatbase_test.go b/analyzer/os/redhatbase/redhatbase_test.go index c905910b34..f327149156 100644 --- a/analyzer/os/redhatbase/redhatbase_test.go +++ b/analyzer/os/redhatbase/redhatbase_test.go @@ -6,8 +6,8 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/analyzer/os" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer/os" ) func TestAnalyze(t *testing.T) { diff --git a/analyzer/pkg/apk/apk.go b/analyzer/pkg/apk/apk.go index 7231a07503..a048553c2f 100644 --- a/analyzer/pkg/apk/apk.go +++ b/analyzer/pkg/apk/apk.go @@ -5,8 +5,8 @@ import ( "bytes" "log" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" debVersion "github.com/knqyf263/go-deb-version" ) diff --git a/analyzer/pkg/apk/apk_test.go b/analyzer/pkg/apk/apk_test.go index e7cb40c683..85f7727db4 100644 --- a/analyzer/pkg/apk/apk_test.go +++ b/analyzer/pkg/apk/apk_test.go @@ -8,7 +8,7 @@ import ( "github.com/kylelemons/godebug/pretty" - "github.com/knqyf263/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer" ) func TestParseApkInfo(t *testing.T) { diff --git a/analyzer/pkg/dpkg/dpkg.go b/analyzer/pkg/dpkg/dpkg.go index 36d438cec1..5f4cee0557 100644 --- a/analyzer/pkg/dpkg/dpkg.go +++ b/analyzer/pkg/dpkg/dpkg.go @@ -9,8 +9,8 @@ import ( mapset "github.com/deckarep/golang-set" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" debVersion "github.com/knqyf263/go-deb-version" ) diff --git a/analyzer/pkg/dpkg/dpkg_test.go b/analyzer/pkg/dpkg/dpkg_test.go index 2d9dffa67a..ee62a747a1 100644 --- a/analyzer/pkg/dpkg/dpkg_test.go +++ b/analyzer/pkg/dpkg/dpkg_test.go @@ -9,7 +9,7 @@ import ( "github.com/kylelemons/godebug/pretty" - "github.com/knqyf263/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer" ) func TestParseApkInfo(t *testing.T) { diff --git a/analyzer/pkg/rpm/rpm.go b/analyzer/pkg/rpm/rpm.go index bc4f49285a..f3801c2bdc 100644 --- a/analyzer/pkg/rpm/rpm.go +++ b/analyzer/pkg/rpm/rpm.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" rpmdb "github.com/knqyf263/go-rpmdb/pkg" ) diff --git a/analyzer/pkg/rpm/rpm_test.go b/analyzer/pkg/rpm/rpm_test.go index d8c3d0dfcf..cdfe4258e7 100644 --- a/analyzer/pkg/rpm/rpm_test.go +++ b/analyzer/pkg/rpm/rpm_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/knqyf263/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer" ) func TestParseRpmInfo(t *testing.T) { diff --git a/analyzer/pkg/rpmcmd/rpm.go b/analyzer/pkg/rpmcmd/rpm.go index 29dfc27f8c..554f9169db 100644 --- a/analyzer/pkg/rpmcmd/rpm.go +++ b/analyzer/pkg/rpmcmd/rpm.go @@ -11,8 +11,8 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/analyzer" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + "github.com/aquasecurity/fanal/extractor" ) func init() { diff --git a/analyzer/pkg/rpmcmd/rpm_test.go b/analyzer/pkg/rpmcmd/rpm_test.go index e38e703851..a7bc0e8e77 100644 --- a/analyzer/pkg/rpmcmd/rpm_test.go +++ b/analyzer/pkg/rpmcmd/rpm_test.go @@ -7,7 +7,7 @@ import ( "github.com/kylelemons/godebug/pretty" - "github.com/knqyf263/fanal/analyzer" + "github.com/aquasecurity/fanal/analyzer" ) func TestParseRpmInfo(t *testing.T) { diff --git a/cache/cache.go b/cache/cache.go index 35e4fd955b..f036365235 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/knqyf263/fanal/utils" + "github.com/aquasecurity/fanal/utils" "golang.org/x/xerrors" ) diff --git a/cmd/fanal/main.go b/cmd/fanal/main.go index 1d6fae8fa4..ea57130f94 100644 --- a/cmd/fanal/main.go +++ b/cmd/fanal/main.go @@ -9,26 +9,26 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/cache" + "github.com/aquasecurity/fanal/cache" - "github.com/knqyf263/fanal/analyzer" - _ "github.com/knqyf263/fanal/analyzer/command/apk" - _ "github.com/knqyf263/fanal/analyzer/library/bundler" - _ "github.com/knqyf263/fanal/analyzer/library/cargo" - _ "github.com/knqyf263/fanal/analyzer/library/composer" - _ "github.com/knqyf263/fanal/analyzer/library/npm" - _ "github.com/knqyf263/fanal/analyzer/library/pipenv" - _ "github.com/knqyf263/fanal/analyzer/library/poetry" - _ "github.com/knqyf263/fanal/analyzer/library/yarn" - _ "github.com/knqyf263/fanal/analyzer/os/alpine" - _ "github.com/knqyf263/fanal/analyzer/os/amazonlinux" - _ "github.com/knqyf263/fanal/analyzer/os/debianbase" - _ "github.com/knqyf263/fanal/analyzer/os/opensuse" - _ "github.com/knqyf263/fanal/analyzer/os/redhatbase" - _ "github.com/knqyf263/fanal/analyzer/pkg/apk" - _ "github.com/knqyf263/fanal/analyzer/pkg/dpkg" - _ "github.com/knqyf263/fanal/analyzer/pkg/rpm" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/analyzer" + _ "github.com/aquasecurity/fanal/analyzer/command/apk" + _ "github.com/aquasecurity/fanal/analyzer/library/bundler" + _ "github.com/aquasecurity/fanal/analyzer/library/cargo" + _ "github.com/aquasecurity/fanal/analyzer/library/composer" + _ "github.com/aquasecurity/fanal/analyzer/library/npm" + _ "github.com/aquasecurity/fanal/analyzer/library/pipenv" + _ "github.com/aquasecurity/fanal/analyzer/library/poetry" + _ "github.com/aquasecurity/fanal/analyzer/library/yarn" + _ "github.com/aquasecurity/fanal/analyzer/os/alpine" + _ "github.com/aquasecurity/fanal/analyzer/os/amazonlinux" + _ "github.com/aquasecurity/fanal/analyzer/os/debianbase" + _ "github.com/aquasecurity/fanal/analyzer/os/opensuse" + _ "github.com/aquasecurity/fanal/analyzer/os/redhatbase" + _ "github.com/aquasecurity/fanal/analyzer/pkg/apk" + _ "github.com/aquasecurity/fanal/analyzer/pkg/dpkg" + _ "github.com/aquasecurity/fanal/analyzer/pkg/rpm" + "github.com/aquasecurity/fanal/extractor" "golang.org/x/crypto/ssh/terminal" ) diff --git a/extractor/docker/docker.go b/extractor/docker/docker.go index 7b8763f075..518a229f02 100644 --- a/extractor/docker/docker.go +++ b/extractor/docker/docker.go @@ -14,15 +14,15 @@ import ( digest "github.com/opencontainers/go-digest" - "github.com/knqyf263/fanal/extractor" - "github.com/knqyf263/fanal/extractor/docker/token/ecr" - "github.com/knqyf263/fanal/extractor/docker/token/gcr" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/extractor" + "github.com/aquasecurity/fanal/extractor/docker/token/ecr" + "github.com/aquasecurity/fanal/extractor/docker/token/gcr" + "github.com/aquasecurity/fanal/types" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/client" "github.com/genuinetools/reg/registry" - "github.com/knqyf263/fanal/cache" + "github.com/aquasecurity/fanal/cache" "github.com/knqyf263/nested" "golang.org/x/xerrors" ) diff --git a/extractor/docker/docker_test.go b/extractor/docker/docker_test.go index 17bd37557e..b80f1069e8 100644 --- a/extractor/docker/docker_test.go +++ b/extractor/docker/docker_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/knqyf263/fanal/extractor" + "github.com/aquasecurity/fanal/extractor" ) func TestExtractFromFile(t *testing.T) { diff --git a/extractor/docker/token.go b/extractor/docker/token.go index c2a86f422d..e49542b982 100644 --- a/extractor/docker/token.go +++ b/extractor/docker/token.go @@ -5,7 +5,7 @@ import ( dockertypes "github.com/docker/docker/api/types" "github.com/genuinetools/reg/repoutils" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/types" ) var ( diff --git a/extractor/docker/token/ecr/ecr.go b/extractor/docker/token/ecr/ecr.go index 3f4e6d3924..b2b3ab8886 100644 --- a/extractor/docker/token/ecr/ecr.go +++ b/extractor/docker/token/ecr/ecr.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "strings" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/types" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" diff --git a/extractor/docker/token/ecr/ecr_test.go b/extractor/docker/token/ecr/ecr_test.go index 723609ace8..edab380220 100644 --- a/extractor/docker/token/ecr/ecr_test.go +++ b/extractor/docker/token/ecr/ecr_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/types" "golang.org/x/xerrors" "github.com/aws/aws-sdk-go/aws/request" diff --git a/extractor/docker/token/gcr/gcr.go b/extractor/docker/token/gcr/gcr.go index 460e8b2f58..83dd59bff3 100644 --- a/extractor/docker/token/gcr/gcr.go +++ b/extractor/docker/token/gcr/gcr.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/types" "golang.org/x/xerrors" diff --git a/extractor/docker/token/gcr/gcr_test.go b/extractor/docker/token/gcr/gcr_test.go index 471c0d77f3..7bd550cdb8 100644 --- a/extractor/docker/token/gcr/gcr_test.go +++ b/extractor/docker/token/gcr/gcr_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/xerrors" - "github.com/knqyf263/fanal/types" + "github.com/aquasecurity/fanal/types" ) func TestCheckOptions(t *testing.T) { diff --git a/go.mod b/go.mod index 4eb892f3e8..328544a039 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,11 @@ +module github.com/aquasecurity/fanal + go 1.12 require ( cloud.google.com/go v0.37.4 // indirect github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.0 + github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b github.com/aws/aws-sdk-go v1.19.11 github.com/deckarep/golang-set v1.7.1 github.com/docker/distribution v2.7.1+incompatible @@ -10,7 +13,6 @@ require ( github.com/docker/go-connections v0.4.0 // indirect github.com/genuinetools/reg v0.16.0 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-rpmdb v0.0.0-20190501070121-10a1c42a10dc github.com/knqyf263/nested v0.0.1 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 @@ -21,5 +23,3 @@ require ( ) replace github.com/genuinetools/reg => github.com/tomoyamachi/reg v0.16.1-0.20190706172545-2a2250fd7c00 - -module github.com/knqyf263/fanal diff --git a/go.sum b/go.sum index b05160bba1..56204e54fb 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +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= @@ -103,8 +105,6 @@ github.com/knqyf263/berkeleydb v0.0.0-20190501065933-fafe01fb9662 h1:UGS0RbPHwXJ github.com/knqyf263/berkeleydb v0.0.0-20190501065933-fafe01fb9662/go.mod h1:bu1CcN4tUtoRcI/B/RFHhxMNKFHVq/c3SV+UTyduoXg= 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-rpmdb v0.0.0-20190501070121-10a1c42a10dc h1:pumO9pqmRAjvic6oove22RGh9wDZQnj96XQjJSbSEPs= github.com/knqyf263/go-rpmdb v0.0.0-20190501070121-10a1c42a10dc/go.mod h1:MrSSvdMpTSymaQWk1yFr9sxFSyQmKMj6jkbvGrchBV8= github.com/knqyf263/nested v0.0.1 h1:Sv26CegUMhjt19zqbBKntjwESdxe5hxVPSk0+AKjdUc=