Skip to content

Commit

Permalink
Go modules (#251)
Browse files Browse the repository at this point in the history
##  Description
Replace govendor for gomodules for dependency management.
 
## Related Issue
Related #217 
## Motivation and Context
<!-- Why is this change required? What problem does it solve? -->

## How This Has Been Tested
./ci-test.sh
go build
  • Loading branch information
tbuchaillot committed Jul 16, 2020
1 parent 8be6ff7 commit d5a742b
Show file tree
Hide file tree
Showing 5,141 changed files with 743 additions and 1,531,564 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ services:
matrix:
include:
- go: 1.11.x
env: LATEST_GO=true # run linters and report coverage
env:
- LATEST_GO=true # run linters and report coverage
- GO111MODULE=on

install:
- go get golang.org/x/tools/cmd/goimports
Expand Down
52 changes: 52 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
module github.com/TykTechnologies/tyk-pump

go 1.12

require (
github.com/DataDog/datadog-go v0.0.0-20190425163447-40bafcb5f6c1
github.com/Sirupsen/logrus v0.11.5-0.20170308203635-1deb2db2a6ff
github.com/TykTechnologies/concurrent-map v0.0.0-20160908201409-7de59d53fd5c // indirect
github.com/TykTechnologies/logrus v0.0.0-20161201171239-55ff0f4b9b3d
github.com/TykTechnologies/logrus-prefixed-formatter v0.0.0-20161201171121-85209afb73a6
github.com/TykTechnologies/murmur3 v0.0.0-20180602122059-1915e687e465
github.com/TykTechnologies/tyk v0.0.0-20200207055804-cf1d1ad81206
github.com/beeker1121/goque v0.0.0-20170321141813-4044bc29b280 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/fatih/structs v1.1.0
github.com/go-redis/redis v6.15.6+incompatible
github.com/gocraft/health v0.0.0-20170925182251-8675af27fef0
github.com/gocraft/web v0.0.0-20190207150652-9707327fb69b
github.com/gomodule/redigo v0.0.0-20190226174433-b47395aa1766 // indirect
github.com/googleapis/gax-go v2.0.2+incompatible // indirect
github.com/influxdata/influxdb v0.0.0-20161118010201-b765a4b8c7d0
github.com/jehiah/go-strftime v0.0.0-20151206194810-2efbe75097a5 // indirect
github.com/kelseyhightower/envconfig v1.4.0
github.com/lintianzhi/graylogd v0.0.0-20180503131252-dc68342f04dc // indirect
github.com/logzio/logzio-go v0.0.0-20190331100143-1138f714b3b6
github.com/lonelycode/mgohacks v0.0.0-20150820024025-f9c291f7e57e
github.com/mitchellh/mapstructure v1.1.2
github.com/moesif/moesifapi-go v0.0.0-20170216233325-69242ec5159a
github.com/olivere/elastic v6.2.31+incompatible // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v0.9.1
github.com/prometheus/common v0.2.0 // indirect
github.com/prometheus/procfs v0.0.0-20190209105433-f8d8b3f739bd // indirect
github.com/quipo/statsd v0.0.0-20160923160612-75b7afedf0d2
github.com/ricochet2200/go-disk-usage v0.0.0-20150921141558-f0d1b743428f // indirect
github.com/robertkowalski/graylog-golang v0.0.0-20151121031040-e5295cfa2827
github.com/satori/go.uuid v1.2.0
github.com/segmentio/analytics-go v0.0.0-20160711225931-bdb0aeca8a99
github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c // indirect
github.com/segmentio/kafka-go v0.3.6
github.com/sirupsen/logrus v1.4.2
github.com/syndtr/goleveldb v0.0.0-20190318030020-c3a204f8e965 // indirect
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
google.golang.org/api v0.24.0 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
gopkg.in/olivere/elastic.v2 v2.0.61 // indirect
gopkg.in/olivere/elastic.v3 v3.0.56
gopkg.in/olivere/elastic.v5 v5.0.85
gopkg.in/olivere/elastic.v6 v6.2.31
gopkg.in/vmihailenco/msgpack.v2 v2.9.1
)
682 changes: 682 additions & 0 deletions go.sum

Large diffs are not rendered by default.

14 changes: 4 additions & 10 deletions logger/init_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package logger

import (
"github.com/TykTechnologies/logrus"
"github.com/TykTechnologies/logrus/hooks/test"
"io/ioutil"
"os"
"strings"
"testing"

"github.com/TykTechnologies/logrus"
)

//TestFormatterWithForcedPrefixFileOutput check if the prefix is stored in not TTY outputs
Expand All @@ -20,9 +20,8 @@ func TestFormatterWithForcedPrefixFileOutput(t *testing.T) {
return
}

logger, hook := test.NewNullLogger()
logger.Formatter = GetFormatterWithForcedPrefix()
logger.SetOutput(f)
logger := log
logger.Out = f

logger.WithFields(logrus.Fields{
"prefix": "test-prefix",
Expand All @@ -37,11 +36,6 @@ func TestFormatterWithForcedPrefixFileOutput(t *testing.T) {
t.Error("Closing test logs file:" + err.Error())
}

//check the logs in the hook
if len(hook.Entries) != 1 {
t.Error("logger doesn't contain the correct number of records")
}

//Now check the content in the file
b, err := ioutil.ReadFile(outputFile)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions utils/ci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ MATRIX=(
""
)

export GO111MODULE=on

# print a command and execute it
show() {
echo "$@" >&2
Expand Down
Loading

0 comments on commit d5a742b

Please sign in to comment.