From 42975447a10601797fe01bcc6cc5feaeb493f9e5 Mon Sep 17 00:00:00 2001 From: Enrico Stahn Date: Sun, 18 Feb 2018 20:36:05 +1100 Subject: [PATCH] Swap glide with golang dep --- .circleci/config.yml | 3 +- Gopkg.lock | 216 +++++++++++++++++++++++++++++++++++++++++++ Gopkg.toml | 50 ++++++++++ glide.lock | 111 ---------------------- glide.yaml | 7 -- 5 files changed, 268 insertions(+), 119 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index feec847..f53ea1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,5 +20,6 @@ jobs: steps: - checkout - - run: go get -v -t -d ./... + - run: go get -u github.com/golang/dep/cmd/dep + - run: dep ensure -vendor-only - run: go test -v ./... \ No newline at end of file diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..b09a2ad --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,216 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + branch = "master" + name = "github.com/beorn7/perks" + packages = ["quantile"] + revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9" + +[[projects]] + branch = "master" + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "87df7c60d5820d0f8ae11afede5aa52325c09717" + +[[projects]] + name = "github.com/fsnotify/fsnotify" + packages = ["."] + revision = "4da3e2cfbabc9f751898f250b49f2439785783a1" + +[[projects]] + branch = "master" + name = "github.com/golang/protobuf" + packages = ["proto"] + revision = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175" + +[[projects]] + branch = "master" + name = "github.com/gosuri/uitable" + packages = [ + ".", + "util/strutil", + "util/wordwrap" + ] + revision = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42" + +[[projects]] + name = "github.com/hashicorp/hcl" + packages = [ + ".", + "hcl/ast", + "hcl/parser", + "hcl/scanner", + "hcl/strconv", + "hcl/token", + "json/parser", + "json/scanner", + "json/token" + ] + revision = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca" + +[[projects]] + name = "github.com/inconshreveable/mousetrap" + packages = ["."] + revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + version = "v1.0" + +[[projects]] + name = "github.com/magiconair/properties" + packages = ["."] + revision = "51463bfca2576e06c62a8504b5c0f06d61312647" + +[[projects]] + branch = "master" + name = "github.com/mattn/go-runewidth" + packages = ["."] + revision = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d" + +[[projects]] + branch = "master" + name = "github.com/matttproud/golang_protobuf_extensions" + packages = ["pbutil"] + revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" + +[[projects]] + branch = "master" + name = "github.com/mitchellh/go-homedir" + packages = ["."] + revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" + +[[projects]] + name = "github.com/mitchellh/mapstructure" + packages = ["."] + revision = "d0303fe809921458f417bcf828397a65db30a7e4" + +[[projects]] + name = "github.com/pelletier/go-buffruneio" + packages = ["."] + revision = "c37440a7cf42ac63b919c752ca73a85067e05992" + version = "v0.2.0" + +[[projects]] + name = "github.com/pelletier/go-toml" + packages = ["."] + revision = "fe7536c3dee2596cdd23ee9976a17c22bdaae286" + +[[projects]] + name = "github.com/prometheus/client_golang" + packages = [ + "prometheus", + "prometheus/promhttp" + ] + revision = "a40133b69fbd73ee655606a9bf5f8b9b9bf758dd" + +[[projects]] + branch = "master" + name = "github.com/prometheus/client_model" + packages = ["go"] + revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" + +[[projects]] + branch = "master" + name = "github.com/prometheus/common" + packages = [ + "expfmt", + "internal/bitbucket.org/ww/goautoneg", + "model" + ] + revision = "89604d197083d4781071d3c65855d24ecfb0a563" + +[[projects]] + branch = "master" + name = "github.com/prometheus/procfs" + packages = [ + ".", + "internal/util", + "nfs", + "xfs" + ] + revision = "282c8707aa210456a825798969cc27edda34992a" + +[[projects]] + branch = "master" + name = "github.com/sirupsen/logrus" + packages = ["."] + revision = "8c0189d9f6bbf301e5d055d34268156b317016af" + +[[projects]] + name = "github.com/spf13/afero" + packages = [ + ".", + "mem" + ] + revision = "9be650865eab0c12963d8753212f4f9c66cdcf12" + +[[projects]] + name = "github.com/spf13/cast" + packages = ["."] + revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4" + version = "v1.1.0" + +[[projects]] + name = "github.com/spf13/cobra" + packages = ["."] + revision = "8f5946caaeeff40a98d67f60c25e89c3525038a3" + +[[projects]] + name = "github.com/spf13/jwalterweatherman" + packages = ["."] + revision = "0efa5202c04663c757d84f90f5219c1250baf94f" + +[[projects]] + name = "github.com/spf13/pflag" + packages = ["."] + revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" + version = "v1.0.0" + +[[projects]] + name = "github.com/spf13/viper" + packages = ["."] + revision = "a1ecfa6a20bd4ef9e9caded262ee1b1b26847675" + +[[projects]] + branch = "master" + name = "github.com/tomasen/fcgi_client" + packages = ["."] + revision = "d32b71631a94113ee01855724d1038485a396b6f" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + revision = "650f4a345ab4e5b245a3034b110ebc7299e68186" + +[[projects]] + branch = "master" + name = "golang.org/x/sys" + packages = [ + "unix", + "windows" + ] + revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd" + +[[projects]] + name = "golang.org/x/text" + packages = [ + "internal/gen", + "internal/triegen", + "internal/ucd", + "transform", + "unicode/cldr", + "unicode/norm" + ] + revision = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "a83829b6f1293c91addabc89d0571c246397bbf4" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "9d6c96a2ed2824b362a4f9d68ba313678fb7e3f7e38e2fd7058ba9c21a0b2487" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..93700d5 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,50 @@ +# Gopkg.toml example +# +# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html +# 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" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + + +[[constraint]] + branch = "master" + name = "github.com/davecgh/go-spew" + +[[constraint]] + branch = "master" + name = "github.com/gosuri/uitable" + +[[constraint]] + branch = "master" + name = "github.com/mitchellh/go-homedir" + +[[constraint]] + branch = "master" + name = "github.com/sirupsen/logrus" + +[[constraint]] + branch = "master" + name = "github.com/tomasen/fcgi_client" + +[prune] + go-tests = true + unused-packages = true diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 6d475af..0000000 --- a/glide.lock +++ /dev/null @@ -1,111 +0,0 @@ -hash: 41dcf6f131327ca4b18788f48b530080ea79b432b982a1a8d3114b3a2d765c09 -updated: 2018-02-15T13:47:57.155132+11:00 -imports: -- name: github.com/aws/aws-sdk-go - version: 31d8a71e731ad4df5221f6ba3372c461b56a5eda -- name: github.com/beorn7/perks - version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 - subpackages: - - quantile -- name: github.com/bmuller/arrow - version: 57b28416c629f234bd2291d3ba7b19b9a064fd37 -- name: github.com/davecgh/go-spew - version: 87df7c60d5820d0f8ae11afede5aa52325c09717 - subpackages: - - spew -- name: github.com/fsnotify/fsnotify - version: 4da3e2cfbabc9f751898f250b49f2439785783a1 -- name: github.com/golang/protobuf - version: bbd03ef6da3a115852eaf24c8a1c46aeb39aa175 - subpackages: - - proto -- name: github.com/gorilla/mux - version: c0091a029979286890368b4c7b301261e448e242 -- name: github.com/gosuri/uitable - version: 36ee7e946282a3fb1cfecd476ddc9b35d8847e42 -- name: github.com/hashicorp/hcl - version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca - 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/magiconair/properties - version: 51463bfca2576e06c62a8504b5c0f06d61312647 -- name: github.com/matttproud/golang_protobuf_extensions - version: c12348ce28de40eed0136aa2b644d0ee0650e56c - subpackages: - - pbutil -- name: github.com/mitchellh/go-homedir - version: b8bc1bf767474819792c23f32d8286a45736f1c6 -- name: github.com/mitchellh/mapstructure - version: d0303fe809921458f417bcf828397a65db30a7e4 -- name: github.com/newrelic/go-agent - version: f5bce3387232559bcbe6a5f8227c4bf508dac1ba -- name: github.com/pelletier/go-buffruneio - version: c37440a7cf42ac63b919c752ca73a85067e05992 -- name: github.com/pelletier/go-toml - version: fe7536c3dee2596cdd23ee9976a17c22bdaae286 -- name: github.com/prometheus/client_golang - version: a40133b69fbd73ee655606a9bf5f8b9b9bf758dd - subpackages: - - prometheus -- name: github.com/prometheus/client_model - version: 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c - subpackages: - - go -- name: github.com/prometheus/common - version: 89604d197083d4781071d3c65855d24ecfb0a563 - subpackages: - - expfmt - - internal/bitbucket.org/ww/goautoneg - - model -- name: github.com/prometheus/procfs - version: 282c8707aa210456a825798969cc27edda34992a - subpackages: - - internal/util - - nfs - - xfs -- name: github.com/sirupsen/logrus - version: 8c0189d9f6bbf301e5d055d34268156b317016af -- name: github.com/speps/go-hashids - version: c6ced3330f133cec79e144fb11b2e4c5154059ae -- name: github.com/spf13/afero - version: 9be650865eab0c12963d8753212f4f9c66cdcf12 - subpackages: - - mem -- name: github.com/spf13/cast - version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 -- name: github.com/spf13/cobra - version: 8f5946caaeeff40a98d67f60c25e89c3525038a3 -- name: github.com/spf13/jwalterweatherman - version: 0efa5202c04663c757d84f90f5219c1250baf94f -- name: github.com/spf13/pflag - version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 -- name: github.com/spf13/viper - version: a1ecfa6a20bd4ef9e9caded262ee1b1b26847675 -- name: github.com/tomasen/fcgi_client - version: d32b71631a94113ee01855724d1038485a396b6f -- name: golang.org/x/crypto - version: 650f4a345ab4e5b245a3034b110ebc7299e68186 - subpackages: - - ssh/terminal -- name: golang.org/x/sys - version: 37707fdb30a5b38865cfb95e5aab41707daec7fd - subpackages: - - unix - - windows -- name: golang.org/x/text - version: 9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735 - subpackages: - - transform - - unicode/norm -- name: gopkg.in/yaml.v2 - version: a83829b6f1293c91addabc89d0571c246397bbf4 -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index e714553..0000000 --- a/glide.yaml +++ /dev/null @@ -1,7 +0,0 @@ -package: php-fpm_exporter -import: -- package: github.com/gosuri/uitable -- package: github.com/sirupsen/logrus -- package: github.com/mitchellh/go-homedir -- package: github.com/spf13/cobra -- package: github.com/spf13/viper