From fc8479fd1a3ca88dded817e135c8947ee6a1f29e Mon Sep 17 00:00:00 2001 From: Dylan Arbour Date: Wed, 6 Dec 2017 21:17:30 -0500 Subject: [PATCH] Use dep --- Gopkg.lock | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Gopkg.toml | 106 ++++++++++++++++++++++++++ Makefile | 12 +-- glide.lock | 152 ------------------------------------- glide.yaml | 49 ------------ 5 files changed, 329 insertions(+), 207 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 00000000..a20b39c1 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,217 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/asaskevich/govalidator" + packages = ["."] + revision = "7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877" + version = "v5" + +[[projects]] + name = "github.com/awnumar/memguard" + packages = [".","memcall"] + revision = "b482b0c828e2eeecbfebb05ca965c8d571afaeff" + version = "v0.13.2" + +[[projects]] + name = "github.com/aws/aws-sdk-go" + packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restxml","private/protocol/xml/xmlutil","service/s3","service/sts"] + revision = "0c22c3d22be15d3be3d22b8dedabbf5dd4304730" + version = "v1.12.34" + +[[projects]] + name = "github.com/blang/semver" + packages = ["."] + revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f" + version = "v3.5.1" + +[[projects]] + name = "github.com/boltdb/bolt" + packages = ["."] + revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8" + version = "v1.3.1" + +[[projects]] + branch = "master" + name = "github.com/chzyer/readline" + packages = ["."] + revision = "41eea22f717c616615e1e59aa06cf831f9901f35" + +[[projects]] + branch = "master" + name = "github.com/dchest/blake2b" + packages = ["."] + revision = "06006a921c7d13e3fdf63c401cb0e4529a26e6e4" + +[[projects]] + name = "github.com/donovanhide/eventsource" + packages = ["."] + revision = "fd1de70867126402be23c306e1ce32828455d85b" + +[[projects]] + branch = "master" + name = "github.com/facebookgo/clock" + packages = ["."] + revision = "600d898af40aa09a7a93ecb9265d87b0504b6f03" + +[[projects]] + branch = "master" + name = "github.com/facebookgo/httpdown" + packages = ["."] + revision = "a3b1354551a26449fbe05f5d855937f6e7acbd71" + +[[projects]] + branch = "master" + name = "github.com/facebookgo/stats" + packages = ["."] + revision = "1b76add642e42c6ffba7211ad7b3939ce654526e" + +[[projects]] + name = "github.com/fullsailor/pkcs7" + packages = ["."] + revision = "eb67e7e564b9eae64dc7d95fae0784d6086a5fc4" + +[[projects]] + name = "github.com/go-ini/ini" + packages = ["."] + revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a" + version = "v1.32.0" + +[[projects]] + name = "github.com/go-zoo/bone" + packages = ["."] + revision = "fd0aebc74e908868b09ac140fb5a53cb363884c1" + version = "1.2" + +[[projects]] + name = "github.com/golang/protobuf" + packages = ["proto"] + revision = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef" + +[[projects]] + name = "github.com/google/go-github" + packages = ["github"] + revision = "466070b0580728e63bd1a415e0019639e55d7148" + +[[projects]] + name = "github.com/google/go-querystring" + packages = ["query"] + revision = "9235644dd9e52eeae6fa48efd539fdc351a0af53" + +[[projects]] + branch = "master" + name = "github.com/google/shlex" + packages = ["."] + revision = "6f45313302b9c56850fc17f99e40caebce98c716" + +[[projects]] + name = "github.com/jmespath/go-jmespath" + packages = ["."] + revision = "0b12d6b5" + +[[projects]] + name = "github.com/kardianos/osext" + packages = ["."] + revision = "c2c54e542fb797ad986b31721e1baedf214ca413" + +[[projects]] + branch = "master" + name = "github.com/keybase/go-triplesec" + packages = [".","sha3"] + revision = "b360b8252869a5ac88df3ed7897bc3b6d1e55dd2" + +[[projects]] + name = "github.com/manifoldco/ansiwrap" + packages = ["."] + revision = "c0a8ca03bf663de63b9a3e4283986a5824c1850b" + version = "v1.0.0" + +[[projects]] + name = "github.com/manifoldco/go-base32" + packages = ["."] + revision = "b6687e64fc5e75d8bb58badb858d79c46b0eee96" + version = "v1.0.0" + +[[projects]] + name = "github.com/manifoldco/go-base64" + packages = ["."] + revision = "bb5e620cf51d2bbe78e624a2c27117655ce73acc" + version = "v1.0.0" + +[[projects]] + name = "github.com/natefinch/lumberjack" + packages = ["."] + revision = "a96e63847dc3c67d17befa69c303767e2f84e54f" + version = "v2.1" + +[[projects]] + branch = "v2" + name = "github.com/natefinch/npipe" + packages = ["."] + revision = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6" + +[[projects]] + name = "github.com/nightlyone/lockfile" + packages = ["."] + revision = "1d49c987357a327b5b03aa84cbddd582c328615d" + +[[projects]] + name = "github.com/onsi/gomega" + packages = [".","format","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"] + revision = "334b8f472b3af5d541c5642701c1e29e2126f486" + version = "v1.1.0" + +[[projects]] + name = "github.com/satori/go.uuid" + packages = ["."] + revision = "879c5887cd475cd7864858769793b2ceb0d44feb" + version = "v1.1.0" + +[[projects]] + name = "github.com/urfave/cli" + packages = ["."] + revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1" + version = "v1.20.0" + +[[projects]] + name = "golang.org/x/crypto" + packages = ["curve25519","ed25519","ed25519/internal/edwards25519","nacl/box","nacl/secretbox","pbkdf2","poly1305","salsa20","salsa20/salsa","scrypt","twofish"] + revision = "9ef620b9ca2f82b55030ffd4f41327fa9e77a92c" + +[[projects]] + name = "golang.org/x/net" + packages = ["context"] + revision = "d1e1b351919c6738fdeb9893d5c998b161464f0c" + +[[projects]] + name = "golang.org/x/oauth2" + packages = [".","internal"] + revision = "7fdf09982454086d5570c7db3e11f360194830ca" + +[[projects]] + name = "golang.org/x/sys" + packages = ["windows"] + revision = "f3918c30c5c2cb527c0b071a27c35120a6c0719a" + +[[projects]] + name = "google.golang.org/appengine" + packages = ["internal","internal/base","internal/datastore","internal/log","internal/remote_api","internal/urlfetch","urlfetch"] + revision = "170382fa85b10b94728989dfcf6cc818b335c952" + +[[projects]] + name = "gopkg.in/oleiade/reflections.v1" + packages = ["."] + revision = "2b6ec3da648e3e834dc41bad8d9ed7f2dc6a9496" + version = "v1.0.0" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "8d2365c6ce9414678da4122211aef33b074b930757a2dc3396c986725d9dce88" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 00000000..7ba1d062 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,106 @@ +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + +ignored = ["golang.org/x/sys/unix"] + +[[constraint]] + name = "github.com/asaskevich/govalidator" + version = "5.0.0" + +[[constraint]] + name = "github.com/awnumar/memguard" + version = "0.13.2" + +[[constraint]] + name = "github.com/aws/aws-sdk-go" + version = "1.5.13" + +[[constraint]] + name = "github.com/blang/semver" + version = "3.3.0" + +[[constraint]] + name = "github.com/boltdb/bolt" + version = "1.3.0" + +[[constraint]] + branch = "master" + name = "github.com/chzyer/readline" + +[[constraint]] + branch = "master" + name = "github.com/dchest/blake2b" + +[[constraint]] + branch = "master" + name = "github.com/facebookgo/httpdown" + +[[constraint]] + name = "github.com/go-ini/ini" + version = "1.21.1" + +[[constraint]] + name = "github.com/go-zoo/bone" + version = "1.2.0" + +[[constraint]] + branch = "master" + name = "github.com/google/shlex" + +[[constraint]] + branch = "master" + name = "github.com/keybase/go-triplesec" + +[[constraint]] + name = "github.com/manifoldco/ansiwrap" + version = "1.0.0" + +[[constraint]] + name = "github.com/manifoldco/go-base32" + version = "1.0.0" + +[[constraint]] + name = "github.com/manifoldco/go-base64" + version = "1.0.0" + +[[constraint]] + name = "github.com/natefinch/lumberjack" + version = "2.0.0" + +[[constraint]] + branch = "v2" + name = "github.com/natefinch/npipe" + +[[constraint]] + name = "github.com/onsi/gomega" + version = "1.1.0" + +[[constraint]] + name = "github.com/satori/go.uuid" + version = "1.1.0" + +[[constraint]] + name = "github.com/urfave/cli" + version = "1.19.1" + +[[constraint]] + name = "gopkg.in/oleiade/reflections.v1" + version = "1.0.0" diff --git a/Makefile b/Makefile index c47dd471..0dbf414a 100644 --- a/Makefile +++ b/Makefile @@ -33,13 +33,13 @@ ci: binary $(LINTERS) cmdlint test BOOTSTRAP=\ github.com/jteeuwen/go-bindata/... \ - github.com/alecthomas/gometalinter + github.com/alecthomas/gometalinter \ + github.com/golang/dep $(BOOTSTRAP): go get -u $@ bootstrap: $(BOOTSTRAP) gometalinter --install - glide -v || curl http://glide.sh/get | sh .PHONY: bootstrap $(BOOTSTRAP) @@ -77,8 +77,8 @@ data/zz_generated_bindata.go: data/ca_bundle.pem data/public_key.json data/aws_i primitive/zz_generated_primitive.go envelope/zz_generated_envelope.go: $(TOOLS)/primitive-boilerplate primitive/primitive.go $^ -vendor: glide.lock - glide install +vendor: Gopkg.lock + dep ensure PRIMITIVE_BOILERPLATE=tools/primitive-boilerplate $(TOOLS)/primitive-boilerplate: $(wildcard $(PRIMITIVE_BOILERPLATE)/*.go) $(wildcard $(PRIMITIVE_BOILERPLATE)/*.tmpl) @@ -103,13 +103,13 @@ clean: ################################################# test: generated vendor - @CGO_ENABLED=0 go test -run=. -bench=. -short $$(glide nv) + @CGO_ENABLED=0 go test -run=. -bench=. -short $$(go list ./... | grep -v ./vendor) METALINT=gometalinter --tests --disable-all --vendor --deadline=5m -s data \ . --enable $(LINTERS): - gometalinter --tests --disable-all --vendor --deadline=5m -s data $$(glide nv) --enable $@ + gometalinter --tests --disable-all --vendor --deadline=5m -s data $$(go list ./... | grep -v ./vendor) --enable $@ $(TOOLS)/cmdlint: $(wildcard tools/cmdlint/*.go) $(wildcard cmd/*.go) $(GO_BUILD) -o $@ ./tools/cmdlint diff --git a/glide.lock b/glide.lock deleted file mode 100644 index c896a8c3..00000000 --- a/glide.lock +++ /dev/null @@ -1,152 +0,0 @@ -hash: 6734f567020a1f2b8130dfa57da895bd13fb2eaa103c51a47389ee6185a82bd4 -updated: 2017-11-28T17:02:31.032788-04:00 -imports: -- name: github.com/asaskevich/govalidator - version: 7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877 -- name: github.com/awnumar/memguard - version: b482b0c828e2eeecbfebb05ca965c8d571afaeff - subpackages: - - memcall -- name: github.com/aws/aws-sdk-go - version: 0c22c3d22be15d3be3d22b8dedabbf5dd4304730 - subpackages: - - aws - - aws/awserr - - aws/awsutil - - aws/client - - aws/client/metadata - - aws/corehandlers - - aws/credentials - - aws/credentials/ec2rolecreds - - aws/credentials/endpointcreds - - aws/credentials/stscreds - - aws/defaults - - aws/ec2metadata - - aws/endpoints - - aws/request - - aws/session - - aws/signer/v4 - - internal/shareddefaults - - private/protocol - - private/protocol/query - - private/protocol/query/queryutil - - private/protocol/rest - - private/protocol/restxml - - private/protocol/xml/xmlutil - - service/s3 - - service/sts -- name: github.com/blang/semver - version: 2ee87856327ba09384cabd113bc6b5d174e9ec0f -- name: github.com/boltdb/bolt - version: 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8 -- name: github.com/chzyer/readline - version: 41eea22f717c616615e1e59aa06cf831f9901f35 -- name: github.com/dchest/blake2b - version: 06006a921c7d13e3fdf63c401cb0e4529a26e6e4 -- name: github.com/donovanhide/eventsource - version: fd1de70867126402be23c306e1ce32828455d85b -- name: github.com/facebookgo/clock - version: 600d898af40aa09a7a93ecb9265d87b0504b6f03 -- name: github.com/facebookgo/httpdown - version: a3b1354551a26449fbe05f5d855937f6e7acbd71 -- name: github.com/facebookgo/stats - version: 1b76add642e42c6ffba7211ad7b3939ce654526e -- name: github.com/fullsailor/pkcs7 - version: eb67e7e564b9eae64dc7d95fae0784d6086a5fc4 -- name: github.com/go-ini/ini - version: 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a -- name: github.com/go-zoo/bone - version: fd0aebc74e908868b09ac140fb5a53cb363884c1 -- name: github.com/golang/protobuf - version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef - subpackages: - - proto -- name: github.com/google/go-github - version: 466070b0580728e63bd1a415e0019639e55d7148 - subpackages: - - github -- name: github.com/google/go-querystring - version: 9235644dd9e52eeae6fa48efd539fdc351a0af53 - subpackages: - - query -- name: github.com/google/shlex - version: 6f45313302b9c56850fc17f99e40caebce98c716 -- name: github.com/jmespath/go-jmespath - version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d -- name: github.com/kardianos/osext - version: c2c54e542fb797ad986b31721e1baedf214ca413 -- name: github.com/keybase/go-triplesec - version: b360b8252869a5ac88df3ed7897bc3b6d1e55dd2 - subpackages: - - sha3 -- name: github.com/manifoldco/ansiwrap - version: c0a8ca03bf663de63b9a3e4283986a5824c1850b -- name: github.com/manifoldco/go-base32 - version: b6687e64fc5e75d8bb58badb858d79c46b0eee96 -- name: github.com/manifoldco/go-base64 - version: bb5e620cf51d2bbe78e624a2c27117655ce73acc -- name: github.com/natefinch/lumberjack - version: a96e63847dc3c67d17befa69c303767e2f84e54f -- name: github.com/natefinch/npipe - version: c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6 -- name: github.com/nightlyone/lockfile - version: 1d49c987357a327b5b03aa84cbddd582c328615d -- name: github.com/onsi/gomega - version: 334b8f472b3af5d541c5642701c1e29e2126f486 - subpackages: - - format - - internal/assertion - - internal/asyncassertion - - internal/oraclematcher - - internal/testingtsupport - - matchers - - matchers/support/goraph/bipartitegraph - - matchers/support/goraph/edge - - matchers/support/goraph/node - - matchers/support/goraph/util - - types -- name: github.com/satori/go.uuid - version: 879c5887cd475cd7864858769793b2ceb0d44feb -- name: github.com/urfave/cli - version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 -- name: golang.org/x/crypto - version: 9ef620b9ca2f82b55030ffd4f41327fa9e77a92c - subpackages: - - curve25519 - - ed25519 - - ed25519/internal/edwards25519 - - nacl/box - - nacl/secretbox - - pbkdf2 - - poly1305 - - salsa20 - - salsa20/salsa - - scrypt - - twofish -- name: golang.org/x/net - version: d1e1b351919c6738fdeb9893d5c998b161464f0c - subpackages: - - context -- name: golang.org/x/oauth2 - version: 7fdf09982454086d5570c7db3e11f360194830ca - subpackages: - - internal -- name: golang.org/x/sys - version: f3918c30c5c2cb527c0b071a27c35120a6c0719a - subpackages: - - windows -- name: google.golang.org/appengine - version: 170382fa85b10b94728989dfcf6cc818b335c952 - subpackages: - - internal - - internal/base - - internal/datastore - - internal/log - - internal/remote_api - - internal/urlfetch - - urlfetch -- name: gopkg.in/oleiade/reflections.v1 - version: 2b6ec3da648e3e834dc41bad8d9ed7f2dc6a9496 -testImports: -- name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 882c89bf..00000000 --- a/glide.yaml +++ /dev/null @@ -1,49 +0,0 @@ -package: github.com/manifoldco/torus-cli -ignore: -- golang.org/x/sys/unix -import: -- package: github.com/natefinch/npipe - version: ^2 -- package: github.com/satori/go.uuid - version: ^1.1.0 -- package: github.com/natefinch/lumberjack - version: ^2 -- package: github.com/nightlyone/lockfile -- package: github.com/facebookgo/httpdown -- package: github.com/go-zoo/bone - version: ^1.2.0 -- package: golang.org/x/crypto -- package: github.com/go-ini/ini - version: ^1.21.1 -- package: github.com/keybase/go-triplesec -- package: github.com/dchest/blake2b -- package: github.com/boltdb/bolt - version: ^1.3.0 -- package: github.com/urfave/cli - version: ^1.19.1 -- package: github.com/kardianos/osext -- package: github.com/chzyer/readline - version: master -- package: github.com/asaskevich/govalidator - version: ^5.0.0 -- package: gopkg.in/oleiade/reflections.v1 - version: ^1.0.0 -- package: github.com/donovanhide/eventsource -- package: github.com/aws/aws-sdk-go - version: ^1.5.13 -- package: github.com/google/go-github - subpackages: - - github -- package: github.com/blang/semver - version: ^3.3.0 -- package: golang.org/x/oauth2 -- package: github.com/manifoldco/ansiwrap - version: ^1.0.0 -- package: github.com/manifoldco/go-base64 - version: ^1.0.0 -- package: github.com/manifoldco/go-base32 - version: ^1.0.0 -- package: github.com/fullsailor/pkcs7 -- package: github.com/google/shlex -- package: github.com/onsi/gomega -- package: github.com/awnumar/memguard