From 08dcf5633b0c381b8fddfedbabd2fe6320172022 Mon Sep 17 00:00:00 2001 From: Yusuke KUOKA Date: Wed, 23 May 2018 16:29:22 +0900 Subject: [PATCH] Migrate to dep Ran `dep init` and then `dep ensure`. I had to remove elastic/beats from `Gopkg.toml` and re-run `dep ensure` to fix the strage error `target/filebeat-master-go1.10- flag redefined: strict.perms` in travis builds. Uses the latest stable release of `dep`: ``` $ dep version dep: version : v0.4.1 build date : 2018-01-27 git hash : 37d9ea0 go version : go1.9.3 go compiler : gc platform : darwin/amd64 ``` Resolves #9 --- .travis.yml | 4 +- Gopkg.lock | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Gopkg.toml | 35 ++++++++++++ README.md | 4 +- glide.lock | 40 -------------- glide.yaml | 10 ---- 6 files changed, 195 insertions(+), 54 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 61f40ff..adcf114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ go: install: - go get github.com/elastic/beats || true - - curl https://glide.sh/get | sh - - glide install + - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + - dep ensure script: - | diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..3b38a90 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,156 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[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/sdkio", + "internal/sdkrand", + "internal/shareddefaults", + "private/protocol", + "private/protocol/json/jsonutil", + "private/protocol/jsonrpc", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/xml/xmlutil", + "service/firehose", + "service/kinesis", + "service/sts" + ] + revision = "cf00d544fc3c02f31e05e8d02444a1325d3a840b" + version = "v1.13.53" + +[[projects]] + name = "github.com/fatih/color" + packages = ["."] + revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" + version = "v1.7.0" + +[[projects]] + name = "github.com/go-ini/ini" + packages = ["."] + revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a" + version = "v1.32.0" + +[[projects]] + name = "github.com/jmespath/go-jmespath" + packages = ["."] + revision = "0b12d6b5" + +[[projects]] + branch = "master" + name = "github.com/joeshaw/multierror" + packages = ["."] + revision = "69b34d4ec901851247ae7e77d33909caf9df99ed" + +[[projects]] + name = "github.com/mattn/go-colorable" + packages = ["."] + revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" + version = "v0.0.9" + +[[projects]] + name = "github.com/mattn/go-isatty" + packages = ["."] + revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" + version = "v0.0.3" + +[[projects]] + name = "github.com/pkg/errors" + packages = ["."] + revision = "645ef00459ed84a119197bfb8d8205042c6df63d" + version = "v0.8.0" + +[[projects]] + name = "github.com/satori/go.uuid" + packages = ["."] + revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" + version = "v1.2.0" + +[[projects]] + name = "github.com/urso/go-structform" + packages = [ + ".", + "gotype", + "internal/unsafe", + "json", + "visitors" + ] + revision = "844d7d44009e9e8c0f08016fc4dab64e136ca040" + version = "v0.0.2" + +[[projects]] + name = "go.uber.org/atomic" + packages = ["."] + revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289" + version = "v1.3.2" + +[[projects]] + name = "go.uber.org/multierr" + packages = ["."] + revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a" + version = "v1.1.0" + +[[projects]] + name = "go.uber.org/zap" + packages = [ + ".", + "buffer", + "internal/bufferpool", + "internal/color", + "internal/exit", + "zapcore", + "zaptest/observer" + ] + revision = "eeedf312bc6c57391d84767a4cd413f02a917974" + version = "v1.8.0" + +[[projects]] + branch = "master" + name = "golang.org/x/net" + packages = [ + "internal/socks", + "proxy" + ] + revision = "9ef9f5bb98a1fdc41f8cf6c250a4404b4085e389" + +[[projects]] + branch = "master" + name = "golang.org/x/sys" + packages = [ + "unix", + "windows", + "windows/registry", + "windows/svc/eventlog" + ] + revision = "88eb85aaee56831ad49eaf7aa80d73de9814cde2" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" + version = "v2.2.1" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "a5688a1fc073696b264ed903c703edf179cca5332bfefde5ccfc0ec4a55db9a2" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..e10425f --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,35 @@ +# 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" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + +ignored = ["github.com/elastic/beats"] + +[[constraint]] + name = "github.com/aws/aws-sdk-go" + version = "1.12.53" + +[prune] + go-tests = true + unused-packages = true diff --git a/README.md b/README.md index abc03b6..4ee7c2d 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ Build requires Go 1.10+ and Linux. You need to define Filebeat version (`v6.1.3` ``` go get github.com/elastic/beats -# curl https://glide.sh/get | sh -glide install +# curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh +dep ensure make BEATS_VERSION=v6.1.3 ``` diff --git a/glide.lock b/glide.lock deleted file mode 100644 index d263ac6..0000000 --- a/glide.lock +++ /dev/null @@ -1,40 +0,0 @@ -hash: 12f47a7eb83aa755e36611aec2e5b4373251bf882052de4840c166c1df263c59 -updated: 2018-05-22T17:57:57.395546+09:00 -imports: -- name: github.com/aws/aws-sdk-go - version: cf00d544fc3c02f31e05e8d02444a1325d3a840b - 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/sdkio - - internal/sdkrand - - internal/shareddefaults - - private/protocol - - private/protocol/json/jsonutil - - private/protocol/jsonrpc - - private/protocol/query - - private/protocol/query/queryutil - - private/protocol/rest - - private/protocol/xml/xmlutil - - service/firehose - - service/kinesis - - service/sts -- name: github.com/go-ini/ini - version: 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a -- name: github.com/jmespath/go-jmespath - version: dd801d4f4ce7ac746e7e7b4489d2fa600b3b096b -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 270e8bc..0000000 --- a/glide.yaml +++ /dev/null @@ -1,10 +0,0 @@ -package: github.com/s12v/awsbeats -ignore: - - github.com/elastic/beats -import: -- package: github.com/aws/aws-sdk-go - version: ^1.12.53 - subpackages: - - aws - - aws/session - - service/firehose