From 6c7422a9389b4b769a78202085b1e4daf870ba49 Mon Sep 17 00:00:00 2001 From: Will Medlar Date: Wed, 16 May 2018 18:11:39 -0500 Subject: [PATCH] Migrate dependency management to dep --- .travis.yml | 5 +- Dockerfile | 4 +- Gopkg.lock | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Gopkg.toml | 23 ++++++++ README.md | 9 ++-- glide.lock | 72 ------------------------- glide.yaml | 14 ----- 7 files changed, 185 insertions(+), 95 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/.travis.yml b/.travis.yml index 16d33a5..6cbdc42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,8 @@ before_install: - gem install --no-ri --no-rdoc fpm install: - - go get -v github.com/Masterminds/glide - - cd $GOPATH/src/github.com/Masterminds/glide && git checkout tags/v0.12.3 && go install && cd - # use a known good glide version - - glide install + - go get -v github.com/golang/dep/cmd/dep + - dep ensure -v -vendor-only script: - go test ./... diff --git a/Dockerfile b/Dockerfile index 0a0fbad..5bc3290 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.9 AS build WORKDIR /go/src/github.com/aquasecurity/kube-bench/ -ADD glide.lock glide.yaml ./ -RUN go get github.com/Masterminds/glide && glide install +ADD Gopkg.toml Gopkg.lock ./ +RUN go get -v github.com/golang/dep/cmd/dep && dep ensure -v -vendor-only ADD main.go . ADD check/ check/ ADD cmd/ cmd/ diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..f06a5d0 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,153 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/fatih/color" + packages = ["."] + revision = "570b54cabe6b8eb0bc2dfce68d964677d63b5260" + version = "v1.5.0" + +[[projects]] + name = "github.com/fsnotify/fsnotify" + packages = ["."] + revision = "4da3e2cfbabc9f751898f250b49f2439785783a1" + +[[projects]] + branch = "master" + name = "github.com/golang/glog" + packages = ["."] + revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" + +[[projects]] + name = "github.com/hashicorp/hcl" + packages = [ + ".", + "hcl/ast", + "hcl/parser", + "hcl/scanner", + "hcl/strconv", + "hcl/token", + "json/parser", + "json/scanner", + "json/token" + ] + revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" + +[[projects]] + name = "github.com/inconshreveable/mousetrap" + packages = ["."] + revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + version = "v1.0" + +[[projects]] + name = "github.com/jinzhu/gorm" + packages = [ + ".", + "dialects/postgres" + ] + revision = "5174cc5c242a728b435ea2be8a2f7f998e15429b" + version = "v1.0" + +[[projects]] + name = "github.com/jinzhu/inflection" + packages = ["."] + revision = "1c35d901db3da928c72a72d8458480cc9ade058f" + +[[projects]] + name = "github.com/lib/pq" + packages = [ + ".", + "hstore", + "oid" + ] + revision = "83612a56d3dd153a94a629cd64925371c9adad78" + +[[projects]] + name = "github.com/magiconair/properties" + packages = ["."] + revision = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934" + +[[projects]] + name = "github.com/mattn/go-colorable" + packages = ["."] + revision = "5411d3eea5978e6cdc258b30de592b60df6aba96" + +[[projects]] + name = "github.com/mattn/go-isatty" + packages = ["."] + revision = "57fdcb988a5c543893cc61bce354a6e24ab70022" + +[[projects]] + name = "github.com/mitchellh/mapstructure" + packages = ["."] + revision = "06020f85339e21b2478f756a78e295255ffa4d6a" + +[[projects]] + name = "github.com/pelletier/go-toml" + packages = ["."] + revision = "0131db6d737cfbbfb678f8b7d92e55e27ce46224" + +[[projects]] + name = "github.com/spf13/afero" + packages = [ + ".", + "mem" + ] + revision = "57afd63c68602b63ed976de00dd066ccb3c319db" + +[[projects]] + name = "github.com/spf13/cast" + packages = ["."] + revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4" + version = "v1.1.0" + +[[projects]] + name = "github.com/spf13/cobra" + packages = ["."] + revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" + version = "v0.0.1" + +[[projects]] + name = "github.com/spf13/jwalterweatherman" + packages = ["."] + revision = "12bd96e66386c1960ab0f74ced1362f66f552f7b" + +[[projects]] + name = "github.com/spf13/pflag" + packages = ["."] + revision = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea" + +[[projects]] + name = "github.com/spf13/viper" + packages = ["."] + revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" + version = "v1.0.0" + +[[projects]] + name = "golang.org/x/sys" + packages = ["unix"] + revision = "e24f485414aeafb646f6fca458b0bf869c0880a1" + +[[projects]] + name = "golang.org/x/text" + packages = [ + "internal/gen", + "internal/triegen", + "internal/ucd", + "transform", + "unicode/cldr", + "unicode/norm" + ] + revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "c95af922eae69f190717a0b7148960af8c55a072" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "8d9a1b665b338530deef434f168913ba1184f835aa5bfed3a213a14c613bc17e" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..c397575 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,23 @@ +[[constraint]] + name = "github.com/fatih/color" + version = "1.5.0" + +[[constraint]] + branch = "master" + name = "github.com/golang/glog" + +[[constraint]] + name = "github.com/jinzhu/gorm" + version = "1.0.0" + +[[constraint]] + name = "github.com/spf13/cobra" + version = "0.0.1" + +[[constraint]] + name = "github.com/spf13/viper" + version = "1.0.0" + +[prune] + go-tests = true + unused-packages = true diff --git a/README.md b/README.md index 43e0e02..0b64b12 100644 --- a/README.md +++ b/README.md @@ -63,11 +63,12 @@ You can then run `./kube-bench `. If Go is installed on the target machines, you can simply clone this repository and run as follows (assuming your [$GOPATH is set](https://github.com/golang/go/wiki/GOPATH)): -```go get github.com/aquasecurity/kube-bench -go get github.com/Masterminds/glide +```shell +go get github.com/aquasecurity/kube-bench +go get github.com/golang/dep/cmd/dep cd $GOPATH/src/github.com/aquasecurity/kube-bench -$GOPATH/bin/glide install -go build -o kube-bench . +$GOPATH/bin/dep ensure -vendor-only +go build -o kube-bench . # See all supported options ./kube-bench --help diff --git a/glide.lock b/glide.lock deleted file mode 100644 index f4d0816..0000000 --- a/glide.lock +++ /dev/null @@ -1,72 +0,0 @@ -hash: f3cf12cf95d66d315c4aef2f3d0940770bd26267f84703e53c4928b786a91c14 -updated: 2018-01-09T12:49:41.3014329-08:00 -imports: -- name: github.com/fatih/color - version: 570b54cabe6b8eb0bc2dfce68d964677d63b5260 -- name: github.com/fsnotify/fsnotify - version: 4da3e2cfbabc9f751898f250b49f2439785783a1 -- name: github.com/golang/glog - version: 23def4e6c14b4da8ac2ed8007337bc5eb5007998 -- name: github.com/hashicorp/hcl - version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8 - subpackages: - - hcl/ast - - hcl/parser - - hcl/scanner - - hcl/strconv - - hcl/token - - json/parser - - json/scanner - - json/token -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/jinzhu/gorm - version: 5174cc5c242a728b435ea2be8a2f7f998e15429b - subpackages: - - dialects/postgres -- name: github.com/jinzhu/inflection - version: 1c35d901db3da928c72a72d8458480cc9ade058f -- name: github.com/lib/pq - version: 83612a56d3dd153a94a629cd64925371c9adad78 - subpackages: - - hstore - - oid -- name: github.com/magiconair/properties - version: 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934 -- name: github.com/mattn/go-colorable - version: 5411d3eea5978e6cdc258b30de592b60df6aba96 - repo: https://github.com/mattn/go-colorable -- name: github.com/mattn/go-isatty - version: 57fdcb988a5c543893cc61bce354a6e24ab70022 - repo: https://github.com/mattn/go-isatty -- name: github.com/mitchellh/mapstructure - version: 06020f85339e21b2478f756a78e295255ffa4d6a -- name: github.com/pelletier/go-toml - version: 0131db6d737cfbbfb678f8b7d92e55e27ce46224 -- name: github.com/spf13/afero - version: 57afd63c68602b63ed976de00dd066ccb3c319db - subpackages: - - mem -- name: github.com/spf13/cast - version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 -- name: github.com/spf13/cobra - version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b -- name: github.com/spf13/jwalterweatherman - version: 12bd96e66386c1960ab0f74ced1362f66f552f7b -- name: github.com/spf13/pflag - version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea -- name: github.com/spf13/viper - version: 25b30aa063fc18e48662b86996252eabdcf2f0c7 -- name: golang.org/x/sys - version: e24f485414aeafb646f6fca458b0bf869c0880a1 - repo: https://go.googlesource.com/sys - subpackages: - - unix -- name: golang.org/x/text - version: e19ae1496984b1c655b8044a65c0300a3c878dd3 - subpackages: - - transform - - unicode/norm -- name: gopkg.in/yaml.v2 - version: c95af922eae69f190717a0b7148960af8c55a072 -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 31e3ef4..0000000 --- a/glide.yaml +++ /dev/null @@ -1,14 +0,0 @@ -package: github.com/aquasecurity/kube-bench -import: -- package: github.com/fatih/color - version: ^1.5.0 -- package: github.com/golang/glog -- package: github.com/jinzhu/gorm - version: ^1.0.0 - subpackages: - - dialects/postgres -- package: github.com/spf13/cobra - version: ^0.0.1 -- package: github.com/spf13/viper - version: ^1.0.0 -- package: gopkg.in/yaml.v2