fix #7: moved to gomodules

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: golang:1.9
+image: golang:1.12
 
 stages:
 - test

Makefile

@@ -11,22 +11,21 @@ lint: ## Lint the files
 	@golint -set_exit_status ${PKG_LIST}
 
 test: ## Run unittests
-	@go test -v .
+	@GO111MODULE=on go test -mod=vendor -v .
 
 race: dep ## Run data race detector
-	@go test -v -race ${PKG_LIST}
+	@GO111MODULE=on go test -mod=vendor -v -race ${PKG_LIST}
 
 msan: dep ## Run memory sanitizer
-	@go test -msan -short ${PKG_LIST}
+	@GO111MODULE=on go test -mod=vendor -msan -short ${PKG_LIST}
 
 coverage: ## Generate global code coverage report
 	@mkdir -p cover
 	@touch cover/${PROJECT_NAME}cov
-	go tool cover -html=cover/${PROJECT_NAME}cov -o coverage.html
+	@go tool cover -html=cover/${PROJECT_NAME}cov -o coverage.html
 
 dep: ## Get the dependencies
-	@mkdir -p vendor
+	@GO111MODULE=on go mod vendor
-	@govendor add +external
 
 push: dep lint test coverage ## Push to git repository
 	@git push origin master

go.mod

@@ -0,0 +1,14 @@
+module gitlab.bertha.cloud/partitio/Nextcloud-Partitio/gonextcloud
+
+go 1.12
+
+require (
+	github.com/fatih/structs v0.0.0-20180123065059-ebf56d35bba7
+	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
+	github.com/levigross/grequests v0.0.0-20171009010347-bf9788368aa0
+	github.com/pkg/errors v0.0.0-20181023235946-059132a15dd0
+	github.com/sirupsen/logrus v1.4.2
+	github.com/stretchr/testify v1.2.2
+	golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76 // indirect
+	gopkg.in/yaml.v2 v2.2.1
+)

go.sum

@@ -0,0 +1,28 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/structs v0.0.0-20180123065059-ebf56d35bba7 h1:bGT+Ub6bpzHl7AAYQhBrZ5nYTAH2SF/848WducU0Ao4=
+github.com/fatih/structs v0.0.0-20180123065059-ebf56d35bba7/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
+github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/levigross/grequests v0.0.0-20171009010347-bf9788368aa0 h1:QpdhtrR7SX3R7OlEv9dZarsXogM3PM/tl1ibRH/eHbQ=
+github.com/levigross/grequests v0.0.0-20171009010347-bf9788368aa0/go.mod h1:uCZIhROSrVmuF/BPYFPwDeiiQ6juSLp0kikFoEcNcEs=
+github.com/pkg/errors v0.0.0-20181023235946-059132a15dd0 h1:R+lX9nKwNd1n7UE5SQAyoorREvRn3aLF6ZndXBoIWqY=
+github.com/pkg/errors v0.0.0-20181023235946-059132a15dd0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76 h1:xx5MUFyRQRbPk6VjWjIE1epE/K5AoDD8QUN116NCy8k=
+golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

vendor/github.com/davecgh/go-spew/LICENSE

@@ -2,7 +2,7 @@ ISC License
 
 Copyright (c) 2012-2016 Dave Collins <dave@davec.name>
 
-Permission to use, copy, modify, and distribute this software for any
+Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 

vendor/github.com/davecgh/go-spew/spew/bypass.go

@@ -16,7 +16,9 @@
 // when the code is not running on Google App Engine, compiled by GopherJS, and
 // "-tags safe" is not added to the go build command line.  The "disableunsafe"
 // tag is deprecated and thus should not be used.
-// +build !js,!appengine,!safe,!disableunsafe
+// Go versions prior to 1.4 are disabled because they use a different layout
+// for interfaces which make the implementation of unsafeReflectValue more complex.
+// +build !js,!appengine,!safe,!disableunsafe,go1.4
 
 package spew
 
@@ -34,80 +36,49 @@ const (
 	ptrSize = unsafe.Sizeof((*byte)(nil))
 )
 
-var (
+type flag uintptr
-	// offsetPtr, offsetScalar, and offsetFlag are the offsets for the
-	// internal reflect.Value fields.  These values are valid before golang
-	// commit ecccf07e7f9d which changed the format.  The are also valid
-	// after commit 82f48826c6c7 which changed the format again to mirror
-	// the original format.  Code in the init function updates these offsets
-	// as necessary.
-	offsetPtr    = uintptr(ptrSize)
-	offsetScalar = uintptr(0)
-	offsetFlag   = uintptr(ptrSize * 2)
 
-	// flagKindWidth and flagKindShift indicate various bits that the
+var (
-	// reflect package uses internally to track kind information.
+	// flagRO indicates whether the value field of a reflect.Value
-	//
+	// is read-only.
-	// flagRO indicates whether or not the value field of a reflect.Value is
+	flagRO flag
-	// read-only.
+
-	//
+	// flagAddr indicates whether the address of the reflect.Value's
-	// flagIndir indicates whether the value field of a reflect.Value is
+	// value may be taken.
-	// the actual data or a pointer to the data.
+	flagAddr flag
-	//
-	// These values are valid before golang commit 90a7c3c86944 which
-	// changed their positions.  Code in the init function updates these
-	// flags as necessary.
-	flagKindWidth = uintptr(5)
-	flagKindShift = uintptr(flagKindWidth - 1)
-	flagRO        = uintptr(1 << 0)
-	flagIndir     = uintptr(1 << 1)
 )
 
-func init() {
+// flagKindMask holds the bits that make up the kind
-	// Older versions of reflect.Value stored small integers directly in the
+// part of the flags field. In all the supported versions,
-	// ptr field (which is named val in the older versions).  Versions
+// it is in the lower 5 bits.
-	// between commits ecccf07e7f9d and 82f48826c6c7 added a new field named
+const flagKindMask = flag(0x1f)
-	// scalar for this purpose which unfortunately came before the flag
-	// field, so the offset of the flag field is different for those
-	// versions.
-	//
-	// This code constructs a new reflect.Value from a known small integer
-	// and checks if the size of the reflect.Value struct indicates it has
-	// the scalar field. When it does, the offsets are updated accordingly.
-	vv := reflect.ValueOf(0xf00)
-	if unsafe.Sizeof(vv) == (ptrSize * 4) {
-		offsetScalar = ptrSize * 2
-		offsetFlag = ptrSize * 3
-	}
 
-	// Commit 90a7c3c86944 changed the flag positions such that the low
+// Different versions of Go have used different
-	// order bits are the kind.  This code extracts the kind from the flags
+// bit layouts for the flags type. This table
-	// field and ensures it's the correct type.  When it's not, the flag
+// records the known combinations.
-	// order has been changed to the newer format, so the flags are updated
+var okFlags = []struct {
-	// accordingly.
+	ro, addr flag
-	upf := unsafe.Pointer(uintptr(unsafe.Pointer(&vv)) + offsetFlag)
+}{{
-	upfv := *(*uintptr)(upf)
+	// From Go 1.4 to 1.5
-	flagKindMask := uintptr((1<<flagKindWidth - 1) << flagKindShift)
+	ro:   1 << 5,
-	if (upfv&flagKindMask)>>flagKindShift != uintptr(reflect.Int) {
+	addr: 1 << 7,
-		flagKindShift = 0
+}, {
-		flagRO = 1 << 5
+	// Up to Go tip.
-		flagIndir = 1 << 6
+	ro:   1<<5 | 1<<6,
+	addr: 1 << 8,
+}}
 
-		// Commit adf9b30e5594 modified the flags to separate the
+var flagValOffset = func() uintptr {
-		// flagRO flag into two bits which specifies whether or not the
+	field, ok := reflect.TypeOf(reflect.Value{}).FieldByName("flag")
-		// field is embedded.  This causes flagIndir to move over a bit
+	if !ok {
-		// and means that flagRO is the combination of either of the
+		panic("reflect.Value has no flag field")
-		// original flagRO bit and the new bit.
-		//
-		// This code detects the change by extracting what used to be
-		// the indirect bit to ensure it's set.  When it's not, the flag
-		// order has been changed to the newer format, so the flags are
-		// updated accordingly.
-		if upfv&flagIndir == 0 {
-			flagRO = 3 << 5
-			flagIndir = 1 << 7
-		}
 	}
+	return field.Offset
+}()
+
+// flagField returns a pointer to the flag field of a reflect.Value.
+func flagField(v *reflect.Value) *flag {
+	return (*flag)(unsafe.Pointer(uintptr(unsafe.Pointer(v)) + flagValOffset))
 }
 
 // unsafeReflectValue converts the passed reflect.Value into a one that bypasses
@@ -119,34 +90,56 @@ func init() {
 // This allows us to check for implementations of the Stringer and error
 // interfaces to be used for pretty printing ordinarily unaddressable and
 // inaccessible values such as unexported struct fields.
-func unsafeReflectValue(v reflect.Value) (rv reflect.Value) {
+func unsafeReflectValue(v reflect.Value) reflect.Value {
-	indirects := 1
+	if !v.IsValid() || (v.CanInterface() && v.CanAddr()) {
-	vt := v.Type()
+		return v
-	upv := unsafe.Pointer(uintptr(unsafe.Pointer(&v)) + offsetPtr)
+	}
-	rvf := *(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&v)) + offsetFlag))
+	flagFieldPtr := flagField(&v)
-	if rvf&flagIndir != 0 {
+	*flagFieldPtr &^= flagRO
-		vt = reflect.PtrTo(v.Type())
+	*flagFieldPtr |= flagAddr
-		indirects++
+	return v
-	} else if offsetScalar != 0 {
+}
-		// The value is in the scalar field when it's not one of the
+
-		// reference types.
+// Sanity checks against future reflect package changes
-		switch vt.Kind() {
+// to the type or semantics of the Value.flag field.
-		case reflect.Uintptr:
+func init() {
-		case reflect.Chan:
+	field, ok := reflect.TypeOf(reflect.Value{}).FieldByName("flag")
-		case reflect.Func:
+	if !ok {
-		case reflect.Map:
+		panic("reflect.Value has no flag field")
-		case reflect.Ptr:
+	}
-		case reflect.UnsafePointer:
+	if field.Type.Kind() != reflect.TypeOf(flag(0)).Kind() {
-		default:
+		panic("reflect.Value flag field has changed kind")
-			upv = unsafe.Pointer(uintptr(unsafe.Pointer(&v)) +
+	}
-				offsetScalar)
+	type t0 int
+	var t struct {
+		A t0
+		// t0 will have flagEmbedRO set.
+		t0
+		// a will have flagStickyRO set
+		a t0
+	}
+	vA := reflect.ValueOf(t).FieldByName("A")
+	va := reflect.ValueOf(t).FieldByName("a")
+	vt0 := reflect.ValueOf(t).FieldByName("t0")
+
+	// Infer flagRO from the difference between the flags
+	// for the (otherwise identical) fields in t.
+	flagPublic := *flagField(&vA)
+	flagWithRO := *flagField(&va) | *flagField(&vt0)
+	flagRO = flagPublic ^ flagWithRO
+
+	// Infer flagAddr from the difference between a value
+	// taken from a pointer and not.
+	vPtrA := reflect.ValueOf(&t).Elem().FieldByName("A")
+	flagNoPtr := *flagField(&vA)
+	flagPtr := *flagField(&vPtrA)
+	flagAddr = flagNoPtr ^ flagPtr
+
+	// Check that the inferred flags tally with one of the known versions.
+	for _, f := range okFlags {
+		if flagRO == f.ro && flagAddr == f.addr {
+			return
 		}
 	}
-
+	panic("reflect.Value read-only flag has changed semantics")
-	pv := reflect.NewAt(vt, upv)
-	rv = pv
-	for i := 0; i < indirects; i++ {
-		rv = rv.Elem()
-	}
-	return rv
 }

vendor/github.com/davecgh/go-spew/spew/bypasssafe.go

@@ -16,7 +16,7 @@
 // when the code is running on Google App Engine, compiled by GopherJS, or
 // "-tags safe" is added to the go build command line.  The "disableunsafe"
 // tag is deprecated and thus should not be used.
-// +build js appengine safe disableunsafe
+// +build js appengine safe disableunsafe !go1.4
 
 package spew
 

vendor/github.com/davecgh/go-spew/spew/common.go

@@ -180,7 +180,7 @@ func printComplex(w io.Writer, c complex128, floatPrecision int) {
 	w.Write(closeParenBytes)
 }
 
-// printHexPtr outputs a uintptr formatted as hexidecimal with a leading '0x'
+// printHexPtr outputs a uintptr formatted as hexadecimal with a leading '0x'
 // prefix to Writer w.
 func printHexPtr(w io.Writer, p uintptr) {
 	// Null pointer.

vendor/github.com/davecgh/go-spew/spew/dump.go

@@ -35,16 +35,16 @@ var (
 
 	// cCharRE is a regular expression that matches a cgo char.
 	// It is used to detect character arrays to hexdump them.
-	cCharRE = regexp.MustCompile("^.*\\._Ctype_char$")
+	cCharRE = regexp.MustCompile(`^.*\._Ctype_char$`)
 
 	// cUnsignedCharRE is a regular expression that matches a cgo unsigned
 	// char.  It is used to detect unsigned character arrays to hexdump
 	// them.
-	cUnsignedCharRE = regexp.MustCompile("^.*\\._Ctype_unsignedchar$")
+	cUnsignedCharRE = regexp.MustCompile(`^.*\._Ctype_unsignedchar$`)
 
 	// cUint8tCharRE is a regular expression that matches a cgo uint8_t.
 	// It is used to detect uint8_t arrays to hexdump them.
-	cUint8tCharRE = regexp.MustCompile("^.*\\._Ctype_uint8_t$")
+	cUint8tCharRE = regexp.MustCompile(`^.*\._Ctype_uint8_t$`)
 )
 
 // dumpState contains information about the state of a dump operation.
@@ -143,10 +143,10 @@ func (d *dumpState) dumpPtr(v reflect.Value) {
 	// Display dereferenced value.
 	d.w.Write(openParenBytes)
 	switch {
-	case nilFound == true:
+	case nilFound:
 		d.w.Write(nilAngleBytes)
 
-	case cycleFound == true:
+	case cycleFound:
 		d.w.Write(circularBytes)
 
 	default:

vendor/github.com/davecgh/go-spew/spew/format.go

@@ -182,10 +182,10 @@ func (f *formatState) formatPtr(v reflect.Value) {
 
 	// Display dereferenced value.
 	switch {
-	case nilFound == true:
+	case nilFound:
 		f.fs.Write(nilAngleBytes)
 
-	case cycleFound == true:
+	case cycleFound:
 		f.fs.Write(circularShortBytes)
 
 	default:

vendor/github.com/fatih/structs/.gitignore

@@ -0,0 +1,23 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test

vendor/github.com/fatih/structs/.travis.yml

@@ -0,0 +1,13 @@
+language: go
+go: 
+ - 1.7.x
+ - 1.8.x
+ - 1.9.x
+ - tip
+sudo: false
+before_install:
+- go get github.com/axw/gocov/gocov
+- go get github.com/mattn/goveralls
+- if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
+script:
+- $HOME/gopath/bin/goveralls -service=travis-ci

vendor/github.com/fatih/structs/field_test.go

@@ -1,397 +0,0 @@
-package structs
-
-import (
-	"reflect"
-	"testing"
-)
-
-// A test struct that defines all cases
-type Foo struct {
-	A    string
-	B    int    `structs:"y"`
-	C    bool   `json:"c"`
-	d    string // not exported
-	E    *Baz
-	x    string `xml:"x"` // not exported, with tag
-	Y    []string
-	Z    map[string]interface{}
-	*Bar // embedded
-}
-
-type Baz struct {
-	A string
-	B int
-}
-
-type Bar struct {
-	E string
-	F int
-	g []string
-}
-
-func newStruct() *Struct {
-	b := &Bar{
-		E: "example",
-		F: 2,
-		g: []string{"zeynep", "fatih"},
-	}
-
-	// B and x is not initialized for testing
-	f := &Foo{
-		A: "gopher",
-		C: true,
-		d: "small",
-		E: nil,
-		Y: []string{"example"},
-		Z: nil,
-	}
-	f.Bar = b
-
-	return New(f)
-}
-
-func TestField_Set(t *testing.T) {
-	s := newStruct()
-
-	f := s.Field("A")
-	err := f.Set("fatih")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if f.Value().(string) != "fatih" {
-		t.Errorf("Setted value is wrong: %s want: %s", f.Value().(string), "fatih")
-	}
-
-	f = s.Field("Y")
-	err = f.Set([]string{"override", "with", "this"})
-	if err != nil {
-		t.Error(err)
-	}
-
-	sliceLen := len(f.Value().([]string))
-	if sliceLen != 3 {
-		t.Errorf("Setted values slice length is wrong: %d, want: %d", sliceLen, 3)
-	}
-
-	f = s.Field("C")
-	err = f.Set(false)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if f.Value().(bool) {
-		t.Errorf("Setted value is wrong: %t want: %t", f.Value().(bool), false)
-	}
-
-	// let's pass a different type
-	f = s.Field("A")
-	err = f.Set(123) // Field A is of type string, but we are going to pass an integer
-	if err == nil {
-		t.Error("Setting a field's value with a different type than the field's type should return an error")
-	}
-
-	// old value should be still there :)
-	if f.Value().(string) != "fatih" {
-		t.Errorf("Setted value is wrong: %s want: %s", f.Value().(string), "fatih")
-	}
-
-	// let's access an unexported field, which should give an error
-	f = s.Field("d")
-	err = f.Set("large")
-	if err != errNotExported {
-		t.Error(err)
-	}
-
-	// let's set a pointer to struct
-	b := &Bar{
-		E: "gopher",
-		F: 2,
-	}
-
-	f = s.Field("Bar")
-	err = f.Set(b)
-	if err != nil {
-		t.Error(err)
-	}
-
-	baz := &Baz{
-		A: "helloWorld",
-		B: 42,
-	}
-
-	f = s.Field("E")
-	err = f.Set(baz)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ba := s.Field("E").Value().(*Baz)
-
-	if ba.A != "helloWorld" {
-		t.Errorf("could not set baz. Got: %s Want: helloWorld", ba.A)
-	}
-}
-
-func TestField_NotSettable(t *testing.T) {
-	a := map[int]Baz{
-		4: {
-			A: "value",
-		},
-	}
-
-	s := New(a[4])
-
-	if err := s.Field("A").Set("newValue"); err != errNotSettable {
-		t.Errorf("Trying to set non-settable field should error with %q. Got %q instead.", errNotSettable, err)
-	}
-}
-
-func TestField_Zero(t *testing.T) {
-	s := newStruct()
-
-	f := s.Field("A")
-	err := f.Zero()
-	if err != nil {
-		t.Error(err)
-	}
-
-	if f.Value().(string) != "" {
-		t.Errorf("Zeroed value is wrong: %s want: %s", f.Value().(string), "")
-	}
-
-	f = s.Field("Y")
-	err = f.Zero()
-	if err != nil {
-		t.Error(err)
-	}
-
-	sliceLen := len(f.Value().([]string))
-	if sliceLen != 0 {
-		t.Errorf("Zeroed values slice length is wrong: %d, want: %d", sliceLen, 0)
-	}
-
-	f = s.Field("C")
-	err = f.Zero()
-	if err != nil {
-		t.Error(err)
-	}
-
-	if f.Value().(bool) {
-		t.Errorf("Zeroed value is wrong: %t want: %t", f.Value().(bool), false)
-	}
-
-	// let's access an unexported field, which should give an error
-	f = s.Field("d")
-	err = f.Zero()
-	if err != errNotExported {
-		t.Error(err)
-	}
-
-	f = s.Field("Bar")
-	err = f.Zero()
-	if err != nil {
-		t.Error(err)
-	}
-
-	f = s.Field("E")
-	err = f.Zero()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v := s.Field("E").value
-	if !v.IsNil() {
-		t.Errorf("could not set baz. Got: %s Want: <nil>", v.Interface())
-	}
-}
-
-func TestField(t *testing.T) {
-	s := newStruct()
-
-	defer func() {
-		err := recover()
-		if err == nil {
-			t.Error("Retrieveing a non existing field from the struct should panic")
-		}
-	}()
-
-	_ = s.Field("no-field")
-}
-
-func TestField_Kind(t *testing.T) {
-	s := newStruct()
-
-	f := s.Field("A")
-	if f.Kind() != reflect.String {
-		t.Errorf("Field A has wrong kind: %s want: %s", f.Kind(), reflect.String)
-	}
-
-	f = s.Field("B")
-	if f.Kind() != reflect.Int {
-		t.Errorf("Field B has wrong kind: %s want: %s", f.Kind(), reflect.Int)
-	}
-
-	// unexported
-	f = s.Field("d")
-	if f.Kind() != reflect.String {
-		t.Errorf("Field d has wrong kind: %s want: %s", f.Kind(), reflect.String)
-	}
-}
-
-func TestField_Tag(t *testing.T) {
-	s := newStruct()
-
-	v := s.Field("B").Tag("json")
-	if v != "" {
-		t.Errorf("Field's tag value of a non existing tag should return empty, got: %s", v)
-	}
-
-	v = s.Field("C").Tag("json")
-	if v != "c" {
-		t.Errorf("Field's tag value of the existing field C should return 'c', got: %s", v)
-	}
-
-	v = s.Field("d").Tag("json")
-	if v != "" {
-		t.Errorf("Field's tag value of a non exported field should return empty, got: %s", v)
-	}
-
-	v = s.Field("x").Tag("xml")
-	if v != "x" {
-		t.Errorf("Field's tag value of a non exported field with a tag should return 'x', got: %s", v)
-	}
-
-	v = s.Field("A").Tag("json")
-	if v != "" {
-		t.Errorf("Field's tag value of a existing field without a tag should return empty, got: %s", v)
-	}
-}
-
-func TestField_Value(t *testing.T) {
-	s := newStruct()
-
-	v := s.Field("A").Value()
-	val, ok := v.(string)
-	if !ok {
-		t.Errorf("Field's value of a A should be string")
-	}
-
-	if val != "gopher" {
-		t.Errorf("Field's value of a existing tag should return 'gopher', got: %s", val)
-	}
-
-	defer func() {
-		err := recover()
-		if err == nil {
-			t.Error("Value of a non exported field from the field should panic")
-		}
-	}()
-
-	// should panic
-	_ = s.Field("d").Value()
-}
-
-func TestField_IsEmbedded(t *testing.T) {
-	s := newStruct()
-
-	if !s.Field("Bar").IsEmbedded() {
-		t.Errorf("Fields 'Bar' field is an embedded field")
-	}
-
-	if s.Field("d").IsEmbedded() {
-		t.Errorf("Fields 'd' field is not an embedded field")
-	}
-}
-
-func TestField_IsExported(t *testing.T) {
-	s := newStruct()
-
-	if !s.Field("Bar").IsExported() {
-		t.Errorf("Fields 'Bar' field is an exported field")
-	}
-
-	if !s.Field("A").IsExported() {
-		t.Errorf("Fields 'A' field is an exported field")
-	}
-
-	if s.Field("d").IsExported() {
-		t.Errorf("Fields 'd' field is not an exported field")
-	}
-}
-
-func TestField_IsZero(t *testing.T) {
-	s := newStruct()
-
-	if s.Field("A").IsZero() {
-		t.Errorf("Fields 'A' field is an initialized field")
-	}
-
-	if !s.Field("B").IsZero() {
-		t.Errorf("Fields 'B' field is not an initialized field")
-	}
-}
-
-func TestField_Name(t *testing.T) {
-	s := newStruct()
-
-	if s.Field("A").Name() != "A" {
-		t.Errorf("Fields 'A' field should have the name 'A'")
-	}
-}
-
-func TestField_Field(t *testing.T) {
-	s := newStruct()
-
-	e := s.Field("Bar").Field("E")
-
-	val, ok := e.Value().(string)
-	if !ok {
-		t.Error("The value of the field 'e' inside 'Bar' struct should be string")
-	}
-
-	if val != "example" {
-		t.Errorf("The value of 'e' should be 'example, got: %s", val)
-	}
-
-	defer func() {
-		err := recover()
-		if err == nil {
-			t.Error("Field of a non existing nested struct should panic")
-		}
-	}()
-
-	_ = s.Field("Bar").Field("e")
-}
-
-func TestField_Fields(t *testing.T) {
-	s := newStruct()
-	fields := s.Field("Bar").Fields()
-
-	if len(fields) != 3 {
-		t.Errorf("We expect 3 fields in embedded struct, was: %d", len(fields))
-	}
-}
-
-func TestField_FieldOk(t *testing.T) {
-	s := newStruct()
-
-	b, ok := s.FieldOk("Bar")
-	if !ok {
-		t.Error("The field 'Bar' should exists.")
-	}
-
-	e, ok := b.FieldOk("E")
-	if !ok {
-		t.Error("The field 'E' should exists.")
-	}
-
-	val, ok := e.Value().(string)
-	if !ok {
-		t.Error("The value of the field 'e' inside 'Bar' struct should be string")
-	}
-
-	if val != "example" {
-		t.Errorf("The value of 'e' should be 'example, got: %s", val)
-	}
-}

vendor/github.com/fatih/structs/structs_example_test.go

@@ -1,351 +0,0 @@
-package structs
-
-import (
-	"fmt"
-	"time"
-)
-
-func ExampleNew() {
-	type Server struct {
-		Name    string
-		ID      int32
-		Enabled bool
-	}
-
-	server := &Server{
-		Name:    "Arslan",
-		ID:      123456,
-		Enabled: true,
-	}
-
-	s := New(server)
-
-	fmt.Printf("Name        : %v\n", s.Name())
-	fmt.Printf("Values      : %v\n", s.Values())
-	fmt.Printf("Value of ID : %v\n", s.Field("ID").Value())
-	// Output:
-	// Name        : Server
-	// Values      : [Arslan 123456 true]
-	// Value of ID : 123456
-
-}
-
-func ExampleMap() {
-	type Server struct {
-		Name    string
-		ID      int32
-		Enabled bool
-	}
-
-	s := &Server{
-		Name:    "Arslan",
-		ID:      123456,
-		Enabled: true,
-	}
-
-	m := Map(s)
-
-	fmt.Printf("%#v\n", m["Name"])
-	fmt.Printf("%#v\n", m["ID"])
-	fmt.Printf("%#v\n", m["Enabled"])
-	// Output:
-	// "Arslan"
-	// 123456
-	// true
-
-}
-
-func ExampleMap_tags() {
-	// Custom tags can change the map keys instead of using the fields name
-	type Server struct {
-		Name    string `structs:"server_name"`
-		ID      int32  `structs:"server_id"`
-		Enabled bool   `structs:"enabled"`
-	}
-
-	s := &Server{
-		Name: "Zeynep",
-		ID:   789012,
-	}
-
-	m := Map(s)
-
-	// access them by the custom tags defined above
-	fmt.Printf("%#v\n", m["server_name"])
-	fmt.Printf("%#v\n", m["server_id"])
-	fmt.Printf("%#v\n", m["enabled"])
-	// Output:
-	// "Zeynep"
-	// 789012
-	// false
-
-}
-
-func ExampleMap_omitNested() {
-	// By default field with struct types are processed too. We can stop
-	// processing them via "omitnested" tag option.
-	type Server struct {
-		Name string    `structs:"server_name"`
-		ID   int32     `structs:"server_id"`
-		Time time.Time `structs:"time,omitnested"` // do not convert to map[string]interface{}
-	}
-
-	const shortForm = "2006-Jan-02"
-	t, _ := time.Parse("2006-Jan-02", "2013-Feb-03")
-
-	s := &Server{
-		Name: "Zeynep",
-		ID:   789012,
-		Time: t,
-	}
-
-	m := Map(s)
-
-	// access them by the custom tags defined above
-	fmt.Printf("%v\n", m["server_name"])
-	fmt.Printf("%v\n", m["server_id"])
-	fmt.Printf("%v\n", m["time"].(time.Time))
-	// Output:
-	// Zeynep
-	// 789012
-	// 2013-02-03 00:00:00 +0000 UTC
-}
-
-func ExampleMap_omitEmpty() {
-	// By default field with struct types of zero values are processed too. We
-	// can stop processing them via "omitempty" tag option.
-	type Server struct {
-		Name     string `structs:",omitempty"`
-		ID       int32  `structs:"server_id,omitempty"`
-		Location string
-	}
-
-	// Only add location
-	s := &Server{
-		Location: "Tokyo",
-	}
-
-	m := Map(s)
-
-	// map contains only the Location field
-	fmt.Printf("%v\n", m)
-	// Output:
-	// map[Location:Tokyo]
-}
-
-func ExampleValues() {
-	type Server struct {
-		Name    string
-		ID      int32
-		Enabled bool
-	}
-
-	s := &Server{
-		Name:    "Fatih",
-		ID:      135790,
-		Enabled: false,
-	}
-
-	m := Values(s)
-
-	fmt.Printf("Values: %+v\n", m)
-	// Output:
-	// Values: [Fatih 135790 false]
-}
-
-func ExampleValues_omitEmpty() {
-	// By default field with struct types of zero values are processed too. We
-	// can stop processing them via "omitempty" tag option.
-	type Server struct {
-		Name     string `structs:",omitempty"`
-		ID       int32  `structs:"server_id,omitempty"`
-		Location string
-	}
-
-	// Only add location
-	s := &Server{
-		Location: "Ankara",
-	}
-
-	m := Values(s)
-
-	// values contains only the Location field
-	fmt.Printf("Values: %+v\n", m)
-	// Output:
-	// Values: [Ankara]
-}
-
-func ExampleValues_tags() {
-	type Location struct {
-		City    string
-		Country string
-	}
-
-	type Server struct {
-		Name     string
-		ID       int32
-		Enabled  bool
-		Location Location `structs:"-"` // values from location are not included anymore
-	}
-
-	s := &Server{
-		Name:     "Fatih",
-		ID:       135790,
-		Enabled:  false,
-		Location: Location{City: "Ankara", Country: "Turkey"},
-	}
-
-	// Let get all values from the struct s. Note that we don't include values
-	// from the Location field
-	m := Values(s)
-
-	fmt.Printf("Values: %+v\n", m)
-	// Output:
-	// Values: [Fatih 135790 false]
-}
-
-func ExampleFields() {
-	type Access struct {
-		Name         string
-		LastAccessed time.Time
-		Number       int
-	}
-
-	s := &Access{
-		Name:         "Fatih",
-		LastAccessed: time.Now(),
-		Number:       1234567,
-	}
-
-	fields := Fields(s)
-
-	for i, field := range fields {
-		fmt.Printf("[%d] %+v\n", i, field.Name())
-	}
-
-	// Output:
-	// [0] Name
-	// [1] LastAccessed
-	// [2] Number
-}
-
-func ExampleFields_nested() {
-	type Person struct {
-		Name   string
-		Number int
-	}
-
-	type Access struct {
-		Person        Person
-		HasPermission bool
-		LastAccessed  time.Time
-	}
-
-	s := &Access{
-		Person:        Person{Name: "fatih", Number: 1234567},
-		LastAccessed:  time.Now(),
-		HasPermission: true,
-	}
-
-	// Let's get all fields from the struct s.
-	fields := Fields(s)
-
-	for _, field := range fields {
-		if field.Name() == "Person" {
-			fmt.Printf("Access.Person.Name: %+v\n", field.Field("Name").Value())
-		}
-	}
-
-	// Output:
-	// Access.Person.Name: fatih
-}
-
-func ExampleField() {
-	type Person struct {
-		Name   string
-		Number int
-	}
-
-	type Access struct {
-		Person        Person
-		HasPermission bool
-		LastAccessed  time.Time
-	}
-
-	access := &Access{
-		Person:        Person{Name: "fatih", Number: 1234567},
-		LastAccessed:  time.Now(),
-		HasPermission: true,
-	}
-
-	// Create a new Struct type
-	s := New(access)
-
-	// Get the Field type for "Person" field
-	p := s.Field("Person")
-
-	// Get the underlying "Name field" and print the value of it
-	name := p.Field("Name")
-
-	fmt.Printf("Value of Person.Access.Name: %+v\n", name.Value())
-
-	// Output:
-	// Value of Person.Access.Name: fatih
-
-}
-
-func ExampleIsZero() {
-	type Server struct {
-		Name    string
-		ID      int32
-		Enabled bool
-	}
-
-	// Nothing is initialized
-	a := &Server{}
-	isZeroA := IsZero(a)
-
-	// Name and Enabled is initialized, but not ID
-	b := &Server{
-		Name:    "Golang",
-		Enabled: true,
-	}
-	isZeroB := IsZero(b)
-
-	fmt.Printf("%#v\n", isZeroA)
-	fmt.Printf("%#v\n", isZeroB)
-	// Output:
-	// true
-	// false
-}
-
-func ExampleHasZero() {
-	// Let's define an Access struct. Note that the "Enabled" field is not
-	// going to be checked because we added the "structs" tag to the field.
-	type Access struct {
-		Name         string
-		LastAccessed time.Time
-		Number       int
-		Enabled      bool `structs:"-"`
-	}
-
-	// Name and Number is not initialized.
-	a := &Access{
-		LastAccessed: time.Now(),
-	}
-	hasZeroA := HasZero(a)
-
-	// Name and Number is initialized.
-	b := &Access{
-		Name:         "Fatih",
-		LastAccessed: time.Now(),
-		Number:       12345,
-	}
-	hasZeroB := HasZero(b)
-
-	fmt.Printf("%#v\n", hasZeroA)
-	fmt.Printf("%#v\n", hasZeroB)
-	// Output:
-	// true
-	// false
-}

vendor/github.com/fatih/structs/tags_test.go

@@ -1,46 +0,0 @@
-package structs
-
-import "testing"
-
-func TestParseTag_Name(t *testing.T) {
-	tags := []struct {
-		tag string
-		has bool
-	}{
-		{"", false},
-		{"name", true},
-		{"name,opt", true},
-		{"name , opt, opt2", false}, // has a single whitespace
-		{", opt, opt2", false},
-	}
-
-	for _, tag := range tags {
-		name, _ := parseTag(tag.tag)
-
-		if (name != "name") && tag.has {
-			t.Errorf("Parse tag should return name: %#v", tag)
-		}
-	}
-}
-
-func TestParseTag_Opts(t *testing.T) {
-	tags := []struct {
-		opts string
-		has  bool
-	}{
-		{"name", false},
-		{"name,opt", true},
-		{"name , opt, opt2", false}, // has a single whitespace
-		{",opt, opt2", true},
-		{", opt3, opt4", false},
-	}
-
-	// search for "opt"
-	for _, tag := range tags {
-		_, opts := parseTag(tag.opts)
-
-		if opts.Has("opt") != tag.has {
-			t.Errorf("Tag opts should have opt: %#v", tag)
-		}
-	}
-}

vendor/github.com/google/go-querystring/query/encode_test.go

@@ -1,328 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package query
-
-import (
-	"fmt"
-	"net/url"
-	"reflect"
-	"testing"
-	"time"
-)
-
-type Nested struct {
-	A   SubNested  `url:"a"`
-	B   *SubNested `url:"b"`
-	Ptr *SubNested `url:"ptr,omitempty"`
-}
-
-type SubNested struct {
-	Value string `url:"value"`
-}
-
-func TestValues_types(t *testing.T) {
-	str := "string"
-	strPtr := &str
-	timeVal := time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC)
-
-	tests := []struct {
-		in   interface{}
-		want url.Values
-	}{
-		{
-			// basic primitives
-			struct {
-				A string
-				B int
-				C uint
-				D float32
-				E bool
-			}{},
-			url.Values{
-				"A": {""},
-				"B": {"0"},
-				"C": {"0"},
-				"D": {"0"},
-				"E": {"false"},
-			},
-		},
-		{
-			// pointers
-			struct {
-				A *string
-				B *int
-				C **string
-				D *time.Time
-			}{
-				A: strPtr,
-				C: &strPtr,
-				D: &timeVal,
-			},
-			url.Values{
-				"A": {str},
-				"B": {""},
-				"C": {str},
-				"D": {"2000-01-01T12:34:56Z"},
-			},
-		},
-		{
-			// slices and arrays
-			struct {
-				A []string
-				B []string `url:",comma"`
-				C []string `url:",space"`
-				D [2]string
-				E [2]string `url:",comma"`
-				F [2]string `url:",space"`
-				G []*string `url:",space"`
-				H []bool    `url:",int,space"`
-				I []string  `url:",brackets"`
-				J []string  `url:",semicolon"`
-				K []string  `url:",numbered"`
-			}{
-				A: []string{"a", "b"},
-				B: []string{"a", "b"},
-				C: []string{"a", "b"},
-				D: [2]string{"a", "b"},
-				E: [2]string{"a", "b"},
-				F: [2]string{"a", "b"},
-				G: []*string{&str, &str},
-				H: []bool{true, false},
-				I: []string{"a", "b"},
-				J: []string{"a", "b"},
-				K: []string{"a", "b"},
-			},
-			url.Values{
-				"A":   {"a", "b"},
-				"B":   {"a,b"},
-				"C":   {"a b"},
-				"D":   {"a", "b"},
-				"E":   {"a,b"},
-				"F":   {"a b"},
-				"G":   {"string string"},
-				"H":   {"1 0"},
-				"I[]": {"a", "b"},
-				"J":   {"a;b"},
-				"K0":  {"a"},
-				"K1":  {"b"},
-			},
-		},
-		{
-			// other types
-			struct {
-				A time.Time
-				B time.Time `url:",unix"`
-				C bool      `url:",int"`
-				D bool      `url:",int"`
-			}{
-				A: time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC),
-				B: time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC),
-				C: true,
-				D: false,
-			},
-			url.Values{
-				"A": {"2000-01-01T12:34:56Z"},
-				"B": {"946730096"},
-				"C": {"1"},
-				"D": {"0"},
-			},
-		},
-		{
-			struct {
-				Nest Nested `url:"nest"`
-			}{
-				Nested{
-					A: SubNested{
-						Value: "that",
-					},
-				},
-			},
-			url.Values{
-				"nest[a][value]": {"that"},
-				"nest[b]":        {""},
-			},
-		},
-		{
-			struct {
-				Nest Nested `url:"nest"`
-			}{
-				Nested{
-					Ptr: &SubNested{
-						Value: "that",
-					},
-				},
-			},
-			url.Values{
-				"nest[a][value]":   {""},
-				"nest[b]":          {""},
-				"nest[ptr][value]": {"that"},
-			},
-		},
-		{
-			nil,
-			url.Values{},
-		},
-	}
-
-	for i, tt := range tests {
-		v, err := Values(tt.in)
-		if err != nil {
-			t.Errorf("%d. Values(%q) returned error: %v", i, tt.in, err)
-		}
-
-		if !reflect.DeepEqual(tt.want, v) {
-			t.Errorf("%d. Values(%q) returned %v, want %v", i, tt.in, v, tt.want)
-		}
-	}
-}
-
-func TestValues_omitEmpty(t *testing.T) {
-	str := ""
-	s := struct {
-		a string
-		A string
-		B string  `url:",omitempty"`
-		C string  `url:"-"`
-		D string  `url:"omitempty"` // actually named omitempty, not an option
-		E *string `url:",omitempty"`
-	}{E: &str}
-
-	v, err := Values(s)
-	if err != nil {
-		t.Errorf("Values(%q) returned error: %v", s, err)
-	}
-
-	want := url.Values{
-		"A":         {""},
-		"omitempty": {""},
-		"E":         {""}, // E is included because the pointer is not empty, even though the string being pointed to is
-	}
-	if !reflect.DeepEqual(want, v) {
-		t.Errorf("Values(%q) returned %v, want %v", s, v, want)
-	}
-}
-
-type A struct {
-	B
-}
-
-type B struct {
-	C string
-}
-
-type D struct {
-	B
-	C string
-}
-
-type e struct {
-	B
-	C string
-}
-
-type F struct {
-	e
-}
-
-func TestValues_embeddedStructs(t *testing.T) {
-	tests := []struct {
-		in   interface{}
-		want url.Values
-	}{
-		{
-			A{B{C: "foo"}},
-			url.Values{"C": {"foo"}},
-		},
-		{
-			D{B: B{C: "bar"}, C: "foo"},
-			url.Values{"C": {"foo", "bar"}},
-		},
-		{
-			F{e{B: B{C: "bar"}, C: "foo"}}, // With unexported embed
-			url.Values{"C": {"foo", "bar"}},
-		},
-	}
-
-	for i, tt := range tests {
-		v, err := Values(tt.in)
-		if err != nil {
-			t.Errorf("%d. Values(%q) returned error: %v", i, tt.in, err)
-		}
-
-		if !reflect.DeepEqual(tt.want, v) {
-			t.Errorf("%d. Values(%q) returned %v, want %v", i, tt.in, v, tt.want)
-		}
-	}
-}
-
-func TestValues_invalidInput(t *testing.T) {
-	_, err := Values("")
-	if err == nil {
-		t.Errorf("expected Values() to return an error on invalid input")
-	}
-}
-
-type EncodedArgs []string
-
-func (m EncodedArgs) EncodeValues(key string, v *url.Values) error {
-	for i, arg := range m {
-		v.Set(fmt.Sprintf("%s.%d", key, i), arg)
-	}
-	return nil
-}
-
-func TestValues_Marshaler(t *testing.T) {
-	s := struct {
-		Args EncodedArgs `url:"arg"`
-	}{[]string{"a", "b", "c"}}
-	v, err := Values(s)
-	if err != nil {
-		t.Errorf("Values(%q) returned error: %v", s, err)
-	}
-
-	want := url.Values{
-		"arg.0": {"a"},
-		"arg.1": {"b"},
-		"arg.2": {"c"},
-	}
-	if !reflect.DeepEqual(want, v) {
-		t.Errorf("Values(%q) returned %v, want %v", s, v, want)
-	}
-}
-
-func TestValues_MarshalerWithNilPointer(t *testing.T) {
-	s := struct {
-		Args *EncodedArgs `url:"arg"`
-	}{}
-	v, err := Values(s)
-	if err != nil {
-		t.Errorf("Values(%q) returned error: %v", s, err)
-	}
-
-	want := url.Values{}
-	if !reflect.DeepEqual(want, v) {
-		t.Errorf("Values(%q) returned %v, want %v", s, v, want)
-	}
-}
-
-func TestTagParsing(t *testing.T) {
-	name, opts := parseTag("field,foobar,foo")
-	if name != "field" {
-		t.Fatalf("name = %q, want field", name)
-	}
-	for _, tt := range []struct {
-		opt  string
-		want bool
-	}{
-		{"foobar", true},
-		{"foo", true},
-		{"bar", false},
-		{"field", false},
-	} {
-		if opts.Contains(tt.opt) != tt.want {
-			t.Errorf("Contains(%q) = %v", tt.opt, !tt.want)
-		}
-	}
-}

vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE

@@ -0,0 +1,9 @@
+(The MIT License)
+
+Copyright (c) 2017 marvin + konsorten GmbH (open-source@konsorten.de)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/github.com/konsorten/go-windows-terminal-sequences/README.md

@@ -0,0 +1,40 @@
+# Windows Terminal Sequences
+
+This library allow for enabling Windows terminal color support for Go.
+
+See [Console Virtual Terminal Sequences](https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences) for details.
+
+## Usage
+
+```go
+import (
+	"syscall"
+	
+	sequences "github.com/konsorten/go-windows-terminal-sequences"
+)
+
+func main() {
+	sequences.EnableVirtualTerminalProcessing(syscall.Stdout, true)
+}
+
+```
+
+## Authors
+
+The tool is sponsored by the [marvin + konsorten GmbH](http://www.konsorten.de).
+
+We thank all the authors who provided code to this library:
+
+* Felix Kollmann
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2018 marvin + konsorten GmbH (open-source@konsorten.de)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod

@@ -0,0 +1 @@
+module github.com/konsorten/go-windows-terminal-sequences

vendor/github.com/konsorten/go-windows-terminal-sequences/sequences.go

@@ -0,0 +1,36 @@
+// +build windows
+
+package sequences
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	kernel32Dll    *syscall.LazyDLL  = syscall.NewLazyDLL("Kernel32.dll")
+	setConsoleMode *syscall.LazyProc = kernel32Dll.NewProc("SetConsoleMode")
+)
+
+func EnableVirtualTerminalProcessing(stream syscall.Handle, enable bool) error {
+	const ENABLE_VIRTUAL_TERMINAL_PROCESSING uint32 = 0x4
+
+	var mode uint32
+	err := syscall.GetConsoleMode(syscall.Stdout, &mode)
+	if err != nil {
+		return err
+	}
+
+	if enable {
+		mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING
+	} else {
+		mode &^= ENABLE_VIRTUAL_TERMINAL_PROCESSING
+	}
+
+	ret, _, err := setConsoleMode.Call(uintptr(unsafe.Pointer(stream)), uintptr(mode))
+	if ret == 0 {
+		return err
+	}
+
+	return nil
+}

vendor/github.com/levigross/grequests/.gitignore

@@ -0,0 +1,27 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
+
+.idea/
+*.iml

vendor/github.com/levigross/grequests/.travis.yml

@@ -0,0 +1,23 @@
+language: go
+
+matrix:
+  fast_finish: true
+  include:
+  - go: 1.7
+  - go: 1.8
+  - go: master
+  allow_failures:
+  - go: master
+before_install:
+  - go get -u -v github.com/axw/gocov/gocov
+  - go get -u -v github.com/mattn/goveralls
+  - go get -u -v github.com/golang/lint/golint
+
+script:
+  - diff -u <(echo -n) <(gofmt -s -d ./)
+  - diff -u <(echo -n) <(go vet ./...)
+  - diff -u <(echo -n) <(golint ./...)
+  - go test -v -race -covermode=atomic -coverprofile=coverage.out
+
+after_success:
+  - goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN

vendor/github.com/levigross/grequests/base_delete_test.go

@@ -1,99 +0,0 @@
-package grequests
-
-import (
-	"net/url"
-	"testing"
-)
-
-func TestBasicDeleteRequest(t *testing.T) {
-	resp, err := Delete("http://httpbin.org/delete", nil)
-
-	if err != nil {
-		t.Error("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-}
-
-func TestDeleteSession(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"two": "three"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"three": "four"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Delete("http://httpbin.org/delete", nil)
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	cookieURL, err := url.Parse("http://httpbin.org")
-	if err != nil {
-		t.Error("We (for some reason) cannot parse the cookie URL")
-	}
-
-	if len(session.HTTPClient.Jar.Cookies(cookieURL)) != 3 {
-		t.Error("Invalid number of cookies provided: ", resp.RawResponse.Cookies())
-	}
-
-	for _, cookie := range session.HTTPClient.Jar.Cookies(cookieURL) {
-		switch cookie.Name {
-		case "one":
-			if cookie.Value != "two" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "two":
-			if cookie.Value != "three" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "three":
-			if cookie.Value != "four" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		default:
-			t.Error("We should not have any other cookies: ", cookie)
-		}
-	}
-
-}
-
-func TestDeleteInvalidURLSession(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Delete("%../dir/", nil); err == nil {
-		t.Error("Some how the request was valid to make request ", err)
-	}
-}

vendor/github.com/levigross/grequests/base_head_test.go

@@ -1,115 +0,0 @@
-package grequests
-
-import (
-	"net/url"
-	"testing"
-)
-
-func TestBasicHeadRequest(t *testing.T) {
-	resp, err := Head("http://httpbin.org/get", nil)
-	if err != nil {
-		t.Error("Unable to make HEAD request: ", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("HEAD request did not return success: ", resp.StatusCode)
-	}
-
-	if resp.Header.Get("Content-Type") != "application/json" {
-		t.Error("Content Type Header is unexpected: ", resp.Header.Get("Content-Type"))
-	}
-}
-
-func TestBasicHeadRequestNoContent(t *testing.T) {
-	resp, err := Head("http://httpbin.org/bytes/0", nil)
-	if err != nil {
-		t.Error("Unable to make HEAD request: ", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("HEAD request did not return success: ", resp.StatusCode)
-	}
-
-	if resp.Header.Get("Content-Type") != "application/octet-stream" {
-		t.Error("Content Type Header is unexpected: ", resp.Header.Get("Content-Type"))
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("Somehow byte buffer is working now (bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("Somehow byte buffer is working now (bytes)", resp.String())
-	}
-}
-
-func TestHeadSession(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Head("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Head("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"two": "three"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Head("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"three": "four"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	cookieURL, err := url.Parse("http://httpbin.org")
-	if err != nil {
-		t.Error("We (for some reason) cannot parse the cookie URL")
-	}
-
-	if len(session.HTTPClient.Jar.Cookies(cookieURL)) != 3 {
-		t.Error("Invalid number of cookies provided: ", session.HTTPClient.Jar.Cookies(cookieURL))
-	}
-
-	for _, cookie := range session.HTTPClient.Jar.Cookies(cookieURL) {
-		switch cookie.Name {
-		case "one":
-			if cookie.Value != "two" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "two":
-			if cookie.Value != "three" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "three":
-			if cookie.Value != "four" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		default:
-			t.Error("We should not have any other cookies: ", cookie)
-		}
-	}
-
-}
-
-func TestHeadInvalidURLSession(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Head("%../dir/", nil); err == nil {
-		t.Error("Some how the request was valid to make request ", err)
-	}
-}

vendor/github.com/levigross/grequests/base_options_test.go

@@ -1,88 +0,0 @@
-package grequests
-
-import (
-	"net/url"
-	"testing"
-)
-
-func TestBasicOPTIONSRequest(t *testing.T) {
-	resp, err := Options("http://httpbin.org/get", nil)
-	if err != nil {
-		t.Error("Unable to make OPTIONS request: ", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Options request did not return success: ", resp.StatusCode)
-	}
-
-	if resp.Header.Get("Access-Control-Allow-Methods") != "GET, POST, PUT, DELETE, PATCH, OPTIONS" {
-		t.Error("Access-Control-Allow-Methods Type Header is unexpected: ", resp.Header)
-	}
-}
-
-func TestOptionsSession(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Options("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Options("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"two": "three"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Options("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"three": "four"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	cookieURL, err := url.Parse("http://httpbin.org")
-	if err != nil {
-		t.Error("We (for some reason) cannot parse the cookie URL")
-	}
-
-	for _, cookie := range session.HTTPClient.Jar.Cookies(cookieURL) {
-		switch cookie.Name {
-		case "one":
-			if cookie.Value != "two" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "two":
-			if cookie.Value != "three" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "three":
-			if cookie.Value != "four" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		default:
-			t.Error("We should not have any other cookies: ", cookie)
-		}
-	}
-
-}
-
-func TestOptionsInvalidURLSession(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Options("%../dir/", nil); err == nil {
-		t.Error("Some how the request was valid to make request ", err)
-	}
-}

vendor/github.com/levigross/grequests/base_patch_test.go

@@ -1,99 +0,0 @@
-package grequests
-
-import (
-	"net/url"
-	"testing"
-)
-
-func TestBasicPatchRequest(t *testing.T) {
-	resp, err := Patch("http://httpbin.org/patch", nil)
-
-	if err != nil {
-		t.Error("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-}
-
-func TestPatchSession(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"two": "three"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"three": "four"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Patch("http://httpbin.org/patch", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK: ", resp.String())
-	}
-
-	cookieURL, err := url.Parse("http://httpbin.org")
-	if err != nil {
-		t.Error("We (for some reason) cannot parse the cookie URL")
-	}
-
-	if len(session.HTTPClient.Jar.Cookies(cookieURL)) != 3 {
-		t.Error("Invalid number of cookies provided: ", session.HTTPClient.Jar.Cookies(cookieURL))
-	}
-
-	for _, cookie := range session.HTTPClient.Jar.Cookies(cookieURL) {
-		switch cookie.Name {
-		case "one":
-			if cookie.Value != "two" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "two":
-			if cookie.Value != "three" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "three":
-			if cookie.Value != "four" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		default:
-			t.Error("We should not have any other cookies: ", cookie)
-		}
-	}
-
-}
-
-func TestPatchInvalidURLSession(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Patch("%../dir/", nil); err == nil {
-		t.Error("Some how the request was valid to make request ", err)
-	}
-}

vendor/github.com/levigross/grequests/base_post_test.go

@@ -1,948 +0,0 @@
-package grequests
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"io"
-	"math"
-	"net/url"
-	"os"
-	"strings"
-	"testing"
-)
-
-type BasicPostResponse struct {
-	Args  struct{} `json:"args"`
-	Data  string   `json:"data"`
-	Files struct{} `json:"files"`
-	Form  struct {
-		One string `json:"one"`
-	} `json:"form"`
-	Headers struct {
-		Accept        string `json:"Accept"`
-		ContentLength string `json:"Content-Length"`
-		ContentType   string `json:"Content-Type"`
-		Host          string `json:"Host"`
-		UserAgent     string `json:"User-Agent"`
-	} `json:"headers"`
-	JSON   interface{} `json:"json"`
-	Origin string      `json:"origin"`
-	URL    string      `json:"url"`
-}
-
-type BasicPostJSONResponse struct {
-	Args    struct{} `json:"args"`
-	Data    string   `json:"data"`
-	Files   struct{} `json:"files"`
-	Form    struct{} `json:"form"`
-	Headers struct {
-		AcceptEncoding string `json:"Accept-Encoding"`
-		ContentLength  string `json:"Content-Length"`
-		ContentType    string `json:"Content-Type"`
-		Host           string `json:"Host"`
-		UserAgent      string `json:"User-Agent"`
-		XRequestedWith string `json:"X-Requested-With"`
-	} `json:"headers"`
-	JSON struct {
-		One string `json:"One"`
-	} `json:"json"`
-	Origin string `json:"origin"`
-	URL    string `json:"url"`
-}
-
-type BasicMultiFileUploadResponse struct {
-	Args  struct{} `json:"args"`
-	Data  string   `json:"data"`
-	Files struct {
-		File1 string `json:"file1"`
-		File2 string `json:"file2"`
-	} `json:"files"`
-	Form struct {
-		One string `json:"One"`
-	} `json:"form"`
-	Headers struct {
-		AcceptEncoding string `json:"Accept-Encoding"`
-		ContentLength  string `json:"Content-Length"`
-		ContentType    string `json:"Content-Type"`
-		Host           string `json:"Host"`
-		UserAgent      string `json:"User-Agent"`
-	} `json:"headers"`
-	JSON   interface{} `json:"json"`
-	Origin string      `json:"origin"`
-	URL    string      `json:"url"`
-}
-
-type BasicPostFileUpload struct {
-	Args  struct{} `json:"args"`
-	Data  string   `json:"data"`
-	Files struct {
-		File string `json:"file"`
-	} `json:"files"`
-	Form struct {
-		One string `json:"one"`
-	} `json:"form"`
-	Headers struct {
-		AcceptEncoding string `json:"Accept-Encoding"`
-		ContentLength  string `json:"Content-Length"`
-		ContentType    string `json:"Content-Type"`
-		Host           string `json:"Host"`
-		UserAgent      string `json:"User-Agent"`
-	} `json:"headers"`
-	JSON   interface{} `json:"json"`
-	Origin string      `json:"origin"`
-	URL    string      `json:"url"`
-}
-
-type XMLPostMessage struct {
-	Name   string
-	Age    int
-	Height int
-}
-
-type dataAndErrorBuffer struct {
-	err error
-	bytes.Buffer
-}
-
-func (dataAndErrorBuffer) Close() error { return nil }
-
-func (r dataAndErrorBuffer) Read(p []byte) (n int, err error) {
-	return 0, r.err
-}
-
-func TestBasicPostRequest(t *testing.T) {
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{Data: map[string]string{"One": "Two"}})
-	verifyOkPostResponse(resp, t)
-
-}
-
-func TestBasicRegularPostRequest(t *testing.T) {
-	resp, err := Post("http://httpbin.org/post",
-		&RequestOptions{Data: map[string]string{"One": "Two"}})
-
-	if err != nil {
-		t.Error("Cannot post: ", err)
-	}
-
-	verifyOkPostResponse(resp, t)
-
-}
-
-func TestBasicPostRequestInvalidURL(t *testing.T) {
-	resp, _ := Post("%../dir/",
-		&RequestOptions{Data: map[string]string{"One": "Two"},
-			Params: map[string]string{"1": "2"}})
-
-	if resp.Error == nil {
-		t.Error("Somehow the request went through")
-	}
-
-}
-
-func TestBasicPostRequestInvalidURLNoParams(t *testing.T) {
-	resp, _ := Post("%../dir/", &RequestOptions{Data: map[string]string{"One": "Two"}})
-
-	if resp.Error == nil {
-		t.Error("Somehow the request went through")
-	}
-
-}
-
-func TestSessionPostRequestInvalidURLNoParams(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Post("%../dir/", &RequestOptions{Data: map[string]string{"One": "Two"}}); err == nil {
-		t.Error("Somehow the request went through")
-	}
-
-}
-
-func TestXMLPostRequestInvalidURL(t *testing.T) {
-	resp, _ := Post("%../dir/",
-		&RequestOptions{XML: XMLPostMessage{Name: "Human", Age: 1, Height: 1}})
-
-	if resp.Error == nil {
-		t.Error("Somehow the request went through")
-	}
-}
-
-func TestXMLSessionPostRequestInvalidURL(t *testing.T) {
-	session := NewSession(nil)
-
-	_, err := session.Post("%../dir/",
-		&RequestOptions{XML: XMLPostMessage{Name: "Human", Age: 1, Height: 1}})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-}
-
-func TestBasicPostJsonRequestInvalidURL(t *testing.T) {
-	_, err := Post("%../dir/",
-		&RequestOptions{JSON: map[string]string{"One": "Two"}, IsAjax: true})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-}
-
-func TestSessionPostJsonRequestInvalidURL(t *testing.T) {
-	session := NewSession(nil)
-
-	_, err := session.Post("%../dir/",
-		&RequestOptions{JSON: map[string]string{"One": "Two"}, IsAjax: true})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-}
-
-func TestBasicPostJsonRequestInvalidJSON(t *testing.T) {
-	resp, err := Post("http://httpbin.org/post",
-		&RequestOptions{JSON: math.NaN(), IsAjax: true})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-
-	if resp.Ok == true {
-		t.Error("Somehow the request is OK")
-	}
-}
-
-func TestSessionPostJsonRequestInvalidJSON(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Post("http://httpbin.org/post",
-		&RequestOptions{JSON: math.NaN(), IsAjax: true})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-
-	if resp.Ok == true {
-		t.Error("Somehow the request is OK")
-	}
-}
-
-func TestBasicPostJsonRequestInvalidXML(t *testing.T) {
-	resp, err := Post("http://httpbin.org/post",
-		&RequestOptions{XML: map[string]string{"One": "two"}, IsAjax: true})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-
-	if resp.Ok == true {
-		t.Error("Somehow the request is OK")
-	}
-}
-
-func TestSessionPostJsonRequestInvalidXML(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Post("http://httpbin.org/post",
-		&RequestOptions{XML: map[string]string{"One": "two"}, IsAjax: true})
-
-	if err == nil {
-		t.Error("Somehow the request went through")
-	}
-
-	if resp.Ok == true {
-		t.Error("Somehow the request is OK")
-	}
-}
-
-func TestBasicPostRequestUploadInvalidURL(t *testing.T) {
-
-	fd, err := FileUploadFromDisk("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	defer fd[0].FileContents.Close()
-
-	resp, _ := Post("%../dir/",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if resp.Error == nil {
-		t.Fatal("Somehow able to make the request")
-	}
-}
-
-func TestSessionPostRequestUploadInvalidURL(t *testing.T) {
-	session := NewSession(nil)
-
-	fd, err := FileUploadFromDisk("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	defer fd[0].FileContents.Close()
-
-	_, err = session.Post("%../dir/",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err == nil {
-		t.Fatal("Somehow able to make the request")
-	}
-}
-
-func TestBasicPostRequestUploadInvalidFileUpload(t *testing.T) {
-
-	resp, _ := Post("%../dir/",
-		&RequestOptions{
-			Files: []FileUpload{{FileName: `\x00%'"üfdsufhid\Ä\"D\\\"JS%25//'"H•\\\\'"¶•ªç∂\uf8\x8AKÔÓÔ`, FileContents: nil}},
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if resp.Error == nil {
-		t.Fatal("Somehow able to make the request")
-	}
-}
-
-func TestSessionPostRequestUploadInvalidFileUpload(t *testing.T) {
-	session := NewSession(nil)
-	_, err := session.Post("%../dir/",
-		&RequestOptions{
-			Files: []FileUpload{{FileName: "üfdsufhidÄDJSHAKÔÓÔ", FileContents: nil}},
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err == nil {
-		t.Fatal("Somehow able to make the request")
-	}
-}
-
-func TestXMLPostRequest(t *testing.T) {
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{XML: XMLPostMessage{Name: "Human", Age: 1, Height: 1}})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	myXMLStruct := &XMLPostMessage{}
-
-	xml.Unmarshal([]byte(myJSONStruct.Data), myXMLStruct)
-
-	if myXMLStruct.Age != 1 {
-		t.Errorf("Unable to serialize XML response from within JSON %#v ", myXMLStruct)
-	}
-
-}
-
-func TestXMLPostRequestReaderBody(t *testing.T) {
-	msg := XMLPostMessage{Name: "Human", Age: 1, Height: 1}
-	derBytes, err := xml.Marshal(msg)
-	if err != nil {
-		t.Fatal("Unable to marshal XML", err)
-	}
-
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{RequestBody: bytes.NewReader(derBytes)})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	myXMLStruct := &XMLPostMessage{}
-
-	xml.Unmarshal([]byte(myJSONStruct.Data), myXMLStruct)
-
-	if myXMLStruct.Age != 1 {
-		t.Errorf("Unable to serialize XML response from within JSON %#v ", myXMLStruct)
-	}
-
-}
-
-func TestXMLMarshaledStringPostRequest(t *testing.T) {
-	xmlStruct := XMLPostMessage{Name: "Human", Age: 1, Height: 1}
-	encoded, _ := xml.Marshal(xmlStruct)
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{XML: string(encoded)})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to response to JSON", err)
-	}
-
-	if myJSONStruct.Data != string(encoded) {
-		t.Error("Response is not valid", myJSONStruct.Data, string(encoded))
-	}
-}
-
-func TestXMLMarshaledBytesPostRequest(t *testing.T) {
-	xmlStruct := XMLPostMessage{Name: "Human", Age: 1, Height: 1}
-	encoded, _ := xml.Marshal(xmlStruct)
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{XML: encoded})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to response to JSON", err)
-	}
-
-	if myJSONStruct.Data != string(encoded) {
-		t.Error("Response is not valid", myJSONStruct.Data, string(encoded))
-	}
-}
-
-func TestXMLNilPostRequest(t *testing.T) {
-	resp, _ := Post("http://httpbin.org/post", &RequestOptions{XML: nil})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to response to JSON", err)
-	}
-
-	if myJSONStruct.Data != "" {
-		t.Error("Response is not valid", myJSONStruct.Data)
-	}
-}
-
-func TestBasicPostRequestUploadErrorReader(t *testing.T) {
-	var rd dataAndErrorBuffer
-	rd.err = fmt.Errorf("Random Error")
-	_, err := Post("http://httpbin.org/post",
-		&RequestOptions{
-			Files: []FileUpload{{FileName: "Random.test", FileContents: rd}},
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err == nil {
-		t.Error("Somehow our test didn't fail...")
-	}
-}
-
-func TestBasicPostRequestUploadErrorEOFReader(t *testing.T) {
-	var rd dataAndErrorBuffer
-	rd.err = io.EOF
-	_, err := Post("http://httpbin.org/post",
-		&RequestOptions{
-			Files: []FileUpload{{FileName: "Random.test", FileContents: rd}},
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err != nil {
-		t.Error("Somehow our test didn't fail... ", err)
-	}
-}
-
-func TestBasicPostRequestUpload(t *testing.T) {
-
-	fd, err := FileUploadFromDisk("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostFileUpload{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.Files.File != "saucy sauce" {
-		t.Error("File upload contents have been modified: ", myJSONStruct.Files.File)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	if myJSONStruct.Form.One != "Two" {
-		t.Error("Unable to parse form properly", myJSONStruct.Form)
-	}
-}
-
-func TestBasicPostRequestUploadWithMime(t *testing.T) {
-
-	fd, err := os.Open("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{
-			Files: []FileUpload{{FileContents: fd, FileMime: "text/plain"}},
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostFileUpload{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.Files.File != "saucy sauce" {
-		t.Error("File upload contents have been modified: ", myJSONStruct.Files.File)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	if myJSONStruct.Form.One != "Two" {
-		t.Error("Unable to parse form properly", myJSONStruct.Form)
-	}
-
-	// TODO: Ensure file field contains correct content-type, field, and
-	// filename information as soon as
-	// https://github.com/kennethreitz/httpbin/pull/388 gets merged
-	// (Or figure out a way to test this case the PR is rejected)
-}
-
-func TestBasicPostRequestUploadMultipleFiles(t *testing.T) {
-
-	fd, err := FileUploadFromGlob("testdata/*")
-
-	if err != nil {
-		t.Error("Unable to glob file: ", err)
-	}
-
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicMultiFileUploadResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.Files.File2 != "saucy sauce" {
-		t.Error("File upload contents have been modified: ", myJSONStruct.Files.File2)
-	}
-	if myJSONStruct.Files.File1 != "I am just here to test the glob" {
-		t.Error("File upload contents have been modified: ", myJSONStruct.Files.File1)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	if myJSONStruct.Form.One != "Two" {
-		t.Error("Unable to parse form properly", myJSONStruct.Form)
-	}
-
-}
-
-func TestBasicPostJsonBytesRequest(t *testing.T) {
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{JSON: []byte(`{"One":"Two"}`), IsAjax: true})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.JSON.One != "Two" {
-		t.Error("Invalid post response: ", myJSONStruct.JSON.One)
-	}
-
-	if strings.TrimSpace(myJSONStruct.Data) != `{"One":"Two"}` {
-		t.Error("JSON not properly returned: ", myJSONStruct.Data)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	if myJSONStruct.Headers.XRequestedWith != "XMLHttpRequest" {
-		t.Error("Invalid requested header: ", myJSONStruct.Headers.XRequestedWith)
-	}
-
-}
-
-func TestBasicPostJsonStringRequest(t *testing.T) {
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{JSON: `{"One":"Two"}`, IsAjax: true})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.JSON.One != "Two" {
-		t.Error("Invalid post response: ", myJSONStruct.JSON.One)
-	}
-
-	if strings.TrimSpace(myJSONStruct.Data) != `{"One":"Two"}` {
-		t.Error("JSON not properly returned: ", myJSONStruct.Data)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	if myJSONStruct.Headers.XRequestedWith != "XMLHttpRequest" {
-		t.Error("Invalid requested header: ", myJSONStruct.Headers.XRequestedWith)
-	}
-
-}
-
-func TestBasicPostJsonRequest(t *testing.T) {
-	resp, _ := Post("http://httpbin.org/post",
-		&RequestOptions{JSON: map[string]string{"One": "Two"}, IsAjax: true})
-
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostJSONResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.JSON.One != "Two" {
-		t.Error("Invalid post response: ", myJSONStruct.JSON.One)
-	}
-
-	if strings.TrimSpace(myJSONStruct.Data) != `{"One":"Two"}` {
-		t.Error("JSON not properly returned: ", myJSONStruct.Data)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	if myJSONStruct.Headers.XRequestedWith != "XMLHttpRequest" {
-		t.Error("Invalid requested header: ", myJSONStruct.Headers.XRequestedWith)
-	}
-
-}
-
-func TestPostSession(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"two": "three"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"three": "four"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Post("http://httpbin.org/post", &RequestOptions{Data: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	cookieURL, err := url.Parse("http://httpbin.org")
-	if err != nil {
-		t.Error("We (for some reason) cannot parse the cookie URL")
-	}
-
-	if len(session.HTTPClient.Jar.Cookies(cookieURL)) != 3 {
-		t.Error("Invalid number of cookies provided: ", session.HTTPClient.Jar.Cookies(cookieURL))
-	}
-
-	for _, cookie := range session.HTTPClient.Jar.Cookies(cookieURL) {
-		switch cookie.Name {
-		case "one":
-			if cookie.Value != "two" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "two":
-			if cookie.Value != "three" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "three":
-			if cookie.Value != "four" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		default:
-			t.Error("We should not have any other cookies: ", cookie)
-		}
-	}
-
-}
-
-// verifyResponse will verify the following conditions
-// 1. The request didn't return an error
-// 2. The response returned an OK (a status code within the 200 range)
-// 3. The output can be coerced to JSON (this may change later)
-// It should only be run when testing GET request to http://httpbin.org/post expecting JSON
-func verifyOkPostResponse(resp *Response, t *testing.T) *BasicPostResponse {
-	if resp.Error != nil {
-		t.Fatal("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	myJSONStruct := &BasicPostResponse{}
-
-	if err := resp.JSON(myJSONStruct); err != nil {
-		t.Error("Unable to coerce to JSON", err)
-	}
-
-	if myJSONStruct.URL != "http://httpbin.org/post" {
-		t.Error("For some reason the URL isn't the same", myJSONStruct.URL)
-	}
-
-	if myJSONStruct.Headers.Host != "httpbin.org" {
-		t.Error("The host header is invalid")
-	}
-
-	if myJSONStruct.Form.One != "Two" {
-		t.Errorf("Invalid post response: %#v", myJSONStruct.Form)
-	}
-
-	if resp.Bytes() != nil {
-		t.Error("JSON decoding did not fully consume the response stream (Bytes)", resp.Bytes())
-	}
-
-	if resp.String() != "" {
-		t.Error("JSON decoding did not fully consume the response stream (String)", resp.String())
-	}
-
-	if resp.StatusCode != 200 {
-		t.Error("Response returned a non-200 code")
-	}
-
-	return myJSONStruct
-}
-
-func TestPostInvalidURLSession(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Post("%../dir/", nil); err == nil {
-		t.Error("Some how the request was valid to make request ", err)
-	}
-}

vendor/github.com/levigross/grequests/base_put_test.go

@@ -1,163 +0,0 @@
-package grequests
-
-import (
-	"net/url"
-	"testing"
-)
-
-func TestBasicPutRequest(t *testing.T) {
-	resp, err := Put("http://httpbin.org/put", nil)
-
-	if err != nil {
-		t.Error("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-}
-
-func TestBasicPutUploadRequest(t *testing.T) {
-	t.Skip("httpbin.org is broken, as of https://github.com/kennethreitz/httpbin/issues/340#issuecomment-330176449")
-
-	fd, err := FileUploadFromDisk("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	resp, _ := Put("http://httpbin.org/put",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if resp.Error != nil {
-		t.Error("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-}
-
-func TestBasicPutUploadRequestInvalidURL(t *testing.T) {
-	fd, err := FileUploadFromDisk("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	_, err = Put("%../dir/",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err == nil {
-		t.Fatal("Somehow able to make the request")
-	}
-}
-
-func TestSessionPutUploadRequestInvalidURL(t *testing.T) {
-	fd, err := FileUploadFromDisk("testdata/mypassword")
-
-	if err != nil {
-		t.Error("Unable to open file: ", err)
-	}
-
-	session := NewSession(nil)
-
-	_, err = session.Put("%../dir/",
-		&RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err == nil {
-		t.Fatal("Somehow able to make the request")
-	}
-}
-
-func TestPutSession(t *testing.T) {
-	session := NewSession(nil)
-
-	resp, err := session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"two": "three"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Get("http://httpbin.org/cookies/set", &RequestOptions{Params: map[string]string{"three": "four"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	resp, err = session.Put("http://httpbin.org/put", &RequestOptions{Data: map[string]string{"one": "two"}})
-
-	if err != nil {
-		t.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		t.Error("Request did not return OK")
-	}
-
-	cookieURL, err := url.Parse("http://httpbin.org")
-	if err != nil {
-		t.Error("We (for some reason) cannot parse the cookie URL")
-	}
-
-	if len(session.HTTPClient.Jar.Cookies(cookieURL)) != 3 {
-		t.Error("Invalid number of cookies provided: ", session.HTTPClient.Jar.Cookies(cookieURL))
-	}
-
-	for _, cookie := range session.HTTPClient.Jar.Cookies(cookieURL) {
-		switch cookie.Name {
-		case "one":
-			if cookie.Value != "two" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "two":
-			if cookie.Value != "three" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		case "three":
-			if cookie.Value != "four" {
-				t.Error("Cookie value is not valid", cookie)
-			}
-		default:
-			t.Error("We should not have any other cookies: ", cookie)
-		}
-	}
-
-}
-
-func TestPutInvalidURLSession(t *testing.T) {
-	session := NewSession(nil)
-
-	if _, err := session.Put("%../dir/", nil); err == nil {
-		t.Error("Some how the request was valid to make request ", err)
-	}
-}

vendor/github.com/levigross/grequests/example_test.go

@@ -1,323 +0,0 @@
-package grequests_test
-
-import (
-	"encoding/xml"
-	"io"
-	"log"
-	"net/http"
-	"net/url"
-
-	"github.com/levigross/grequests"
-)
-
-func Example_basicGet() {
-	// This is a very basic GET request
-	resp, err := grequests.Get("http://httpbin.org/get", nil)
-
-	if err != nil {
-		log.Println(err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	log.Println(resp.String())
-}
-
-func Example_basicGetCustomHTTPClient() {
-	// This is a very basic GET request
-	resp, err := grequests.Get("http://httpbin.org/get", &grequests.RequestOptions{HTTPClient: http.DefaultClient})
-
-	if err != nil {
-		log.Println(err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	log.Println(resp.String())
-}
-
-func Example_proxy() {
-	proxyURL, err := url.Parse("http://127.0.0.1:8080") // Proxy URL
-	if err != nil {
-		log.Panicln(err)
-	}
-
-	resp, err := grequests.Get("http://www.levigross.com/",
-		&grequests.RequestOptions{Proxies: map[string]*url.URL{proxyURL.Scheme: proxyURL}})
-
-	if err != nil {
-		log.Println(err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	log.Println(resp)
-}
-
-func Example_cookies() {
-	resp, err := grequests.Get("http://httpbin.org/cookies",
-		&grequests.RequestOptions{
-			Cookies: []*http.Cookie{
-				{
-					Name:     "TestCookie",
-					Value:    "Random Value",
-					HttpOnly: true,
-					Secure:   false,
-				}, {
-					Name:     "AnotherCookie",
-					Value:    "Some Value",
-					HttpOnly: true,
-					Secure:   false,
-				},
-			},
-		})
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	log.Println(resp.String())
-}
-
-func Example_session() {
-	session := grequests.NewSession(nil)
-
-	resp, err := session.Get("http://httpbin.org/cookies/set", &grequests.RequestOptions{Params: map[string]string{"one": "two"}})
-
-	if err != nil {
-		log.Fatal("Cannot set cookie: ", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	log.Println(resp.String())
-
-}
-
-func Example_parse_XML() {
-	type GetXMLSample struct {
-		XMLName xml.Name `xml:"slideshow"`
-		Title   string   `xml:"title,attr"`
-		Date    string   `xml:"date,attr"`
-		Author  string   `xml:"author,attr"`
-		Slide   []struct {
-			Type  string `xml:"type,attr"`
-			Title string `xml:"title"`
-		} `xml:"slide"`
-	}
-
-	resp, err := grequests.Get("http://httpbin.org/xml", nil)
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	userXML := &GetXMLSample{}
-
-	// func xmlASCIIDecoder(charset string, input io.Reader) (io.Reader, error) {
-	// 	return input, nil
-	// }
-
-	// If the server returns XML encoded in another charset (not UTF-8) – you
-	// must provide an encoder function that looks like the one I wrote above.
-
-	// If you an consuming UTF-8 just pass `nil` into the second arg
-	if err := resp.XML(userXML, xmlASCIIDecoder); err != nil {
-		log.Println("Unable to consume the response as XML: ", err)
-	}
-
-	if userXML.Title != "Sample Slide Show" {
-		log.Printf("Invalid XML serialization %#v", userXML)
-	}
-}
-
-func Example_customUserAgent() {
-	ro := &grequests.RequestOptions{UserAgent: "LeviBot 0.1"}
-	resp, err := grequests.Get("http://httpbin.org/get", ro)
-
-	if err != nil {
-		log.Fatal("Oops something went wrong: ", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	log.Println(resp.String())
-}
-
-func Example_basicAuth() {
-	ro := &grequests.RequestOptions{Auth: []string{"Levi", "Bot"}}
-	resp, err := grequests.Get("http://httpbin.org/get", ro)
-	// Not the usual JSON so copy and paste from below
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_customHTTPHeader() {
-	ro := &grequests.RequestOptions{UserAgent: "LeviBot 0.1",
-		Headers: map[string]string{"X-Wonderful-Header": "1"}}
-	resp, err := grequests.Get("http://httpbin.org/get", ro)
-	// Not the usual JSON so copy and paste from below
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_acceptInvalidTLSCert() {
-	ro := &grequests.RequestOptions{InsecureSkipVerify: true}
-	resp, err := grequests.Get("https://www.pcwebshop.co.uk/", ro)
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_urlQueryParams() {
-	ro := &grequests.RequestOptions{
-		Params: map[string]string{"Hello": "World", "Goodbye": "World"},
-	}
-	resp, err := grequests.Get("http://httpbin.org/get", ro)
-	// url will now be http://httpbin.org/get?hello=world&goodbye=world
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_downloadFile() {
-	resp, err := grequests.Get("http://httpbin.org/get", nil)
-
-	if err != nil {
-		log.Println("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-	if err := resp.DownloadToFile("randomFile"); err != nil {
-		log.Println("Unable to download to file: ", err)
-	}
-
-	if err != nil {
-		log.Println("Unable to download file", err)
-	}
-
-}
-
-func Example_postForm() {
-	resp, err := grequests.Post("http://httpbin.org/post",
-		&grequests.RequestOptions{Data: map[string]string{"One": "Two"}})
-
-	// This is the basic form POST. The request body will be `one=two`
-
-	if err != nil {
-		log.Println("Cannot post: ", err)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_postXML() {
-
-	type XMLPostMessage struct {
-		Name   string
-		Age    int
-		Height int
-	}
-
-	resp, err := grequests.Post("http://httpbin.org/post",
-		&grequests.RequestOptions{XML: XMLPostMessage{Name: "Human", Age: 1, Height: 1}})
-	// The request body will contain the XML generated by the `XMLPostMessage` struct
-
-	if err != nil {
-		log.Println("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_postFileUpload() {
-
-	fd, err := grequests.FileUploadFromDisk("test_files/mypassword")
-
-	if err != nil {
-		log.Println("Unable to open file: ", err)
-	}
-
-	// This will upload the file as a multipart mime request
-	resp, err := grequests.Post("http://httpbin.org/post",
-		&grequests.RequestOptions{
-			Files: fd,
-			Data:  map[string]string{"One": "Two"},
-		})
-
-	if err != nil {
-		log.Println("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-}
-
-func Example_postJSONAJAX() {
-	resp, err := grequests.Post("http://httpbin.org/post",
-		&grequests.RequestOptions{
-			JSON:   map[string]string{"One": "Two"},
-			IsAjax: true, // this adds the X-Requested-With: XMLHttpRequest header
-		})
-
-	if err != nil {
-		log.Println("Unable to make request", resp.Error)
-	}
-
-	if resp.Ok != true {
-		log.Println("Request did not return OK")
-	}
-
-}
-
-func xmlASCIIDecoder(charset string, input io.Reader) (io.Reader, error) {
-	return input, nil
-}

vendor/github.com/levigross/grequests/file_upload_test.go

@@ -1,53 +0,0 @@
-package grequests
-
-import "testing"
-
-func TestErrorOpenFile(t *testing.T) {
-	fd, err := FileUploadFromDisk("I am Not A File")
-	if err == nil {
-		t.Error("We are not getting an error back from our non existent file: ")
-	}
-
-	if fd != nil {
-		t.Error("We actually got back a pointer: ", fd)
-	}
-}
-
-func TestGLOBFiles(t *testing.T) {
-	fd, err := FileUploadFromGlob("testdata/*")
-
-	if err != nil {
-		t.Error("Got an invalid GLOB: ", err)
-	}
-
-	if len(fd) != 2 {
-		t.Error("Some how we have more than two files in our glob", len(fd), fd)
-	}
-}
-
-func TestInvalidGlob(t *testing.T) {
-	if _, err := FileUploadFromGlob("[-]"); err == nil {
-		t.Error("Somehow the glob worked")
-	}
-}
-
-func TestNoGlobFiles(t *testing.T) {
-	if _, err := FileUploadFromGlob("notapath"); err == nil {
-		t.Error("Somehow got a valid GLOB")
-	}
-}
-
-func TestGlobWithDir(t *testing.T) {
-	fd, err := FileUploadFromGlob("*test*")
-
-	if err != nil {
-		t.Error("Glob failed", err)
-	}
-
-	for _, f := range fd {
-		if f.FileName == "test_files" {
-			t.Error(f, "is a dir (which cannot be uploaded)")
-		}
-	}
-
-}

vendor/github.com/levigross/grequests/request_test.go

@@ -1,39 +0,0 @@
-package grequests
-
-import "testing"
-
-func TestAddQueryStringParams(t *testing.T) {
-	userURL, err := buildURLParams("https://www.google.com/", map[string]string{"1": "2", "3": "4"})
-
-	if err != nil {
-		t.Error("URL Parse Error: ", err)
-	}
-
-	if userURL != "https://www.google.com/?1=2&3=4" {
-		t.Error("URL params not properly built", userURL)
-	}
-}
-
-func TestSortAddQueryStringParams(t *testing.T) {
-	userURL, err := buildURLParams("https://www.google.com/", map[string]string{"3": "4", "1": "2"})
-
-	if err != nil {
-		t.Error("URL Parse Error: ", err)
-	}
-
-	if userURL != "https://www.google.com/?1=2&3=4" {
-		t.Error("URL params not properly built and sorted", userURL)
-	}
-}
-
-func TestAddQueryStringParamsExistingParam(t *testing.T) {
-	userURL, err := buildURLParams("https://www.google.com/?5=6", map[string]string{"3": "4", "1": "2"})
-
-	if err != nil {
-		t.Error("URL Parse Error: ", err)
-	}
-
-	if userURL != "https://www.google.com/?1=2&3=4&5=6" {
-		t.Error("URL params not properly built and sorted", userURL)
-	}
-}

vendor/github.com/levigross/grequests/response_test.go

@@ -1,26 +0,0 @@
-package grequests
-
-import (
-	"strconv"
-	"testing"
-)
-
-func TestResponseOk(t *testing.T) {
-	status := []int{200, 201, 202, 203, 204, 205, 206, 207, 208, 226}
-	for _, status := range status {
-		verifyResponseOkForStatus(status, t)
-	}
-}
-
-func verifyResponseOkForStatus(status int, t *testing.T) {
-	url := "http://httpbin.org/status/" + strconv.Itoa(status)
-	resp, err := Get(url, nil)
-
-	if err != nil {
-		t.Error("Unable to make request", err)
-	}
-
-	if resp.Ok != true {
-		t.Errorf("Request did not return OK. Received status code %d rather a 2xx.", resp.StatusCode)
-	}
-}

vendor/github.com/levigross/grequests/testdata/herefortheglob

@@ -1 +0,0 @@
-I am just here to test the glob

vendor/github.com/levigross/grequests/testdata/mypassword

@@ -1 +0,0 @@
-saucy sauce

vendor/github.com/levigross/grequests/utils_test.go

@@ -1 +0,0 @@
-package grequests

vendor/github.com/pkg/errors/.gitignore

@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof

vendor/github.com/pkg/errors/.travis.yml

@@ -0,0 +1,15 @@
+language: go
+go_import_path: github.com/pkg/errors
+go:
+  - 1.4.x
+  - 1.5.x
+  - 1.6.x
+  - 1.7.x
+  - 1.8.x
+  - 1.9.x
+  - 1.10.x
+  - 1.11.x
+  - tip
+
+script:
+  - go test -v ./...

vendor/github.com/pkg/errors/bench_test.go

@@ -1,63 +0,0 @@
-// +build go1.7
-
-package errors
-
-import (
-	"fmt"
-	"testing"
-
-	stderrors "errors"
-)
-
-func noErrors(at, depth int) error {
-	if at >= depth {
-		return stderrors.New("no error")
-	}
-	return noErrors(at+1, depth)
-}
-
-func yesErrors(at, depth int) error {
-	if at >= depth {
-		return New("ye error")
-	}
-	return yesErrors(at+1, depth)
-}
-
-// GlobalE is an exported global to store the result of benchmark results,
-// preventing the compiler from optimising the benchmark functions away.
-var GlobalE error
-
-func BenchmarkErrors(b *testing.B) {
-	type run struct {
-		stack int
-		std   bool
-	}
-	runs := []run{
-		{10, false},
-		{10, true},
-		{100, false},
-		{100, true},
-		{1000, false},
-		{1000, true},
-	}
-	for _, r := range runs {
-		part := "pkg/errors"
-		if r.std {
-			part = "errors"
-		}
-		name := fmt.Sprintf("%s-stack-%d", part, r.stack)
-		b.Run(name, func(b *testing.B) {
-			var err error
-			f := yesErrors
-			if r.std {
-				f = noErrors
-			}
-			b.ReportAllocs()
-			for i := 0; i < b.N; i++ {
-				err = f(0, r.stack)
-			}
-			b.StopTimer()
-			GlobalE = err
-		})
-	}
-}

vendor/github.com/pkg/errors/errors_test.go

@@ -1,251 +0,0 @@
-package errors
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-	"testing"
-)
-
-func TestNew(t *testing.T) {
-	tests := []struct {
-		err  string
-		want error
-	}{
-		{"", fmt.Errorf("")},
-		{"foo", fmt.Errorf("foo")},
-		{"foo", New("foo")},
-		{"string with format specifiers: %v", errors.New("string with format specifiers: %v")},
-	}
-
-	for _, tt := range tests {
-		got := New(tt.err)
-		if got.Error() != tt.want.Error() {
-			t.Errorf("New.Error(): got: %q, want %q", got, tt.want)
-		}
-	}
-}
-
-func TestWrapNil(t *testing.T) {
-	got := Wrap(nil, "no error")
-	if got != nil {
-		t.Errorf("Wrap(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWrap(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{Wrap(io.EOF, "read error"), "client error", "client error: read error: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := Wrap(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("Wrap(%v, %q): got: %v, want %v", tt.err, tt.message, got, tt.want)
-		}
-	}
-}
-
-type nilError struct{}
-
-func (nilError) Error() string { return "nil error" }
-
-func TestCause(t *testing.T) {
-	x := New("error")
-	tests := []struct {
-		err  error
-		want error
-	}{{
-		// nil error is nil
-		err:  nil,
-		want: nil,
-	}, {
-		// explicit nil error is nil
-		err:  (error)(nil),
-		want: nil,
-	}, {
-		// typed nil is nil
-		err:  (*nilError)(nil),
-		want: (*nilError)(nil),
-	}, {
-		// uncaused error is unaffected
-		err:  io.EOF,
-		want: io.EOF,
-	}, {
-		// caused error returns cause
-		err:  Wrap(io.EOF, "ignored"),
-		want: io.EOF,
-	}, {
-		err:  x, // return from errors.New
-		want: x,
-	}, {
-		WithMessage(nil, "whoops"),
-		nil,
-	}, {
-		WithMessage(io.EOF, "whoops"),
-		io.EOF,
-	}, {
-		WithStack(nil),
-		nil,
-	}, {
-		WithStack(io.EOF),
-		io.EOF,
-	}}
-
-	for i, tt := range tests {
-		got := Cause(tt.err)
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("test %d: got %#v, want %#v", i+1, got, tt.want)
-		}
-	}
-}
-
-func TestWrapfNil(t *testing.T) {
-	got := Wrapf(nil, "no error")
-	if got != nil {
-		t.Errorf("Wrapf(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWrapf(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{Wrapf(io.EOF, "read error without format specifiers"), "client error", "client error: read error without format specifiers: EOF"},
-		{Wrapf(io.EOF, "read error with %d format specifier", 1), "client error", "client error: read error with 1 format specifier: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := Wrapf(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("Wrapf(%v, %q): got: %v, want %v", tt.err, tt.message, got, tt.want)
-		}
-	}
-}
-
-func TestErrorf(t *testing.T) {
-	tests := []struct {
-		err  error
-		want string
-	}{
-		{Errorf("read error without format specifiers"), "read error without format specifiers"},
-		{Errorf("read error with %d format specifier", 1), "read error with 1 format specifier"},
-	}
-
-	for _, tt := range tests {
-		got := tt.err.Error()
-		if got != tt.want {
-			t.Errorf("Errorf(%v): got: %q, want %q", tt.err, got, tt.want)
-		}
-	}
-}
-
-func TestWithStackNil(t *testing.T) {
-	got := WithStack(nil)
-	if got != nil {
-		t.Errorf("WithStack(nil): got %#v, expected nil", got)
-	}
-}
-
-func TestWithStack(t *testing.T) {
-	tests := []struct {
-		err  error
-		want string
-	}{
-		{io.EOF, "EOF"},
-		{WithStack(io.EOF), "EOF"},
-	}
-
-	for _, tt := range tests {
-		got := WithStack(tt.err).Error()
-		if got != tt.want {
-			t.Errorf("WithStack(%v): got: %v, want %v", tt.err, got, tt.want)
-		}
-	}
-}
-
-func TestWithMessageNil(t *testing.T) {
-	got := WithMessage(nil, "no error")
-	if got != nil {
-		t.Errorf("WithMessage(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWithMessage(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{WithMessage(io.EOF, "read error"), "client error", "client error: read error: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := WithMessage(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("WithMessage(%v, %q): got: %q, want %q", tt.err, tt.message, got, tt.want)
-		}
-	}
-}
-
-func TestWithMessagefNil(t *testing.T) {
-	got := WithMessagef(nil, "no error")
-	if got != nil {
-		t.Errorf("WithMessage(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWithMessagef(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{WithMessagef(io.EOF, "read error without format specifier"), "client error", "client error: read error without format specifier: EOF"},
-		{WithMessagef(io.EOF, "read error with %d format specifier", 1), "client error", "client error: read error with 1 format specifier: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := WithMessagef(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("WithMessage(%v, %q): got: %q, want %q", tt.err, tt.message, got, tt.want)
-		}
-	}
-}
-
-// errors.New, etc values are not expected to be compared by value
-// but the change in errors#27 made them incomparable. Assert that
-// various kinds of errors have a functional equality operator, even
-// if the result of that equality is always false.
-func TestErrorEquality(t *testing.T) {
-	vals := []error{
-		nil,
-		io.EOF,
-		errors.New("EOF"),
-		New("EOF"),
-		Errorf("EOF"),
-		Wrap(io.EOF, "EOF"),
-		Wrapf(io.EOF, "EOF%d", 2),
-		WithMessage(nil, "whoops"),
-		WithMessage(io.EOF, "whoops"),
-		WithStack(io.EOF),
-		WithStack(nil),
-	}
-
-	for i := range vals {
-		for j := range vals {
-			_ = vals[i] == vals[j] // mustn't panic
-		}
-	}
-}

vendor/github.com/pkg/errors/example_test.go

@@ -1,205 +0,0 @@
-package errors_test
-
-import (
-	"fmt"
-
-	"github.com/pkg/errors"
-)
-
-func ExampleNew() {
-	err := errors.New("whoops")
-	fmt.Println(err)
-
-	// Output: whoops
-}
-
-func ExampleNew_printf() {
-	err := errors.New("whoops")
-	fmt.Printf("%+v", err)
-
-	// Example output:
-	// whoops
-	// github.com/pkg/errors_test.ExampleNew_printf
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:17
-	// testing.runExample
-	//         /home/dfc/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /home/dfc/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /home/dfc/go/src/testing/testing.go:744
-	// main.main
-	//         /github.com/pkg/errors/_test/_testmain.go:106
-	// runtime.main
-	//         /home/dfc/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /home/dfc/go/src/runtime/asm_amd64.s:2059
-}
-
-func ExampleWithMessage() {
-	cause := errors.New("whoops")
-	err := errors.WithMessage(cause, "oh noes")
-	fmt.Println(err)
-
-	// Output: oh noes: whoops
-}
-
-func ExampleWithStack() {
-	cause := errors.New("whoops")
-	err := errors.WithStack(cause)
-	fmt.Println(err)
-
-	// Output: whoops
-}
-
-func ExampleWithStack_printf() {
-	cause := errors.New("whoops")
-	err := errors.WithStack(cause)
-	fmt.Printf("%+v", err)
-
-	// Example Output:
-	// whoops
-	// github.com/pkg/errors_test.ExampleWithStack_printf
-	//         /home/fabstu/go/src/github.com/pkg/errors/example_test.go:55
-	// testing.runExample
-	//         /usr/lib/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /usr/lib/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /usr/lib/go/src/testing/testing.go:744
-	// main.main
-	//         github.com/pkg/errors/_test/_testmain.go:106
-	// runtime.main
-	//         /usr/lib/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /usr/lib/go/src/runtime/asm_amd64.s:2086
-	// github.com/pkg/errors_test.ExampleWithStack_printf
-	//         /home/fabstu/go/src/github.com/pkg/errors/example_test.go:56
-	// testing.runExample
-	//         /usr/lib/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /usr/lib/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /usr/lib/go/src/testing/testing.go:744
-	// main.main
-	//         github.com/pkg/errors/_test/_testmain.go:106
-	// runtime.main
-	//         /usr/lib/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /usr/lib/go/src/runtime/asm_amd64.s:2086
-}
-
-func ExampleWrap() {
-	cause := errors.New("whoops")
-	err := errors.Wrap(cause, "oh noes")
-	fmt.Println(err)
-
-	// Output: oh noes: whoops
-}
-
-func fn() error {
-	e1 := errors.New("error")
-	e2 := errors.Wrap(e1, "inner")
-	e3 := errors.Wrap(e2, "middle")
-	return errors.Wrap(e3, "outer")
-}
-
-func ExampleCause() {
-	err := fn()
-	fmt.Println(err)
-	fmt.Println(errors.Cause(err))
-
-	// Output: outer: middle: inner: error
-	// error
-}
-
-func ExampleWrap_extended() {
-	err := fn()
-	fmt.Printf("%+v\n", err)
-
-	// Example output:
-	// error
-	// github.com/pkg/errors_test.fn
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:47
-	// github.com/pkg/errors_test.ExampleCause_printf
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:63
-	// testing.runExample
-	//         /home/dfc/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /home/dfc/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /home/dfc/go/src/testing/testing.go:744
-	// main.main
-	//         /github.com/pkg/errors/_test/_testmain.go:104
-	// runtime.main
-	//         /home/dfc/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /home/dfc/go/src/runtime/asm_amd64.s:2059
-	// github.com/pkg/errors_test.fn
-	// 	  /home/dfc/src/github.com/pkg/errors/example_test.go:48: inner
-	// github.com/pkg/errors_test.fn
-	//        /home/dfc/src/github.com/pkg/errors/example_test.go:49: middle
-	// github.com/pkg/errors_test.fn
-	//      /home/dfc/src/github.com/pkg/errors/example_test.go:50: outer
-}
-
-func ExampleWrapf() {
-	cause := errors.New("whoops")
-	err := errors.Wrapf(cause, "oh noes #%d", 2)
-	fmt.Println(err)
-
-	// Output: oh noes #2: whoops
-}
-
-func ExampleErrorf_extended() {
-	err := errors.Errorf("whoops: %s", "foo")
-	fmt.Printf("%+v", err)
-
-	// Example output:
-	// whoops: foo
-	// github.com/pkg/errors_test.ExampleErrorf
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:101
-	// testing.runExample
-	//         /home/dfc/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /home/dfc/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /home/dfc/go/src/testing/testing.go:744
-	// main.main
-	//         /github.com/pkg/errors/_test/_testmain.go:102
-	// runtime.main
-	//         /home/dfc/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /home/dfc/go/src/runtime/asm_amd64.s:2059
-}
-
-func Example_stackTrace() {
-	type stackTracer interface {
-		StackTrace() errors.StackTrace
-	}
-
-	err, ok := errors.Cause(fn()).(stackTracer)
-	if !ok {
-		panic("oops, err does not implement stackTracer")
-	}
-
-	st := err.StackTrace()
-	fmt.Printf("%+v", st[0:2]) // top two frames
-
-	// Example output:
-	// github.com/pkg/errors_test.fn
-	//	/home/dfc/src/github.com/pkg/errors/example_test.go:47
-	// github.com/pkg/errors_test.Example_stackTrace
-	//	/home/dfc/src/github.com/pkg/errors/example_test.go:127
-}
-
-func ExampleCause_printf() {
-	err := errors.Wrap(func() error {
-		return func() error {
-			return errors.Errorf("hello %s", fmt.Sprintf("world"))
-		}()
-	}(), "failed")
-
-	fmt.Printf("%v", err)
-
-	// Output: failed: hello world
-}

vendor/github.com/pkg/errors/format_test.go

@@ -1,535 +0,0 @@
-package errors
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"regexp"
-	"strings"
-	"testing"
-)
-
-func TestFormatNew(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		New("error"),
-		"%s",
-		"error",
-	}, {
-		New("error"),
-		"%v",
-		"error",
-	}, {
-		New("error"),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatNew\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:26",
-	}, {
-		New("error"),
-		"%q",
-		`"error"`,
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatErrorf(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		Errorf("%s", "error"),
-		"%s",
-		"error",
-	}, {
-		Errorf("%s", "error"),
-		"%v",
-		"error",
-	}, {
-		Errorf("%s", "error"),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatErrorf\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:56",
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatWrap(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		Wrap(New("error"), "error2"),
-		"%s",
-		"error2: error",
-	}, {
-		Wrap(New("error"), "error2"),
-		"%v",
-		"error2: error",
-	}, {
-		Wrap(New("error"), "error2"),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatWrap\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:82",
-	}, {
-		Wrap(io.EOF, "error"),
-		"%s",
-		"error: EOF",
-	}, {
-		Wrap(io.EOF, "error"),
-		"%v",
-		"error: EOF",
-	}, {
-		Wrap(io.EOF, "error"),
-		"%+v",
-		"EOF\n" +
-			"error\n" +
-			"github.com/pkg/errors.TestFormatWrap\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:96",
-	}, {
-		Wrap(Wrap(io.EOF, "error1"), "error2"),
-		"%+v",
-		"EOF\n" +
-			"error1\n" +
-			"github.com/pkg/errors.TestFormatWrap\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:103\n",
-	}, {
-		Wrap(New("error with space"), "context"),
-		"%q",
-		`"context: error with space"`,
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatWrapf(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		Wrapf(io.EOF, "error%d", 2),
-		"%s",
-		"error2: EOF",
-	}, {
-		Wrapf(io.EOF, "error%d", 2),
-		"%v",
-		"error2: EOF",
-	}, {
-		Wrapf(io.EOF, "error%d", 2),
-		"%+v",
-		"EOF\n" +
-			"error2\n" +
-			"github.com/pkg/errors.TestFormatWrapf\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:134",
-	}, {
-		Wrapf(New("error"), "error%d", 2),
-		"%s",
-		"error2: error",
-	}, {
-		Wrapf(New("error"), "error%d", 2),
-		"%v",
-		"error2: error",
-	}, {
-		Wrapf(New("error"), "error%d", 2),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatWrapf\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:149",
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatWithStack(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   []string
-	}{{
-		WithStack(io.EOF),
-		"%s",
-		[]string{"EOF"},
-	}, {
-		WithStack(io.EOF),
-		"%v",
-		[]string{"EOF"},
-	}, {
-		WithStack(io.EOF),
-		"%+v",
-		[]string{"EOF",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:175"},
-	}, {
-		WithStack(New("error")),
-		"%s",
-		[]string{"error"},
-	}, {
-		WithStack(New("error")),
-		"%v",
-		[]string{"error"},
-	}, {
-		WithStack(New("error")),
-		"%+v",
-		[]string{"error",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:189",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:189"},
-	}, {
-		WithStack(WithStack(io.EOF)),
-		"%+v",
-		[]string{"EOF",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:197",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:197"},
-	}, {
-		WithStack(WithStack(Wrapf(io.EOF, "message"))),
-		"%+v",
-		[]string{"EOF",
-			"message",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:205",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:205",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:205"},
-	}, {
-		WithStack(Errorf("error%d", 1)),
-		"%+v",
-		[]string{"error1",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:216",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:216"},
-	}}
-
-	for i, tt := range tests {
-		testFormatCompleteCompare(t, i, tt.error, tt.format, tt.want, true)
-	}
-}
-
-func TestFormatWithMessage(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   []string
-	}{{
-		WithMessage(New("error"), "error2"),
-		"%s",
-		[]string{"error2: error"},
-	}, {
-		WithMessage(New("error"), "error2"),
-		"%v",
-		[]string{"error2: error"},
-	}, {
-		WithMessage(New("error"), "error2"),
-		"%+v",
-		[]string{
-			"error",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:244",
-			"error2"},
-	}, {
-		WithMessage(io.EOF, "addition1"),
-		"%s",
-		[]string{"addition1: EOF"},
-	}, {
-		WithMessage(io.EOF, "addition1"),
-		"%v",
-		[]string{"addition1: EOF"},
-	}, {
-		WithMessage(io.EOF, "addition1"),
-		"%+v",
-		[]string{"EOF", "addition1"},
-	}, {
-		WithMessage(WithMessage(io.EOF, "addition1"), "addition2"),
-		"%v",
-		[]string{"addition2: addition1: EOF"},
-	}, {
-		WithMessage(WithMessage(io.EOF, "addition1"), "addition2"),
-		"%+v",
-		[]string{"EOF", "addition1", "addition2"},
-	}, {
-		Wrap(WithMessage(io.EOF, "error1"), "error2"),
-		"%+v",
-		[]string{"EOF", "error1", "error2",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:272"},
-	}, {
-		WithMessage(Errorf("error%d", 1), "error2"),
-		"%+v",
-		[]string{"error1",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:278",
-			"error2"},
-	}, {
-		WithMessage(WithStack(io.EOF), "error"),
-		"%+v",
-		[]string{
-			"EOF",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:285",
-			"error"},
-	}, {
-		WithMessage(Wrap(WithStack(io.EOF), "inside-error"), "outside-error"),
-		"%+v",
-		[]string{
-			"EOF",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:293",
-			"inside-error",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:293",
-			"outside-error"},
-	}}
-
-	for i, tt := range tests {
-		testFormatCompleteCompare(t, i, tt.error, tt.format, tt.want, true)
-	}
-}
-
-func TestFormatGeneric(t *testing.T) {
-	starts := []struct {
-		err  error
-		want []string
-	}{
-		{New("new-error"), []string{
-			"new-error",
-			"github.com/pkg/errors.TestFormatGeneric\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:315"},
-		}, {Errorf("errorf-error"), []string{
-			"errorf-error",
-			"github.com/pkg/errors.TestFormatGeneric\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:319"},
-		}, {errors.New("errors-new-error"), []string{
-			"errors-new-error"},
-		},
-	}
-
-	wrappers := []wrapper{
-		{
-			func(err error) error { return WithMessage(err, "with-message") },
-			[]string{"with-message"},
-		}, {
-			func(err error) error { return WithStack(err) },
-			[]string{
-				"github.com/pkg/errors.(func·002|TestFormatGeneric.func2)\n\t" +
-					".+/github.com/pkg/errors/format_test.go:333",
-			},
-		}, {
-			func(err error) error { return Wrap(err, "wrap-error") },
-			[]string{
-				"wrap-error",
-				"github.com/pkg/errors.(func·003|TestFormatGeneric.func3)\n\t" +
-					".+/github.com/pkg/errors/format_test.go:339",
-			},
-		}, {
-			func(err error) error { return Wrapf(err, "wrapf-error%d", 1) },
-			[]string{
-				"wrapf-error1",
-				"github.com/pkg/errors.(func·004|TestFormatGeneric.func4)\n\t" +
-					".+/github.com/pkg/errors/format_test.go:346",
-			},
-		},
-	}
-
-	for s := range starts {
-		err := starts[s].err
-		want := starts[s].want
-		testFormatCompleteCompare(t, s, err, "%+v", want, false)
-		testGenericRecursive(t, err, want, wrappers, 3)
-	}
-}
-
-func testFormatRegexp(t *testing.T, n int, arg interface{}, format, want string) {
-	got := fmt.Sprintf(format, arg)
-	gotLines := strings.SplitN(got, "\n", -1)
-	wantLines := strings.SplitN(want, "\n", -1)
-
-	if len(wantLines) > len(gotLines) {
-		t.Errorf("test %d: wantLines(%d) > gotLines(%d):\n got: %q\nwant: %q", n+1, len(wantLines), len(gotLines), got, want)
-		return
-	}
-
-	for i, w := range wantLines {
-		match, err := regexp.MatchString(w, gotLines[i])
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !match {
-			t.Errorf("test %d: line %d: fmt.Sprintf(%q, err):\n got: %q\nwant: %q", n+1, i+1, format, got, want)
-		}
-	}
-}
-
-var stackLineR = regexp.MustCompile(`\.`)
-
-// parseBlocks parses input into a slice, where:
-//  - incase entry contains a newline, its a stacktrace
-//  - incase entry contains no newline, its a solo line.
-//
-// Detecting stack boundaries only works incase the WithStack-calls are
-// to be found on the same line, thats why it is optionally here.
-//
-// Example use:
-//
-// for _, e := range blocks {
-//   if strings.ContainsAny(e, "\n") {
-//     // Match as stack
-//   } else {
-//     // Match as line
-//   }
-// }
-//
-func parseBlocks(input string, detectStackboundaries bool) ([]string, error) {
-	var blocks []string
-
-	stack := ""
-	wasStack := false
-	lines := map[string]bool{} // already found lines
-
-	for _, l := range strings.Split(input, "\n") {
-		isStackLine := stackLineR.MatchString(l)
-
-		switch {
-		case !isStackLine && wasStack:
-			blocks = append(blocks, stack, l)
-			stack = ""
-			lines = map[string]bool{}
-		case isStackLine:
-			if wasStack {
-				// Detecting two stacks after another, possible cause lines match in
-				// our tests due to WithStack(WithStack(io.EOF)) on same line.
-				if detectStackboundaries {
-					if lines[l] {
-						if len(stack) == 0 {
-							return nil, errors.New("len of block must not be zero here")
-						}
-
-						blocks = append(blocks, stack)
-						stack = l
-						lines = map[string]bool{l: true}
-						continue
-					}
-				}
-
-				stack = stack + "\n" + l
-			} else {
-				stack = l
-			}
-			lines[l] = true
-		case !isStackLine && !wasStack:
-			blocks = append(blocks, l)
-		default:
-			return nil, errors.New("must not happen")
-		}
-
-		wasStack = isStackLine
-	}
-
-	// Use up stack
-	if stack != "" {
-		blocks = append(blocks, stack)
-	}
-	return blocks, nil
-}
-
-func testFormatCompleteCompare(t *testing.T, n int, arg interface{}, format string, want []string, detectStackBoundaries bool) {
-	gotStr := fmt.Sprintf(format, arg)
-
-	got, err := parseBlocks(gotStr, detectStackBoundaries)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(got) != len(want) {
-		t.Fatalf("test %d: fmt.Sprintf(%s, err) -> wrong number of blocks: got(%d) want(%d)\n got: %s\nwant: %s\ngotStr: %q",
-			n+1, format, len(got), len(want), prettyBlocks(got), prettyBlocks(want), gotStr)
-	}
-
-	for i := range got {
-		if strings.ContainsAny(want[i], "\n") {
-			// Match as stack
-			match, err := regexp.MatchString(want[i], got[i])
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !match {
-				t.Fatalf("test %d: block %d: fmt.Sprintf(%q, err):\ngot:\n%q\nwant:\n%q\nall-got:\n%s\nall-want:\n%s\n",
-					n+1, i+1, format, got[i], want[i], prettyBlocks(got), prettyBlocks(want))
-			}
-		} else {
-			// Match as message
-			if got[i] != want[i] {
-				t.Fatalf("test %d: fmt.Sprintf(%s, err) at block %d got != want:\n got: %q\nwant: %q", n+1, format, i+1, got[i], want[i])
-			}
-		}
-	}
-}
-
-type wrapper struct {
-	wrap func(err error) error
-	want []string
-}
-
-func prettyBlocks(blocks []string) string {
-	var out []string
-
-	for _, b := range blocks {
-		out = append(out, fmt.Sprintf("%v", b))
-	}
-
-	return "   " + strings.Join(out, "\n   ")
-}
-
-func testGenericRecursive(t *testing.T, beforeErr error, beforeWant []string, list []wrapper, maxDepth int) {
-	if len(beforeWant) == 0 {
-		panic("beforeWant must not be empty")
-	}
-	for _, w := range list {
-		if len(w.want) == 0 {
-			panic("want must not be empty")
-		}
-
-		err := w.wrap(beforeErr)
-
-		// Copy required cause append(beforeWant, ..) modified beforeWant subtly.
-		beforeCopy := make([]string, len(beforeWant))
-		copy(beforeCopy, beforeWant)
-
-		beforeWant := beforeCopy
-		last := len(beforeWant) - 1
-		var want []string
-
-		// Merge two stacks behind each other.
-		if strings.ContainsAny(beforeWant[last], "\n") && strings.ContainsAny(w.want[0], "\n") {
-			want = append(beforeWant[:last], append([]string{beforeWant[last] + "((?s).*)" + w.want[0]}, w.want[1:]...)...)
-		} else {
-			want = append(beforeWant, w.want...)
-		}
-
-		testFormatCompleteCompare(t, maxDepth, err, "%+v", want, false)
-		if maxDepth > 0 {
-			testGenericRecursive(t, err, want, list, maxDepth-1)
-		}
-	}
-}

vendor/github.com/pkg/errors/stack_test.go

@@ -1,274 +0,0 @@
-package errors
-
-import (
-	"fmt"
-	"runtime"
-	"testing"
-)
-
-var initpc, _, _, _ = runtime.Caller(0)
-
-func TestFrameLine(t *testing.T) {
-	var tests = []struct {
-		Frame
-		want int
-	}{{
-		Frame(initpc),
-		9,
-	}, {
-		func() Frame {
-			var pc, _, _, _ = runtime.Caller(0)
-			return Frame(pc)
-		}(),
-		20,
-	}, {
-		func() Frame {
-			var pc, _, _, _ = runtime.Caller(1)
-			return Frame(pc)
-		}(),
-		28,
-	}, {
-		Frame(0), // invalid PC
-		0,
-	}}
-
-	for _, tt := range tests {
-		got := tt.Frame.line()
-		want := tt.want
-		if want != got {
-			t.Errorf("Frame(%v): want: %v, got: %v", uintptr(tt.Frame), want, got)
-		}
-	}
-}
-
-type X struct{}
-
-func (x X) val() Frame {
-	var pc, _, _, _ = runtime.Caller(0)
-	return Frame(pc)
-}
-
-func (x *X) ptr() Frame {
-	var pc, _, _, _ = runtime.Caller(0)
-	return Frame(pc)
-}
-
-func TestFrameFormat(t *testing.T) {
-	var tests = []struct {
-		Frame
-		format string
-		want   string
-	}{{
-		Frame(initpc),
-		"%s",
-		"stack_test.go",
-	}, {
-		Frame(initpc),
-		"%+s",
-		"github.com/pkg/errors.init\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go",
-	}, {
-		Frame(0),
-		"%s",
-		"unknown",
-	}, {
-		Frame(0),
-		"%+s",
-		"unknown",
-	}, {
-		Frame(initpc),
-		"%d",
-		"9",
-	}, {
-		Frame(0),
-		"%d",
-		"0",
-	}, {
-		Frame(initpc),
-		"%n",
-		"init",
-	}, {
-		func() Frame {
-			var x X
-			return x.ptr()
-		}(),
-		"%n",
-		`\(\*X\).ptr`,
-	}, {
-		func() Frame {
-			var x X
-			return x.val()
-		}(),
-		"%n",
-		"X.val",
-	}, {
-		Frame(0),
-		"%n",
-		"",
-	}, {
-		Frame(initpc),
-		"%v",
-		"stack_test.go:9",
-	}, {
-		Frame(initpc),
-		"%+v",
-		"github.com/pkg/errors.init\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go:9",
-	}, {
-		Frame(0),
-		"%v",
-		"unknown:0",
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.Frame, tt.format, tt.want)
-	}
-}
-
-func TestFuncname(t *testing.T) {
-	tests := []struct {
-		name, want string
-	}{
-		{"", ""},
-		{"runtime.main", "main"},
-		{"github.com/pkg/errors.funcname", "funcname"},
-		{"funcname", "funcname"},
-		{"io.copyBuffer", "copyBuffer"},
-		{"main.(*R).Write", "(*R).Write"},
-	}
-
-	for _, tt := range tests {
-		got := funcname(tt.name)
-		want := tt.want
-		if got != want {
-			t.Errorf("funcname(%q): want: %q, got %q", tt.name, want, got)
-		}
-	}
-}
-
-func TestStackTrace(t *testing.T) {
-	tests := []struct {
-		err  error
-		want []string
-	}{{
-		New("ooh"), []string{
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:154",
-		},
-	}, {
-		Wrap(New("ooh"), "ahh"), []string{
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:159", // this is the stack of Wrap, not New
-		},
-	}, {
-		Cause(Wrap(New("ooh"), "ahh")), []string{
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:164", // this is the stack of New
-		},
-	}, {
-		func() error { return New("ooh") }(), []string{
-			`github.com/pkg/errors.(func·009|TestStackTrace.func1)` +
-				"\n\t.+/github.com/pkg/errors/stack_test.go:169", // this is the stack of New
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:169", // this is the stack of New's caller
-		},
-	}, {
-		Cause(func() error {
-			return func() error {
-				return Errorf("hello %s", fmt.Sprintf("world"))
-			}()
-		}()), []string{
-			`github.com/pkg/errors.(func·010|TestStackTrace.func2.1)` +
-				"\n\t.+/github.com/pkg/errors/stack_test.go:178", // this is the stack of Errorf
-			`github.com/pkg/errors.(func·011|TestStackTrace.func2)` +
-				"\n\t.+/github.com/pkg/errors/stack_test.go:179", // this is the stack of Errorf's caller
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:180", // this is the stack of Errorf's caller's caller
-		},
-	}}
-	for i, tt := range tests {
-		x, ok := tt.err.(interface {
-			StackTrace() StackTrace
-		})
-		if !ok {
-			t.Errorf("expected %#v to implement StackTrace() StackTrace", tt.err)
-			continue
-		}
-		st := x.StackTrace()
-		for j, want := range tt.want {
-			testFormatRegexp(t, i, st[j], "%+v", want)
-		}
-	}
-}
-
-func stackTrace() StackTrace {
-	const depth = 8
-	var pcs [depth]uintptr
-	n := runtime.Callers(1, pcs[:])
-	var st stack = pcs[0:n]
-	return st.StackTrace()
-}
-
-func TestStackTraceFormat(t *testing.T) {
-	tests := []struct {
-		StackTrace
-		format string
-		want   string
-	}{{
-		nil,
-		"%s",
-		`\[\]`,
-	}, {
-		nil,
-		"%v",
-		`\[\]`,
-	}, {
-		nil,
-		"%+v",
-		"",
-	}, {
-		nil,
-		"%#v",
-		`\[\]errors.Frame\(nil\)`,
-	}, {
-		make(StackTrace, 0),
-		"%s",
-		`\[\]`,
-	}, {
-		make(StackTrace, 0),
-		"%v",
-		`\[\]`,
-	}, {
-		make(StackTrace, 0),
-		"%+v",
-		"",
-	}, {
-		make(StackTrace, 0),
-		"%#v",
-		`\[\]errors.Frame{}`,
-	}, {
-		stackTrace()[:2],
-		"%s",
-		`\[stack_test.go stack_test.go\]`,
-	}, {
-		stackTrace()[:2],
-		"%v",
-		`\[stack_test.go:207 stack_test.go:254\]`,
-	}, {
-		stackTrace()[:2],
-		"%+v",
-		"\n" +
-			"github.com/pkg/errors.stackTrace\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go:207\n" +
-			"github.com/pkg/errors.TestStackTraceFormat\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go:258",
-	}, {
-		stackTrace()[:2],
-		"%#v",
-		`\[\]errors.Frame{stack_test.go:207, stack_test.go:266}`,
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.StackTrace, tt.format, tt.want)
-	}
-}

vendor/github.com/sirupsen/logrus/.gitignore

@@ -0,0 +1,2 @@
+logrus
+vendor

vendor/github.com/sirupsen/logrus/.travis.yml

@@ -0,0 +1,25 @@
+language: go
+go_import_path: github.com/sirupsen/logrus
+git:
+  depth: 1
+env:
+  - GO111MODULE=on
+  - GO111MODULE=off
+go: [ 1.11.x, 1.12.x ]
+os: [ linux, osx ]
+matrix:
+  exclude:
+    - go: 1.12.x
+      env: GO111MODULE=off
+    - go: 1.11.x
+      os: osx
+install:
+  - ./travis/install.sh
+  - if [[ "$GO111MODULE" ==  "on" ]]; then go mod download; fi
+  - if [[ "$GO111MODULE" == "off" ]]; then go get github.com/stretchr/testify/assert golang.org/x/sys/unix github.com/konsorten/go-windows-terminal-sequences; fi
+script:
+  - ./travis/cross_build.sh
+  - export GOMAXPROCS=4
+  - export GORACE=halt_on_error=1
+  - go test -race -v ./...
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then go test -race -v -tags appengine ./... ; fi

vendor/github.com/sirupsen/logrus/CHANGELOG.md

@@ -1,3 +1,38 @@
+# 1.4.2
+  * Fixes build break for plan9, nacl, solaris
+# 1.4.1
+This new release introduces:
+  * Enhance TextFormatter to not print caller information when they are empty (#944)
+  * Remove dependency on golang.org/x/crypto (#932, #943) 
+
+Fixes:
+  * Fix Entry.WithContext method to return a copy of the initial entry (#941)
+
+# 1.4.0
+This new release introduces:
+  * Add `DeferExitHandler`, similar to `RegisterExitHandler` but prepending the handler to the list of handlers (semantically like `defer`) (#848).
+  * Add `CallerPrettyfier` to `JSONFormatter` and `TextFormatter (#909, #911)
+  * Add `Entry.WithContext()` and `Entry.Context`, to set a context on entries to be used e.g. in hooks (#919).
+
+Fixes:
+  * Fix wrong method calls `Logger.Print` and `Logger.Warningln` (#893).
+  * Update `Entry.Logf` to not do string formatting unless the log level is enabled (#903)
+  * Fix infinite recursion on unknown `Level.String()` (#907)
+  * Fix race condition in `getCaller` (#916).
+
+
+# 1.3.0
+This new release introduces:
+  * Log, Logf, Logln functions for Logger and Entry that take a Level
+
+Fixes:
+  * Building prometheus node_exporter on AIX (#840)
+  * Race condition in TextFormatter (#468)
+  * Travis CI import path (#868)
+  * Remove coloured output on Windows (#862)
+  * Pointer to func as field in JSONFormatter (#870)
+  * Properly marshal Levels (#873)
+
 # 1.2.0
 This new release introduces:
   * A new method `SetReportCaller` in the `Logger` to enable the file, line and calling function from which the trace has been issued

vendor/github.com/sirupsen/logrus/README.md

@@ -365,6 +365,7 @@ Third party logging formatters:
 * [`logstash`](https://github.com/bshuster-repo/logrus-logstash-hook). Logs fields as [Logstash](http://logstash.net) Events.
 * [`prefixed`](https://github.com/x-cray/logrus-prefixed-formatter). Displays log entry source along with alternative layout.
 * [`zalgo`](https://github.com/aybabtme/logzalgo). Invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
+* [`nested-logrus-formatter`](https://github.com/antonfisher/nested-logrus-formatter). Converts logrus fields to a nested structure.
 
 You can define your formatter by implementing the `Formatter` interface,
 requiring a `Format` method. `Format` takes an `*Entry`. `entry.Data` is a

vendor/github.com/sirupsen/logrus/alt_exit.go

@@ -51,9 +51,9 @@ func Exit(code int) {
 	os.Exit(code)
 }
 
-// RegisterExitHandler adds a Logrus Exit handler, call logrus.Exit to invoke
+// RegisterExitHandler appends a Logrus Exit handler to the list of handlers,
-// all handlers. The handlers will also be invoked when any Fatal log entry is
+// call logrus.Exit to invoke all handlers. The handlers will also be invoked when
-// made.
+// any Fatal log entry is made.
 //
 // This method is useful when a caller wishes to use logrus to log a fatal
 // message but also needs to gracefully shutdown. An example usecase could be
@@ -62,3 +62,15 @@ func Exit(code int) {
 func RegisterExitHandler(handler func()) {
 	handlers = append(handlers, handler)
 }
+
+// DeferExitHandler prepends a Logrus Exit handler to the list of handlers,
+// call logrus.Exit to invoke all handlers. The handlers will also be invoked when
+// any Fatal log entry is made.
+//
+// This method is useful when a caller wishes to use logrus to log a fatal
+// message but also needs to gracefully shutdown. An example usecase could be
+// closing database connections, or sending a alert that the application is
+// closing.
+func DeferExitHandler(handler func()) {
+	handlers = append([]func(){handler}, handlers...)
+}

vendor/github.com/sirupsen/logrus/alt_exit_test.go

@@ -1,99 +0,0 @@
-package logrus
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestRegister(t *testing.T) {
-	current := len(handlers)
-	RegisterExitHandler(func() {})
-	if len(handlers) != current+1 {
-		t.Fatalf("expected %d handlers, got %d", current+1, len(handlers))
-	}
-}
-
-func TestHandler(t *testing.T) {
-	testprog := testprogleader
-	testprog = append(testprog, getPackage()...)
-	testprog = append(testprog, testprogtrailer...)
-	tempDir, err := ioutil.TempDir("", "test_handler")
-	if err != nil {
-		log.Fatalf("can't create temp dir. %q", err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	gofile := filepath.Join(tempDir, "gofile.go")
-	if err := ioutil.WriteFile(gofile, testprog, 0666); err != nil {
-		t.Fatalf("can't create go file. %q", err)
-	}
-
-	outfile := filepath.Join(tempDir, "outfile.out")
-	arg := time.Now().UTC().String()
-	err = exec.Command("go", "run", gofile, outfile, arg).Run()
-	if err == nil {
-		t.Fatalf("completed normally, should have failed")
-	}
-
-	data, err := ioutil.ReadFile(outfile)
-	if err != nil {
-		t.Fatalf("can't read output file %s. %q", outfile, err)
-	}
-
-	if string(data) != arg {
-		t.Fatalf("bad data. Expected %q, got %q", data, arg)
-	}
-}
-
-// getPackage returns the name of the current package, which makes running this
-// test in a fork simpler
-func getPackage() []byte {
-	pc, _, _, _ := runtime.Caller(0)
-	fullFuncName := runtime.FuncForPC(pc).Name()
-	idx := strings.LastIndex(fullFuncName, ".")
-	return []byte(fullFuncName[:idx]) // trim off function details
-}
-
-var testprogleader = []byte(`
-// Test program for atexit, gets output file and data as arguments and writes
-// data to output file in atexit handler.
-package main
-
-import (
-	"`)
-var testprogtrailer = []byte(
-	`"
-	"flag"
-	"fmt"
-	"io/ioutil"
-)
-
-var outfile = ""
-var data = ""
-
-func handler() {
-	ioutil.WriteFile(outfile, []byte(data), 0666)
-}
-
-func badHandler() {
-	n := 0
-	fmt.Println(1/n)
-}
-
-func main() {
-	flag.Parse()
-	outfile = flag.Arg(0)
-	data = flag.Arg(1)
-
-	logrus.RegisterExitHandler(handler)
-	logrus.RegisterExitHandler(badHandler)
-	logrus.Fatal("Bye bye")
-}
-`)

vendor/github.com/sirupsen/logrus/entry.go

@@ -2,6 +2,7 @@ package logrus
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"os"
 	"reflect"
@@ -69,6 +70,9 @@ type Entry struct {
 	// When formatter is called in entry.log(), a Buffer may be set to entry
 	Buffer *bytes.Buffer
 
+	// Contains the context set by the user. Useful for hook processing etc.
+	Context context.Context
+
 	// err may contain a field formatting error
 	err string
 }
@@ -97,6 +101,11 @@ func (entry *Entry) WithError(err error) *Entry {
 	return entry.WithField(ErrorKey, err)
 }
 
+// Add a context to the Entry.
+func (entry *Entry) WithContext(ctx context.Context) *Entry {
+	return &Entry{Logger: entry.Logger, Data: entry.Data, Time: entry.Time, err: entry.err, Context: ctx}
+}
+
 // Add a single field to the Entry.
 func (entry *Entry) WithField(key string, value interface{}) *Entry {
 	return entry.WithFields(Fields{key: value})
@@ -130,12 +139,12 @@ func (entry *Entry) WithFields(fields Fields) *Entry {
 			data[k] = v
 		}
 	}
-	return &Entry{Logger: entry.Logger, Data: data, Time: entry.Time, err: fieldErr}
+	return &Entry{Logger: entry.Logger, Data: data, Time: entry.Time, err: fieldErr, Context: entry.Context}
 }
 
 // Overrides the time of the Entry.
 func (entry *Entry) WithTime(t time.Time) *Entry {
-	return &Entry{Logger: entry.Logger, Data: entry.Data, Time: t, err: entry.err}
+	return &Entry{Logger: entry.Logger, Data: entry.Data, Time: t, err: entry.err, Context: entry.Context}
 }
 
 // getPackageName reduces a fully qualified function name to the package name
@@ -156,20 +165,23 @@ func getPackageName(f string) string {
 
 // getCaller retrieves the name of the first non-logrus calling function
 func getCaller() *runtime.Frame {
+
+	// cache this package's fully-qualified name
+	callerInitOnce.Do(func() {
+		pcs := make([]uintptr, 2)
+		_ = runtime.Callers(0, pcs)
+		logrusPackage = getPackageName(runtime.FuncForPC(pcs[1]).Name())
+
+		// now that we have the cache, we can skip a minimum count of known-logrus functions
+		// XXX this is dubious, the number of frames may vary
+		minimumCallerDepth = knownLogrusFrames
+	})
+
 	// Restrict the lookback frames to avoid runaway lookups
 	pcs := make([]uintptr, maximumCallerDepth)
 	depth := runtime.Callers(minimumCallerDepth, pcs)
 	frames := runtime.CallersFrames(pcs[:depth])
 
-	// cache this package's fully-qualified name
-	callerInitOnce.Do(func() {
-		logrusPackage = getPackageName(runtime.FuncForPC(pcs[0]).Name())
-
-		// now that we have the cache, we can skip a minimum count of known-logrus functions
-		// XXX this is dubious, the number of frames may vary store an entry in a logger interface
-		minimumCallerDepth = knownLogrusFrames
-	})
-
 	for f, again := frames.Next(); again; f, again = frames.Next() {
 		pkg := getPackageName(f.Function)
 
@@ -251,16 +263,18 @@ func (entry *Entry) write() {
 	}
 }
 
-func (entry *Entry) Trace(args ...interface{}) {
+func (entry *Entry) Log(level Level, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(TraceLevel) {
+	if entry.Logger.IsLevelEnabled(level) {
-		entry.log(TraceLevel, fmt.Sprint(args...))
+		entry.log(level, fmt.Sprint(args...))
 	}
 }
 
+func (entry *Entry) Trace(args ...interface{}) {
+	entry.Log(TraceLevel, args...)
+}
+
 func (entry *Entry) Debug(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(DebugLevel) {
+	entry.Log(DebugLevel, args...)
-		entry.log(DebugLevel, fmt.Sprint(args...))
-	}
 }
 
 func (entry *Entry) Print(args ...interface{}) {
@@ -268,15 +282,11 @@ func (entry *Entry) Print(args ...interface{}) {
 }
 
 func (entry *Entry) Info(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(InfoLevel) {
+	entry.Log(InfoLevel, args...)
-		entry.log(InfoLevel, fmt.Sprint(args...))
-	}
 }
 
 func (entry *Entry) Warn(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(WarnLevel) {
+	entry.Log(WarnLevel, args...)
-		entry.log(WarnLevel, fmt.Sprint(args...))
-	}
 }
 
 func (entry *Entry) Warning(args ...interface{}) {
@@ -284,43 +294,37 @@ func (entry *Entry) Warning(args ...interface{}) {
 }
 
 func (entry *Entry) Error(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(ErrorLevel) {
+	entry.Log(ErrorLevel, args...)
-		entry.log(ErrorLevel, fmt.Sprint(args...))
-	}
 }
 
 func (entry *Entry) Fatal(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(FatalLevel) {
+	entry.Log(FatalLevel, args...)
-		entry.log(FatalLevel, fmt.Sprint(args...))
-	}
 	entry.Logger.Exit(1)
 }
 
 func (entry *Entry) Panic(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(PanicLevel) {
+	entry.Log(PanicLevel, args...)
-		entry.log(PanicLevel, fmt.Sprint(args...))
-	}
 	panic(fmt.Sprint(args...))
 }
 
 // Entry Printf family functions
 
-func (entry *Entry) Tracef(format string, args ...interface{}) {
+func (entry *Entry) Logf(level Level, format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(TraceLevel) {
+	if entry.Logger.IsLevelEnabled(level) {
-		entry.Trace(fmt.Sprintf(format, args...))
+		entry.Log(level, fmt.Sprintf(format, args...))
 	}
 }
 
+func (entry *Entry) Tracef(format string, args ...interface{}) {
+	entry.Logf(TraceLevel, format, args...)
+}
+
 func (entry *Entry) Debugf(format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(DebugLevel) {
+	entry.Logf(DebugLevel, format, args...)
-		entry.Debug(fmt.Sprintf(format, args...))
-	}
 }
 
 func (entry *Entry) Infof(format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(InfoLevel) {
+	entry.Logf(InfoLevel, format, args...)
-		entry.Info(fmt.Sprintf(format, args...))
-	}
 }
 
 func (entry *Entry) Printf(format string, args ...interface{}) {
@@ -328,9 +332,7 @@ func (entry *Entry) Printf(format string, args ...interface{}) {
 }
 
 func (entry *Entry) Warnf(format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(WarnLevel) {
+	entry.Logf(WarnLevel, format, args...)
-		entry.Warn(fmt.Sprintf(format, args...))
-	}
 }
 
 func (entry *Entry) Warningf(format string, args ...interface{}) {
@@ -338,42 +340,36 @@ func (entry *Entry) Warningf(format string, args ...interface{}) {
 }
 
 func (entry *Entry) Errorf(format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(ErrorLevel) {
+	entry.Logf(ErrorLevel, format, args...)
-		entry.Error(fmt.Sprintf(format, args...))
-	}
 }
 
 func (entry *Entry) Fatalf(format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(FatalLevel) {
+	entry.Logf(FatalLevel, format, args...)
-		entry.Fatal(fmt.Sprintf(format, args...))
-	}
 	entry.Logger.Exit(1)
 }
 
 func (entry *Entry) Panicf(format string, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(PanicLevel) {
+	entry.Logf(PanicLevel, format, args...)
-		entry.Panic(fmt.Sprintf(format, args...))
-	}
 }
 
 // Entry Println family functions
 
-func (entry *Entry) Traceln(args ...interface{}) {
+func (entry *Entry) Logln(level Level, args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(TraceLevel) {
+	if entry.Logger.IsLevelEnabled(level) {
-		entry.Trace(entry.sprintlnn(args...))
+		entry.Log(level, entry.sprintlnn(args...))
 	}
 }
 
+func (entry *Entry) Traceln(args ...interface{}) {
+	entry.Logln(TraceLevel, args...)
+}
+
 func (entry *Entry) Debugln(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(DebugLevel) {
+	entry.Logln(DebugLevel, args...)
-		entry.Debug(entry.sprintlnn(args...))
-	}
 }
 
 func (entry *Entry) Infoln(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(InfoLevel) {
+	entry.Logln(InfoLevel, args...)
-		entry.Info(entry.sprintlnn(args...))
-	}
 }
 
 func (entry *Entry) Println(args ...interface{}) {
@@ -381,9 +377,7 @@ func (entry *Entry) Println(args ...interface{}) {
 }
 
 func (entry *Entry) Warnln(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(WarnLevel) {
+	entry.Logln(WarnLevel, args...)
-		entry.Warn(entry.sprintlnn(args...))
-	}
 }
 
 func (entry *Entry) Warningln(args ...interface{}) {
@@ -391,22 +385,16 @@ func (entry *Entry) Warningln(args ...interface{}) {
 }
 
 func (entry *Entry) Errorln(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(ErrorLevel) {
+	entry.Logln(ErrorLevel, args...)
-		entry.Error(entry.sprintlnn(args...))
-	}
 }
 
 func (entry *Entry) Fatalln(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(FatalLevel) {
+	entry.Logln(FatalLevel, args...)
-		entry.Fatal(entry.sprintlnn(args...))
-	}
 	entry.Logger.Exit(1)
 }
 
 func (entry *Entry) Panicln(args ...interface{}) {
-	if entry.Logger.IsLevelEnabled(PanicLevel) {
+	entry.Logln(PanicLevel, args...)
-		entry.Panic(entry.sprintlnn(args...))
-	}
 }
 
 // Sprintlnn => Sprint no newline. This is to get the behavior of how

vendor/github.com/sirupsen/logrus/entry_test.go

@@ -1,141 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEntryWithError(t *testing.T) {
-
-	assert := assert.New(t)
-
-	defer func() {
-		ErrorKey = "error"
-	}()
-
-	err := fmt.Errorf("kaboom at layer %d", 4711)
-
-	assert.Equal(err, WithError(err).Data["error"])
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-
-	assert.Equal(err, entry.WithError(err).Data["error"])
-
-	ErrorKey = "err"
-
-	assert.Equal(err, entry.WithError(err).Data["err"])
-
-}
-
-func TestEntryPanicln(t *testing.T) {
-	errBoom := fmt.Errorf("boom time")
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-
-		switch pVal := p.(type) {
-		case *Entry:
-			assert.Equal(t, "kaboom", pVal.Message)
-			assert.Equal(t, errBoom, pVal.Data["err"])
-		default:
-			t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
-		}
-	}()
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-	entry.WithField("err", errBoom).Panicln("kaboom")
-}
-
-func TestEntryPanicf(t *testing.T) {
-	errBoom := fmt.Errorf("boom again")
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-
-		switch pVal := p.(type) {
-		case *Entry:
-			assert.Equal(t, "kaboom true", pVal.Message)
-			assert.Equal(t, errBoom, pVal.Data["err"])
-		default:
-			t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
-		}
-	}()
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-	entry.WithField("err", errBoom).Panicf("kaboom %v", true)
-}
-
-const (
-	badMessage   = "this is going to panic"
-	panicMessage = "this is broken"
-)
-
-type panickyHook struct{}
-
-func (p *panickyHook) Levels() []Level {
-	return []Level{InfoLevel}
-}
-
-func (p *panickyHook) Fire(entry *Entry) error {
-	if entry.Message == badMessage {
-		panic(panicMessage)
-	}
-
-	return nil
-}
-
-func TestEntryHooksPanic(t *testing.T) {
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	logger.Level = InfoLevel
-	logger.Hooks.Add(&panickyHook{})
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-		assert.Equal(t, panicMessage, p)
-
-		entry := NewEntry(logger)
-		entry.Info("another message")
-	}()
-
-	entry := NewEntry(logger)
-	entry.Info(badMessage)
-}
-
-func TestEntryWithIncorrectField(t *testing.T) {
-	assert := assert.New(t)
-
-	fn := func() {}
-
-	e := Entry{}
-	eWithFunc := e.WithFields(Fields{"func": fn})
-	eWithFuncPtr := e.WithFields(Fields{"funcPtr": &fn})
-
-	assert.Equal(eWithFunc.err, `can not add field "func"`)
-	assert.Equal(eWithFuncPtr.err, `can not add field "funcPtr"`)
-
-	eWithFunc = eWithFunc.WithField("not_a_func", "it is a string")
-	eWithFuncPtr = eWithFuncPtr.WithField("not_a_func", "it is a string")
-
-	assert.Equal(eWithFunc.err, `can not add field "func"`)
-	assert.Equal(eWithFuncPtr.err, `can not add field "funcPtr"`)
-
-	eWithFunc = eWithFunc.WithTime(time.Now())
-	eWithFuncPtr = eWithFuncPtr.WithTime(time.Now())
-
-	assert.Equal(eWithFunc.err, `can not add field "func"`)
-	assert.Equal(eWithFuncPtr.err, `can not add field "funcPtr"`)
-}

vendor/github.com/sirupsen/logrus/example_basic_test.go

@@ -1,77 +0,0 @@
-package logrus_test
-
-import (
-	"os"
-
-	"github.com/sirupsen/logrus"
-)
-
-func Example_basic() {
-	var log = logrus.New()
-	log.Formatter = new(logrus.JSONFormatter)
-	log.Formatter = new(logrus.TextFormatter)                     //default
-	log.Formatter.(*logrus.TextFormatter).DisableColors = true    // remove colors
-	log.Formatter.(*logrus.TextFormatter).DisableTimestamp = true // remove timestamp from test output
-	log.Level = logrus.TraceLevel
-	log.Out = os.Stdout
-
-	// file, err := os.OpenFile("logrus.log", os.O_CREATE|os.O_WRONLY, 0666)
-	// if err == nil {
-	// 	log.Out = file
-	// } else {
-	// 	log.Info("Failed to log to file, using default stderr")
-	// }
-
-	defer func() {
-		err := recover()
-		if err != nil {
-			entry := err.(*logrus.Entry)
-			log.WithFields(logrus.Fields{
-				"omg":         true,
-				"err_animal":  entry.Data["animal"],
-				"err_size":    entry.Data["size"],
-				"err_level":   entry.Level,
-				"err_message": entry.Message,
-				"number":      100,
-			}).Error("The ice breaks!") // or use Fatal() to force the process to exit with a nonzero code
-		}
-	}()
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"number": 0,
-	}).Trace("Went to the beach")
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"number": 8,
-	}).Debug("Started observing beach")
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"size":   10,
-	}).Info("A group of walrus emerges from the ocean")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 122,
-	}).Warn("The group's number increased tremendously!")
-
-	log.WithFields(logrus.Fields{
-		"temperature": -4,
-	}).Debug("Temperature changes")
-
-	log.WithFields(logrus.Fields{
-		"animal": "orca",
-		"size":   9009,
-	}).Panic("It's over 9000!")
-
-	// Output:
-	// level=trace msg="Went to the beach" animal=walrus number=0
-	// level=debug msg="Started observing beach" animal=walrus number=8
-	// level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
-	// level=warning msg="The group's number increased tremendously!" number=122 omg=true
-	// level=debug msg="Temperature changes" temperature=-4
-	// level=panic msg="It's over 9000!" animal=orca size=9009
-	// level=error msg="The ice breaks!" err_animal=orca err_level=panic err_message="It's over 9000!" err_size=9009 number=100 omg=true
-}

vendor/github.com/sirupsen/logrus/example_global_hook_test.go

@@ -1,36 +0,0 @@
-package logrus_test
-
-import (
-	"github.com/sirupsen/logrus"
-	"os"
-)
-
-var (
-	mystring string
-)
-
-type GlobalHook struct {
-}
-
-func (h *GlobalHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
-
-func (h *GlobalHook) Fire(e *logrus.Entry) error {
-	e.Data["mystring"] = mystring
-	return nil
-}
-
-func Example() {
-	l := logrus.New()
-	l.Out = os.Stdout
-	l.Formatter = &logrus.TextFormatter{DisableTimestamp: true, DisableColors: true}
-	l.AddHook(&GlobalHook{})
-	mystring = "first value"
-	l.Info("first log")
-	mystring = "another value"
-	l.Info("second log")
-	// Output:
-	// level=info msg="first log" mystring="first value"
-	// level=info msg="second log" mystring="another value"
-}

vendor/github.com/sirupsen/logrus/example_hook_test.go

@@ -1,43 +0,0 @@
-// +build !windows
-
-package logrus_test
-
-import (
-	"log/syslog"
-	"os"
-
-	"github.com/sirupsen/logrus"
-	slhooks "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-// An example on how to use a hook
-func Example_hook() {
-	var log = logrus.New()
-	log.Formatter = new(logrus.TextFormatter)                     // default
-	log.Formatter.(*logrus.TextFormatter).DisableColors = true    // remove colors
-	log.Formatter.(*logrus.TextFormatter).DisableTimestamp = true // remove timestamp from test output
-	if sl, err := slhooks.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, ""); err == nil {
-		log.Hooks.Add(sl)
-	}
-	log.Out = os.Stdout
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"size":   10,
-	}).Info("A group of walrus emerges from the ocean")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 122,
-	}).Warn("The group's number increased tremendously!")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 100,
-	}).Error("The ice breaks!")
-
-	// Output:
-	// level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
-	// level=warning msg="The group's number increased tremendously!" number=122 omg=true
-	// level=error msg="The ice breaks!" number=100 omg=true
-}

vendor/github.com/sirupsen/logrus/exported.go

@@ -1,6 +1,7 @@
 package logrus
 
 import (
+	"context"
 	"io"
 	"time"
 )
@@ -55,6 +56,11 @@ func WithError(err error) *Entry {
 	return std.WithField(ErrorKey, err)
 }
 
+// WithContext creates an entry from the standard logger and adds a context to it.
+func WithContext(ctx context.Context) *Entry {
+	return std.WithContext(ctx)
+}
+
 // WithField creates an entry from the standard logger and adds a field to
 // it. If you want multiple fields, use `WithFields`.
 //

vendor/github.com/sirupsen/logrus/formatter_bench_test.go

@@ -1,101 +0,0 @@
-package logrus
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-// smallFields is a small size data set for benchmarking
-var smallFields = Fields{
-	"foo":   "bar",
-	"baz":   "qux",
-	"one":   "two",
-	"three": "four",
-}
-
-// largeFields is a large size data set for benchmarking
-var largeFields = Fields{
-	"foo":       "bar",
-	"baz":       "qux",
-	"one":       "two",
-	"three":     "four",
-	"five":      "six",
-	"seven":     "eight",
-	"nine":      "ten",
-	"eleven":    "twelve",
-	"thirteen":  "fourteen",
-	"fifteen":   "sixteen",
-	"seventeen": "eighteen",
-	"nineteen":  "twenty",
-	"a":         "b",
-	"c":         "d",
-	"e":         "f",
-	"g":         "h",
-	"i":         "j",
-	"k":         "l",
-	"m":         "n",
-	"o":         "p",
-	"q":         "r",
-	"s":         "t",
-	"u":         "v",
-	"w":         "x",
-	"y":         "z",
-	"this":      "will",
-	"make":      "thirty",
-	"entries":   "yeah",
-}
-
-var errorFields = Fields{
-	"foo": fmt.Errorf("bar"),
-	"baz": fmt.Errorf("qux"),
-}
-
-func BenchmarkErrorTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, errorFields)
-}
-
-func BenchmarkSmallTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func BenchmarkLargeTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, largeFields)
-}
-
-func BenchmarkSmallColoredTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{ForceColors: true}, smallFields)
-}
-
-func BenchmarkLargeColoredTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{ForceColors: true}, largeFields)
-}
-
-func BenchmarkSmallJSONFormatter(b *testing.B) {
-	doBenchmark(b, &JSONFormatter{}, smallFields)
-}
-
-func BenchmarkLargeJSONFormatter(b *testing.B) {
-	doBenchmark(b, &JSONFormatter{}, largeFields)
-}
-
-func doBenchmark(b *testing.B, formatter Formatter, fields Fields) {
-	logger := New()
-
-	entry := &Entry{
-		Time:    time.Time{},
-		Level:   InfoLevel,
-		Message: "message",
-		Data:    fields,
-		Logger:  logger,
-	}
-	var d []byte
-	var err error
-	for i := 0; i < b.N; i++ {
-		d, err = formatter.Format(entry)
-		if err != nil {
-			b.Fatal(err)
-		}
-		b.SetBytes(int64(len(d)))
-	}
-}

vendor/github.com/sirupsen/logrus/go.mod

@@ -6,6 +6,5 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.2.2
-	golang.org/x/crypto v0.0.0-20180904163835-0709b304e793
+	golang.org/x/sys v0.0.0-20190422165155-953cdadca894
-	golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33
 )

vendor/github.com/sirupsen/logrus/go.sum

@@ -2,6 +2,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs=
 github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -9,7 +10,7 @@ github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vendor/github.com/sirupsen/logrus/hook_test.go

@@ -1,192 +0,0 @@
-package logrus_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	. "github.com/sirupsen/logrus"
-	. "github.com/sirupsen/logrus/internal/testutils"
-)
-
-type TestHook struct {
-	Fired bool
-}
-
-func (hook *TestHook) Fire(entry *Entry) error {
-	hook.Fired = true
-	return nil
-}
-
-func (hook *TestHook) Levels() []Level {
-	return []Level{
-		TraceLevel,
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-	}
-}
-
-func TestHookFires(t *testing.T) {
-	hook := new(TestHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		assert.Equal(t, hook.Fired, false)
-
-		log.Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
-	})
-}
-
-type ModifyHook struct {
-}
-
-func (hook *ModifyHook) Fire(entry *Entry) error {
-	entry.Data["wow"] = "whale"
-	return nil
-}
-
-func (hook *ModifyHook) Levels() []Level {
-	return []Level{
-		TraceLevel,
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-	}
-}
-
-func TestHookCanModifyEntry(t *testing.T) {
-	hook := new(ModifyHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.WithField("wow", "elephant").Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-	})
-}
-
-func TestCanFireMultipleHooks(t *testing.T) {
-	hook1 := new(ModifyHook)
-	hook2 := new(TestHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook1)
-		log.Hooks.Add(hook2)
-
-		log.WithField("wow", "elephant").Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-		assert.Equal(t, hook2.Fired, true)
-	})
-}
-
-type SingleLevelModifyHook struct {
-	ModifyHook
-}
-
-func (h *SingleLevelModifyHook) Levels() []Level {
-	return []Level{InfoLevel}
-}
-
-func TestHookEntryIsPristine(t *testing.T) {
-	l := New()
-	b := &bytes.Buffer{}
-	l.Formatter = &JSONFormatter{}
-	l.Out = b
-	l.AddHook(&SingleLevelModifyHook{})
-
-	l.Error("error message")
-	data := map[string]string{}
-	err := json.Unmarshal(b.Bytes(), &data)
-	require.NoError(t, err)
-	_, ok := data["wow"]
-	require.False(t, ok)
-	b.Reset()
-
-	l.Info("error message")
-	data = map[string]string{}
-	err = json.Unmarshal(b.Bytes(), &data)
-	require.NoError(t, err)
-	_, ok = data["wow"]
-	require.True(t, ok)
-	b.Reset()
-
-	l.Error("error message")
-	data = map[string]string{}
-	err = json.Unmarshal(b.Bytes(), &data)
-	require.NoError(t, err)
-	_, ok = data["wow"]
-	require.False(t, ok)
-	b.Reset()
-}
-
-type ErrorHook struct {
-	Fired bool
-}
-
-func (hook *ErrorHook) Fire(entry *Entry) error {
-	hook.Fired = true
-	return nil
-}
-
-func (hook *ErrorHook) Levels() []Level {
-	return []Level{
-		ErrorLevel,
-	}
-}
-
-func TestErrorHookShouldntFireOnInfo(t *testing.T) {
-	hook := new(ErrorHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, false)
-	})
-}
-
-func TestErrorHookShouldFireOnError(t *testing.T) {
-	hook := new(ErrorHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.Error("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
-	})
-}
-
-func TestAddHookRace(t *testing.T) {
-	var wg sync.WaitGroup
-	wg.Add(2)
-	hook := new(ErrorHook)
-	LogAndAssertJSON(t, func(log *Logger) {
-		go func() {
-			defer wg.Done()
-			log.AddHook(hook)
-		}()
-		go func() {
-			defer wg.Done()
-			log.Error("test")
-		}()
-		wg.Wait()
-	}, func(fields Fields) {
-		// the line may have been logged
-		// before the hook was added, so we can't
-		// actually assert on the hook
-	})
-}

vendor/github.com/sirupsen/logrus/hooks/syslog/README.md

@@ -1,39 +0,0 @@
-# Syslog Hooks for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>
-
-## Usage
-
-```go
-import (
-  "log/syslog"
-  "github.com/sirupsen/logrus"
-  lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := lSyslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
-
-If you want to connect to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). Just assign empty string to the first two parameters of `NewSyslogHook`. It should look like the following.
-
-```go
-import (
-  "log/syslog"
-  "github.com/sirupsen/logrus"
-  lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```

vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go

@@ -1,55 +0,0 @@
-// +build !windows,!nacl,!plan9
-
-package syslog
-
-import (
-	"fmt"
-	"log/syslog"
-	"os"
-
-	"github.com/sirupsen/logrus"
-)
-
-// SyslogHook to send logs via syslog.
-type SyslogHook struct {
-	Writer        *syslog.Writer
-	SyslogNetwork string
-	SyslogRaddr   string
-}
-
-// Creates a hook to be added to an instance of logger. This is called with
-// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
-// `if err == nil { log.Hooks.Add(hook) }`
-func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
-	w, err := syslog.Dial(network, raddr, priority, tag)
-	return &SyslogHook{w, network, raddr}, err
-}
-
-func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
-	line, err := entry.String()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
-		return err
-	}
-
-	switch entry.Level {
-	case logrus.PanicLevel:
-		return hook.Writer.Crit(line)
-	case logrus.FatalLevel:
-		return hook.Writer.Crit(line)
-	case logrus.ErrorLevel:
-		return hook.Writer.Err(line)
-	case logrus.WarnLevel:
-		return hook.Writer.Warning(line)
-	case logrus.InfoLevel:
-		return hook.Writer.Info(line)
-	case logrus.DebugLevel, logrus.TraceLevel:
-		return hook.Writer.Debug(line)
-	default:
-		return nil
-	}
-}
-
-func (hook *SyslogHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}

vendor/github.com/sirupsen/logrus/hooks/syslog/syslog_test.go

@@ -1,29 +0,0 @@
-// +build !windows,!nacl,!plan9
-
-package syslog
-
-import (
-	"log/syslog"
-	"testing"
-
-	"github.com/sirupsen/logrus"
-)
-
-func TestLocalhostAddAndPrint(t *testing.T) {
-	log := logrus.New()
-	hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-	if err != nil {
-		t.Errorf("Unable to connect to local syslog.")
-	}
-
-	log.Hooks.Add(hook)
-
-	for _, level := range hook.Levels() {
-		if len(log.Hooks[level]) != 1 {
-			t.Errorf("SyslogHook was not added. The length of log.Hooks[%v]: %v", level, len(log.Hooks[level]))
-		}
-	}
-
-	log.Info("Congratulations!")
-}

vendor/github.com/sirupsen/logrus/internal/testutils/testutils.go

@@ -1,58 +0,0 @@
-package testutils
-
-import (
-	"bytes"
-	"encoding/json"
-	"strconv"
-	"strings"
-	"testing"
-
-	. "github.com/sirupsen/logrus"
-
-	"github.com/stretchr/testify/require"
-)
-
-func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fields)) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	log(logger)
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	require.Nil(t, err)
-
-	assertions(fields)
-}
-
-func LogAndAssertText(t *testing.T, log func(*Logger), assertions func(fields map[string]string)) {
-	var buffer bytes.Buffer
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = &TextFormatter{
-		DisableColors: true,
-	}
-
-	log(logger)
-
-	fields := make(map[string]string)
-	for _, kv := range strings.Split(buffer.String(), " ") {
-		if !strings.Contains(kv, "=") {
-			continue
-		}
-		kvArr := strings.Split(kv, "=")
-		key := strings.TrimSpace(kvArr[0])
-		val := kvArr[1]
-		if kvArr[1][0] == '"' {
-			var err error
-			val, err = strconv.Unquote(val)
-			require.NoError(t, err)
-		}
-		fields[key] = val
-	}
-	assertions(fields)
-}

vendor/github.com/sirupsen/logrus/json_formatter.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"runtime"
 )
 
 type fieldKey string
@@ -42,6 +43,12 @@ type JSONFormatter struct {
 	// }
 	FieldMap FieldMap
 
+	// CallerPrettyfier can be set by the user to modify the content
+	// of the function and file keys in the json data when ReportCaller is
+	// activated. If any of the returned value is the empty string the
+	// corresponding key will be removed from json fields.
+	CallerPrettyfier func(*runtime.Frame) (function string, file string)
+
 	// PrettyPrint will indent all json logs
 	PrettyPrint bool
 }
@@ -82,8 +89,17 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 	data[f.FieldMap.resolve(FieldKeyMsg)] = entry.Message
 	data[f.FieldMap.resolve(FieldKeyLevel)] = entry.Level.String()
 	if entry.HasCaller() {
-		data[f.FieldMap.resolve(FieldKeyFunc)] = entry.Caller.Function
+		funcVal := entry.Caller.Function
-		data[f.FieldMap.resolve(FieldKeyFile)] = fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+		fileVal := fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+		if f.CallerPrettyfier != nil {
+			funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+		}
+		if funcVal != "" {
+			data[f.FieldMap.resolve(FieldKeyFunc)] = funcVal
+		}
+		if fileVal != "" {
+			data[f.FieldMap.resolve(FieldKeyFile)] = fileVal
+		}
 	}
 
 	var b *bytes.Buffer
@@ -98,7 +114,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 		encoder.SetIndent("", "  ")
 	}
 	if err := encoder.Encode(data); err != nil {
-		return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
+		return nil, fmt.Errorf("failed to marshal fields to JSON, %v", err)
 	}
 
 	return b.Bytes(), nil

vendor/github.com/sirupsen/logrus/json_formatter_test.go

@@ -1,346 +0,0 @@
-package logrus
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestErrorNotLost(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("error", errors.New("wild walrus")))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["error"] != "wild walrus" {
-		t.Fatal("Error field not set")
-	}
-}
-
-func TestErrorNotLostOnFieldNotNamedError(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("omg", errors.New("wild walrus")))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["omg"] != "wild walrus" {
-		t.Fatal("Error field not set")
-	}
-}
-
-func TestFieldClashWithTime(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("time", "right now!"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.time"] != "right now!" {
-		t.Fatal("fields.time not set to original time field")
-	}
-
-	if entry["time"] != "0001-01-01T00:00:00Z" {
-		t.Fatal("time field not set to current time, was: ", entry["time"])
-	}
-}
-
-func TestFieldClashWithMsg(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("msg", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.msg"] != "something" {
-		t.Fatal("fields.msg not set to original msg field")
-	}
-}
-
-func TestFieldClashWithLevel(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.level"] != "something" {
-		t.Fatal("fields.level not set to original level field")
-	}
-}
-
-func TestFieldClashWithRemappedFields(t *testing.T) {
-	formatter := &JSONFormatter{
-		FieldMap: FieldMap{
-			FieldKeyTime:  "@timestamp",
-			FieldKeyLevel: "@level",
-			FieldKeyMsg:   "@message",
-		},
-	}
-
-	b, err := formatter.Format(WithFields(Fields{
-		"@timestamp": "@timestamp",
-		"@level":     "@level",
-		"@message":   "@message",
-		"timestamp":  "timestamp",
-		"level":      "level",
-		"msg":        "msg",
-	}))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	for _, field := range []string{"timestamp", "level", "msg"} {
-		if entry[field] != field {
-			t.Errorf("Expected field %v to be untouched; got %v", field, entry[field])
-		}
-
-		remappedKey := fmt.Sprintf("fields.%s", field)
-		if remapped, ok := entry[remappedKey]; ok {
-			t.Errorf("Expected %s to be empty; got %v", remappedKey, remapped)
-		}
-	}
-
-	for _, field := range []string{"@timestamp", "@level", "@message"} {
-		if entry[field] == field {
-			t.Errorf("Expected field %v to be mapped to an Entry value", field)
-		}
-
-		remappedKey := fmt.Sprintf("fields.%s", field)
-		if remapped, ok := entry[remappedKey]; ok {
-			if remapped != field {
-				t.Errorf("Expected field %v to be copied to %s; got %v", field, remappedKey, remapped)
-			}
-		} else {
-			t.Errorf("Expected field %v to be copied to %s; was absent", field, remappedKey)
-		}
-	}
-}
-
-func TestFieldsInNestedDictionary(t *testing.T) {
-	formatter := &JSONFormatter{
-		DataKey: "args",
-	}
-
-	logEntry := WithFields(Fields{
-		"level": "level",
-		"test":  "test",
-	})
-	logEntry.Level = InfoLevel
-
-	b, err := formatter.Format(logEntry)
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	args := entry["args"].(map[string]interface{})
-
-	for _, field := range []string{"test", "level"} {
-		if value, present := args[field]; !present || value != field {
-			t.Errorf("Expected field %v to be present under 'args'; untouched", field)
-		}
-	}
-
-	for _, field := range []string{"test", "fields.level"} {
-		if _, present := entry[field]; present {
-			t.Errorf("Expected field %v not to be present at top level", field)
-		}
-	}
-
-	// with nested object, "level" shouldn't clash
-	if entry["level"] != "info" {
-		t.Errorf("Expected 'level' field to contain 'info'")
-	}
-}
-
-func TestJSONEntryEndsWithNewline(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	if b[len(b)-1] != '\n' {
-		t.Fatal("Expected JSON log entry to end with a newline")
-	}
-}
-
-func TestJSONMessageKey(t *testing.T) {
-	formatter := &JSONFormatter{
-		FieldMap: FieldMap{
-			FieldKeyMsg: "message",
-		},
-	}
-
-	b, err := formatter.Format(&Entry{Message: "oh hai"})
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-	s := string(b)
-	if !(strings.Contains(s, "message") && strings.Contains(s, "oh hai")) {
-		t.Fatal("Expected JSON to format message key")
-	}
-}
-
-func TestJSONLevelKey(t *testing.T) {
-	formatter := &JSONFormatter{
-		FieldMap: FieldMap{
-			FieldKeyLevel: "somelevel",
-		},
-	}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-	s := string(b)
-	if !strings.Contains(s, "somelevel") {
-		t.Fatal("Expected JSON to format level key")
-	}
-}
-
-func TestJSONTimeKey(t *testing.T) {
-	formatter := &JSONFormatter{
-		FieldMap: FieldMap{
-			FieldKeyTime: "timeywimey",
-		},
-	}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-	s := string(b)
-	if !strings.Contains(s, "timeywimey") {
-		t.Fatal("Expected JSON to format time key")
-	}
-}
-
-func TestFieldDoesNotClashWithCaller(t *testing.T) {
-	SetReportCaller(false)
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("func", "howdy pardner"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["func"] != "howdy pardner" {
-		t.Fatal("func field replaced when ReportCaller=false")
-	}
-}
-
-func TestFieldClashWithCaller(t *testing.T) {
-	SetReportCaller(true)
-	formatter := &JSONFormatter{}
-	e := WithField("func", "howdy pardner")
-	e.Caller = &runtime.Frame{Function: "somefunc"}
-	b, err := formatter.Format(e)
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.func"] != "howdy pardner" {
-		t.Fatalf("fields.func not set to original func field when ReportCaller=true (got '%s')",
-			entry["fields.func"])
-	}
-
-	if entry["func"] != "somefunc" {
-		t.Fatalf("func not set as expected when ReportCaller=true (got '%s')",
-			entry["func"])
-	}
-
-	SetReportCaller(false) // return to default value
-}
-
-func TestJSONDisableTimestamp(t *testing.T) {
-	formatter := &JSONFormatter{
-		DisableTimestamp: true,
-	}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-	s := string(b)
-	if strings.Contains(s, FieldKeyTime) {
-		t.Error("Did not prevent timestamp", s)
-	}
-}
-
-func TestJSONEnableTimestamp(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-	s := string(b)
-	if !strings.Contains(s, FieldKeyTime) {
-		t.Error("Timestamp not present", s)
-	}
-}

vendor/github.com/sirupsen/logrus/logger.go

@@ -1,6 +1,7 @@
 package logrus
 
 import (
+	"context"
 	"io"
 	"os"
 	"sync"
@@ -124,6 +125,13 @@ func (logger *Logger) WithError(err error) *Entry {
 	return entry.WithError(err)
 }
 
+// Add a context to the log entry.
+func (logger *Logger) WithContext(ctx context.Context) *Entry {
+	entry := logger.newEntry()
+	defer logger.releaseEntry(entry)
+	return entry.WithContext(ctx)
+}
+
 // Overrides the time of the log entry.
 func (logger *Logger) WithTime(t time.Time) *Entry {
 	entry := logger.newEntry()
@@ -131,28 +139,24 @@ func (logger *Logger) WithTime(t time.Time) *Entry {
 	return entry.WithTime(t)
 }
 
-func (logger *Logger) Tracef(format string, args ...interface{}) {
+func (logger *Logger) Logf(level Level, format string, args ...interface{}) {
-	if logger.IsLevelEnabled(TraceLevel) {
+	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
-		entry.Tracef(format, args...)
+		entry.Logf(level, format, args...)
 		logger.releaseEntry(entry)
 	}
 }
 
+func (logger *Logger) Tracef(format string, args ...interface{}) {
+	logger.Logf(TraceLevel, format, args...)
+}
+
 func (logger *Logger) Debugf(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(DebugLevel) {
+	logger.Logf(DebugLevel, format, args...)
-		entry := logger.newEntry()
-		entry.Debugf(format, args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Infof(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(InfoLevel) {
+	logger.Logf(InfoLevel, format, args...)
-		entry := logger.newEntry()
-		entry.Infof(format, args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Printf(format string, args ...interface{}) {
@@ -162,139 +166,91 @@ func (logger *Logger) Printf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Warnf(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(WarnLevel) {
+	logger.Logf(WarnLevel, format, args...)
-		entry := logger.newEntry()
-		entry.Warnf(format, args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Warningf(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(WarnLevel) {
+	logger.Warnf(format, args...)
-		entry := logger.newEntry()
-		entry.Warnf(format, args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Errorf(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(ErrorLevel) {
+	logger.Logf(ErrorLevel, format, args...)
-		entry := logger.newEntry()
-		entry.Errorf(format, args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Fatalf(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(FatalLevel) {
+	logger.Logf(FatalLevel, format, args...)
-		entry := logger.newEntry()
-		entry.Fatalf(format, args...)
-		logger.releaseEntry(entry)
-	}
 	logger.Exit(1)
 }
 
 func (logger *Logger) Panicf(format string, args ...interface{}) {
-	if logger.IsLevelEnabled(PanicLevel) {
+	logger.Logf(PanicLevel, format, args...)
+}
+
+func (logger *Logger) Log(level Level, args ...interface{}) {
+	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
-		entry.Panicf(format, args...)
+		entry.Log(level, args...)
 		logger.releaseEntry(entry)
 	}
 }
 
 func (logger *Logger) Trace(args ...interface{}) {
-	if logger.IsLevelEnabled(TraceLevel) {
+	logger.Log(TraceLevel, args...)
-		entry := logger.newEntry()
-		entry.Trace(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Debug(args ...interface{}) {
-	if logger.IsLevelEnabled(DebugLevel) {
+	logger.Log(DebugLevel, args...)
-		entry := logger.newEntry()
-		entry.Debug(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Info(args ...interface{}) {
-	if logger.IsLevelEnabled(InfoLevel) {
+	logger.Log(InfoLevel, args...)
-		entry := logger.newEntry()
-		entry.Info(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Print(args ...interface{}) {
 	entry := logger.newEntry()
-	entry.Info(args...)
+	entry.Print(args...)
 	logger.releaseEntry(entry)
 }
 
 func (logger *Logger) Warn(args ...interface{}) {
-	if logger.IsLevelEnabled(WarnLevel) {
+	logger.Log(WarnLevel, args...)
-		entry := logger.newEntry()
-		entry.Warn(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Warning(args ...interface{}) {
-	if logger.IsLevelEnabled(WarnLevel) {
+	logger.Warn(args...)
-		entry := logger.newEntry()
-		entry.Warn(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Error(args ...interface{}) {
-	if logger.IsLevelEnabled(ErrorLevel) {
+	logger.Log(ErrorLevel, args...)
-		entry := logger.newEntry()
-		entry.Error(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Fatal(args ...interface{}) {
-	if logger.IsLevelEnabled(FatalLevel) {
+	logger.Log(FatalLevel, args...)
-		entry := logger.newEntry()
-		entry.Fatal(args...)
-		logger.releaseEntry(entry)
-	}
 	logger.Exit(1)
 }
 
 func (logger *Logger) Panic(args ...interface{}) {
-	if logger.IsLevelEnabled(PanicLevel) {
+	logger.Log(PanicLevel, args...)
+}
+
+func (logger *Logger) Logln(level Level, args ...interface{}) {
+	if logger.IsLevelEnabled(level) {
 		entry := logger.newEntry()
-		entry.Panic(args...)
+		entry.Logln(level, args...)
 		logger.releaseEntry(entry)
 	}
 }
 
 func (logger *Logger) Traceln(args ...interface{}) {
-	if logger.IsLevelEnabled(TraceLevel) {
+	logger.Logln(TraceLevel, args...)
-		entry := logger.newEntry()
-		entry.Traceln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Debugln(args ...interface{}) {
-	if logger.IsLevelEnabled(DebugLevel) {
+	logger.Logln(DebugLevel, args...)
-		entry := logger.newEntry()
-		entry.Debugln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Infoln(args ...interface{}) {
-	if logger.IsLevelEnabled(InfoLevel) {
+	logger.Logln(InfoLevel, args...)
-		entry := logger.newEntry()
-		entry.Infoln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Println(args ...interface{}) {
@@ -304,44 +260,24 @@ func (logger *Logger) Println(args ...interface{}) {
 }
 
 func (logger *Logger) Warnln(args ...interface{}) {
-	if logger.IsLevelEnabled(WarnLevel) {
+	logger.Logln(WarnLevel, args...)
-		entry := logger.newEntry()
-		entry.Warnln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Warningln(args ...interface{}) {
-	if logger.IsLevelEnabled(WarnLevel) {
+	logger.Warnln(args...)
-		entry := logger.newEntry()
-		entry.Warnln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Errorln(args ...interface{}) {
-	if logger.IsLevelEnabled(ErrorLevel) {
+	logger.Logln(ErrorLevel, args...)
-		entry := logger.newEntry()
-		entry.Errorln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Fatalln(args ...interface{}) {
-	if logger.IsLevelEnabled(FatalLevel) {
+	logger.Logln(FatalLevel, args...)
-		entry := logger.newEntry()
-		entry.Fatalln(args...)
-		logger.releaseEntry(entry)
-	}
 	logger.Exit(1)
 }
 
 func (logger *Logger) Panicln(args ...interface{}) {
-	if logger.IsLevelEnabled(PanicLevel) {
+	logger.Logln(PanicLevel, args...)
-		entry := logger.newEntry()
-		entry.Panicln(args...)
-		logger.releaseEntry(entry)
-	}
 }
 
 func (logger *Logger) Exit(code int) {

vendor/github.com/sirupsen/logrus/logger_bench_test.go

@@ -1,85 +0,0 @@
-package logrus
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-// smallFields is a small size data set for benchmarking
-var loggerFields = Fields{
-	"foo":   "bar",
-	"baz":   "qux",
-	"one":   "two",
-	"three": "four",
-}
-
-func BenchmarkDummyLogger(b *testing.B) {
-	nullf, err := os.OpenFile("/dev/null", os.O_WRONLY, 0666)
-	if err != nil {
-		b.Fatalf("%v", err)
-	}
-	defer nullf.Close()
-	doLoggerBenchmark(b, nullf, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func BenchmarkDummyLoggerNoLock(b *testing.B) {
-	nullf, err := os.OpenFile("/dev/null", os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		b.Fatalf("%v", err)
-	}
-	defer nullf.Close()
-	doLoggerBenchmarkNoLock(b, nullf, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func doLoggerBenchmark(b *testing.B, out *os.File, formatter Formatter, fields Fields) {
-	logger := Logger{
-		Out:       out,
-		Level:     InfoLevel,
-		Formatter: formatter,
-	}
-	entry := logger.WithFields(fields)
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			entry.Info("aaa")
-		}
-	})
-}
-
-func doLoggerBenchmarkNoLock(b *testing.B, out *os.File, formatter Formatter, fields Fields) {
-	logger := Logger{
-		Out:       out,
-		Level:     InfoLevel,
-		Formatter: formatter,
-	}
-	logger.SetNoLock()
-	entry := logger.WithFields(fields)
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			entry.Info("aaa")
-		}
-	})
-}
-
-func BenchmarkLoggerJSONFormatter(b *testing.B) {
-	doLoggerBenchmarkWithFormatter(b, &JSONFormatter{})
-}
-
-func BenchmarkLoggerTextFormatter(b *testing.B) {
-	doLoggerBenchmarkWithFormatter(b, &TextFormatter{})
-}
-
-func doLoggerBenchmarkWithFormatter(b *testing.B, f Formatter) {
-	b.SetParallelism(100)
-	log := New()
-	log.Formatter = f
-	log.Out = ioutil.Discard
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			log.
-				WithField("foo1", "bar1").
-				WithField("foo2", "bar2").
-				Info("this is a dummy log")
-		}
-	})
-}

vendor/github.com/sirupsen/logrus/logger_test.go

@@ -1,42 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestFieldValueError(t *testing.T) {
-	buf := &bytes.Buffer{}
-	l := &Logger{
-		Out:       buf,
-		Formatter: new(JSONFormatter),
-		Hooks:     make(LevelHooks),
-		Level:     DebugLevel,
-	}
-	l.WithField("func", func() {}).Info("test")
-	fmt.Println(buf.String())
-	var data map[string]interface{}
-	json.Unmarshal(buf.Bytes(), &data)
-	_, ok := data[FieldKeyLogrusError]
-	require.True(t, ok)
-}
-
-func TestNoFieldValueError(t *testing.T) {
-	buf := &bytes.Buffer{}
-	l := &Logger{
-		Out:       buf,
-		Formatter: new(JSONFormatter),
-		Hooks:     make(LevelHooks),
-		Level:     DebugLevel,
-	}
-	l.WithField("str", "str").Info("test")
-	fmt.Println(buf.String())
-	var data map[string]interface{}
-	json.Unmarshal(buf.Bytes(), &data)
-	_, ok := data[FieldKeyLogrusError]
-	require.False(t, ok)
-}

vendor/github.com/sirupsen/logrus/logrus.go

@@ -14,24 +14,11 @@ type Level uint32
 
 // Convert the Level to a string. E.g. PanicLevel becomes "panic".
 func (level Level) String() string {
-	switch level {
+	if b, err := level.MarshalText(); err == nil {
-	case TraceLevel:
+		return string(b)
-		return "trace"
+	} else {
-	case DebugLevel:
+		return "unknown"
-		return "debug"
-	case InfoLevel:
-		return "info"
-	case WarnLevel:
-		return "warning"
-	case ErrorLevel:
-		return "error"
-	case FatalLevel:
-		return "fatal"
-	case PanicLevel:
-		return "panic"
 	}
-
-	return "unknown"
 }
 
 // ParseLevel takes a string level and returns the Logrus log level constant.
@@ -69,6 +56,27 @@ func (level *Level) UnmarshalText(text []byte) error {
 	return nil
 }
 
+func (level Level) MarshalText() ([]byte, error) {
+	switch level {
+	case TraceLevel:
+		return []byte("trace"), nil
+	case DebugLevel:
+		return []byte("debug"), nil
+	case InfoLevel:
+		return []byte("info"), nil
+	case WarnLevel:
+		return []byte("warning"), nil
+	case ErrorLevel:
+		return []byte("error"), nil
+	case FatalLevel:
+		return []byte("fatal"), nil
+	case PanicLevel:
+		return []byte("panic"), nil
+	}
+
+	return nil, fmt.Errorf("not a valid logrus level %d", level)
+}
+
 // A constant exposing all logging levels
 var AllLevels = []Level{
 	PanicLevel,

vendor/github.com/sirupsen/logrus/logrus_test.go

@@ -1,716 +0,0 @@
-package logrus_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	. "github.com/sirupsen/logrus"
-	. "github.com/sirupsen/logrus/internal/testutils"
-)
-
-// TestReportCaller verifies that when ReportCaller is set, the 'func' field
-// is added, and when it is unset it is not set or modified
-// Verify that functions within the Logrus package aren't considered when
-// discovering the caller.
-func TestReportCallerWhenConfigured(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.ReportCaller = false
-		log.Print("testNoCaller")
-	}, func(fields Fields) {
-		assert.Equal(t, "testNoCaller", fields["msg"])
-		assert.Equal(t, "info", fields["level"])
-		assert.Equal(t, nil, fields["func"])
-	})
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.ReportCaller = true
-		log.Print("testWithCaller")
-	}, func(fields Fields) {
-		assert.Equal(t, "testWithCaller", fields["msg"])
-		assert.Equal(t, "info", fields["level"])
-		assert.Equal(t,
-			"github.com/sirupsen/logrus_test.TestReportCallerWhenConfigured.func3", fields["func"])
-	})
-}
-
-func logSomething(t *testing.T, message string) Fields {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-	logger.ReportCaller = true
-
-	entry := logger.WithFields(Fields{
-		"foo": "bar",
-	})
-
-	entry.Info(message)
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	return fields
-}
-
-// TestReportCallerHelperDirect - verify reference when logging from a regular function
-func TestReportCallerHelperDirect(t *testing.T) {
-	fields := logSomething(t, "direct")
-
-	assert.Equal(t, "direct", fields["msg"])
-	assert.Equal(t, "info", fields["level"])
-	assert.Regexp(t, "github.com/.*/logrus_test.logSomething", fields["func"])
-}
-
-// TestReportCallerHelperDirect - verify reference when logging from a function called via pointer
-func TestReportCallerHelperViaPointer(t *testing.T) {
-	fptr := logSomething
-	fields := fptr(t, "via pointer")
-
-	assert.Equal(t, "via pointer", fields["msg"])
-	assert.Equal(t, "info", fields["level"])
-	assert.Regexp(t, "github.com/.*/logrus_test.logSomething", fields["func"])
-}
-
-func TestPrint(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "test", fields["msg"])
-		assert.Equal(t, "info", fields["level"])
-	})
-}
-
-func TestInfo(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "test", fields["msg"])
-		assert.Equal(t, "info", fields["level"])
-	})
-}
-
-func TestWarn(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Warn("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "test", fields["msg"])
-		assert.Equal(t, "warning", fields["level"])
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln("test", "test")
-	}, func(fields Fields) {
-		assert.Equal(t, "test test", fields["msg"])
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenStringAndNonstring(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln("test", 10)
-	}, func(fields Fields) {
-		assert.Equal(t, "test 10", fields["msg"])
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln(10, 10)
-	}, func(fields Fields) {
-		assert.Equal(t, "10 10", fields["msg"])
-	})
-}
-
-func TestInfoShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln(10, 10)
-	}, func(fields Fields) {
-		assert.Equal(t, "10 10", fields["msg"])
-	})
-}
-
-func TestInfoShouldNotAddSpacesBetweenStringAndNonstring(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test", 10)
-	}, func(fields Fields) {
-		assert.Equal(t, "test10", fields["msg"])
-	})
-}
-
-func TestInfoShouldNotAddSpacesBetweenStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test", "test")
-	}, func(fields Fields) {
-		assert.Equal(t, "testtest", fields["msg"])
-	})
-}
-
-func TestWithFieldsShouldAllowAssignments(t *testing.T) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	localLog := logger.WithFields(Fields{
-		"key1": "value1",
-	})
-
-	localLog.WithField("key2", "value2").Info("test")
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	assert.Equal(t, "value2", fields["key2"])
-	assert.Equal(t, "value1", fields["key1"])
-
-	buffer = bytes.Buffer{}
-	fields = Fields{}
-	localLog.Info("test")
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	_, ok := fields["key2"]
-	assert.Equal(t, false, ok)
-	assert.Equal(t, "value1", fields["key1"])
-}
-
-func TestUserSuppliedFieldDoesNotOverwriteDefaults(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("msg", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "test", fields["msg"])
-	})
-}
-
-func TestUserSuppliedMsgFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("msg", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "test", fields["msg"])
-		assert.Equal(t, "hello", fields["fields.msg"])
-	})
-}
-
-func TestUserSuppliedTimeFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("time", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "hello", fields["fields.time"])
-	})
-}
-
-func TestUserSuppliedLevelFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("level", 1).Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, "info", fields["level"])
-		assert.Equal(t, 1.0, fields["fields.level"]) // JSON has floats only
-	})
-}
-
-func TestDefaultFieldsAreNotPrefixed(t *testing.T) {
-	LogAndAssertText(t, func(log *Logger) {
-		ll := log.WithField("herp", "derp")
-		ll.Info("hello")
-		ll.Info("bye")
-	}, func(fields map[string]string) {
-		for _, fieldName := range []string{"fields.level", "fields.time", "fields.msg"} {
-			if _, ok := fields[fieldName]; ok {
-				t.Fatalf("should not have prefixed %q: %v", fieldName, fields)
-			}
-		}
-	})
-}
-
-func TestWithTimeShouldOverrideTime(t *testing.T) {
-	now := time.Now().Add(24 * time.Hour)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithTime(now).Info("foobar")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["time"], now.Format(time.RFC3339))
-	})
-}
-
-func TestWithTimeShouldNotOverrideFields(t *testing.T) {
-	now := time.Now().Add(24 * time.Hour)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("herp", "derp").WithTime(now).Info("blah")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["time"], now.Format(time.RFC3339))
-		assert.Equal(t, fields["herp"], "derp")
-	})
-}
-
-func TestWithFieldShouldNotOverrideTime(t *testing.T) {
-	now := time.Now().Add(24 * time.Hour)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithTime(now).WithField("herp", "derp").Info("blah")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["time"], now.Format(time.RFC3339))
-		assert.Equal(t, fields["herp"], "derp")
-	})
-}
-
-func TestTimeOverrideMultipleLogs(t *testing.T) {
-	var buffer bytes.Buffer
-	var firstFields, secondFields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	formatter := new(JSONFormatter)
-	formatter.TimestampFormat = time.StampMilli
-	logger.Formatter = formatter
-
-	llog := logger.WithField("herp", "derp")
-	llog.Info("foo")
-
-	err := json.Unmarshal(buffer.Bytes(), &firstFields)
-	assert.NoError(t, err, "should have decoded first message")
-
-	buffer.Reset()
-
-	time.Sleep(10 * time.Millisecond)
-	llog.Info("bar")
-
-	err = json.Unmarshal(buffer.Bytes(), &secondFields)
-	assert.NoError(t, err, "should have decoded second message")
-
-	assert.NotEqual(t, firstFields["time"], secondFields["time"], "timestamps should not be equal")
-}
-
-func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
-
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	llog := logger.WithField("context", "eating raw fish")
-
-	llog.Info("looks delicious")
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded first message")
-	assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
-	assert.Equal(t, fields["msg"], "looks delicious")
-	assert.Equal(t, fields["context"], "eating raw fish")
-
-	buffer.Reset()
-
-	llog.Warn("omg it is!")
-
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded second message")
-	assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
-	assert.Equal(t, "omg it is!", fields["msg"])
-	assert.Equal(t, "eating raw fish", fields["context"])
-	assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
-
-}
-
-func TestNestedLoggingReportsCorrectCaller(t *testing.T) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-	logger.ReportCaller = true
-
-	llog := logger.WithField("context", "eating raw fish")
-
-	llog.Info("looks delicious")
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	require.NoError(t, err, "should have decoded first message")
-	assert.Equal(t, 6, len(fields), "should have msg/time/level/func/context fields")
-	assert.Equal(t, "looks delicious", fields["msg"])
-	assert.Equal(t, "eating raw fish", fields["context"])
-	assert.Equal(t,
-		"github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"])
-	cwd, err := os.Getwd()
-	require.NoError(t, err)
-	assert.Equal(t, filepath.ToSlash(cwd+"/logrus_test.go:340"), filepath.ToSlash(fields["file"].(string)))
-
-	buffer.Reset()
-
-	logger.WithFields(Fields{
-		"Clyde": "Stubblefield",
-	}).WithFields(Fields{
-		"Jab'o": "Starks",
-	}).WithFields(Fields{
-		"uri": "https://www.youtube.com/watch?v=V5DTznu-9v0",
-	}).WithFields(Fields{
-		"func": "y drummer",
-	}).WithFields(Fields{
-		"James": "Brown",
-	}).Print("The hardest workin' man in show business")
-
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded second message")
-	assert.Equal(t, 11, len(fields), "should have all builtin fields plus foo,bar,baz,...")
-	assert.Equal(t, "Stubblefield", fields["Clyde"])
-	assert.Equal(t, "Starks", fields["Jab'o"])
-	assert.Equal(t, "https://www.youtube.com/watch?v=V5DTznu-9v0", fields["uri"])
-	assert.Equal(t, "y drummer", fields["fields.func"])
-	assert.Equal(t, "Brown", fields["James"])
-	assert.Equal(t, "The hardest workin' man in show business", fields["msg"])
-	assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
-	assert.Equal(t,
-		"github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"])
-	require.NoError(t, err)
-	assert.Equal(t, filepath.ToSlash(cwd+"/logrus_test.go:365"), filepath.ToSlash(fields["file"].(string)))
-
-	logger.ReportCaller = false // return to default value
-}
-
-func logLoop(iterations int, reportCaller bool) {
-	var buffer bytes.Buffer
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-	logger.ReportCaller = reportCaller
-
-	for i := 0; i < iterations; i++ {
-		logger.Infof("round %d of %d", i, iterations)
-	}
-}
-
-// Assertions for upper bounds to reporting overhead
-func TestCallerReportingOverhead(t *testing.T) {
-	iterations := 5000
-	before := time.Now()
-	logLoop(iterations, false)
-	during := time.Now()
-	logLoop(iterations, true)
-	after := time.Now()
-
-	elapsedNotReporting := during.Sub(before).Nanoseconds()
-	elapsedReporting := after.Sub(during).Nanoseconds()
-
-	maxDelta := 1 * time.Second
-	assert.WithinDuration(t, during, before, maxDelta,
-		"%d log calls without caller name lookup takes less than %d second(s) (was %d nanoseconds)",
-		iterations, maxDelta.Seconds(), elapsedNotReporting)
-	assert.WithinDuration(t, after, during, maxDelta,
-		"%d log calls without caller name lookup takes less than %d second(s) (was %d nanoseconds)",
-		iterations, maxDelta.Seconds(), elapsedReporting)
-}
-
-// benchmarks for both with and without caller-function reporting
-func BenchmarkWithoutCallerTracing(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		logLoop(1000, false)
-	}
-}
-
-func BenchmarkWithCallerTracing(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		logLoop(1000, true)
-	}
-}
-
-func TestConvertLevelToString(t *testing.T) {
-	assert.Equal(t, "trace", TraceLevel.String())
-	assert.Equal(t, "debug", DebugLevel.String())
-	assert.Equal(t, "info", InfoLevel.String())
-	assert.Equal(t, "warning", WarnLevel.String())
-	assert.Equal(t, "error", ErrorLevel.String())
-	assert.Equal(t, "fatal", FatalLevel.String())
-	assert.Equal(t, "panic", PanicLevel.String())
-}
-
-func TestParseLevel(t *testing.T) {
-	l, err := ParseLevel("panic")
-	assert.Nil(t, err)
-	assert.Equal(t, PanicLevel, l)
-
-	l, err = ParseLevel("PANIC")
-	assert.Nil(t, err)
-	assert.Equal(t, PanicLevel, l)
-
-	l, err = ParseLevel("fatal")
-	assert.Nil(t, err)
-	assert.Equal(t, FatalLevel, l)
-
-	l, err = ParseLevel("FATAL")
-	assert.Nil(t, err)
-	assert.Equal(t, FatalLevel, l)
-
-	l, err = ParseLevel("error")
-	assert.Nil(t, err)
-	assert.Equal(t, ErrorLevel, l)
-
-	l, err = ParseLevel("ERROR")
-	assert.Nil(t, err)
-	assert.Equal(t, ErrorLevel, l)
-
-	l, err = ParseLevel("warn")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("WARN")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("warning")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("WARNING")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("info")
-	assert.Nil(t, err)
-	assert.Equal(t, InfoLevel, l)
-
-	l, err = ParseLevel("INFO")
-	assert.Nil(t, err)
-	assert.Equal(t, InfoLevel, l)
-
-	l, err = ParseLevel("debug")
-	assert.Nil(t, err)
-	assert.Equal(t, DebugLevel, l)
-
-	l, err = ParseLevel("DEBUG")
-	assert.Nil(t, err)
-	assert.Equal(t, DebugLevel, l)
-
-	l, err = ParseLevel("trace")
-	assert.Nil(t, err)
-	assert.Equal(t, TraceLevel, l)
-
-	l, err = ParseLevel("TRACE")
-	assert.Nil(t, err)
-	assert.Equal(t, TraceLevel, l)
-
-	l, err = ParseLevel("invalid")
-	assert.Equal(t, "not a valid logrus Level: \"invalid\"", err.Error())
-}
-
-func TestUnmarshalText(t *testing.T) {
-	var u Level
-	for _, level := range AllLevels {
-		t.Run(level.String(), func(t *testing.T) {
-			assert.NoError(t, u.UnmarshalText([]byte(level.String())))
-			assert.Equal(t, level, u)
-		})
-	}
-	t.Run("invalid", func(t *testing.T) {
-		assert.Error(t, u.UnmarshalText([]byte("invalid")))
-	})
-}
-
-func TestGetSetLevelRace(t *testing.T) {
-	wg := sync.WaitGroup{}
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			if i%2 == 0 {
-				SetLevel(InfoLevel)
-			} else {
-				GetLevel()
-			}
-		}(i)
-
-	}
-	wg.Wait()
-}
-
-func TestLoggingRace(t *testing.T) {
-	logger := New()
-
-	var wg sync.WaitGroup
-	wg.Add(100)
-
-	for i := 0; i < 100; i++ {
-		go func() {
-			logger.Info("info")
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
-
-func TestLoggingRaceWithHooksOnEntry(t *testing.T) {
-	logger := New()
-	hook := new(ModifyHook)
-	logger.AddHook(hook)
-	entry := logger.WithField("context", "clue")
-
-	var wg sync.WaitGroup
-	wg.Add(100)
-
-	for i := 0; i < 100; i++ {
-		go func() {
-			entry.Info("info")
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
-
-func TestReplaceHooks(t *testing.T) {
-	old, cur := &TestHook{}, &TestHook{}
-
-	logger := New()
-	logger.SetOutput(ioutil.Discard)
-	logger.AddHook(old)
-
-	hooks := make(LevelHooks)
-	hooks.Add(cur)
-	replaced := logger.ReplaceHooks(hooks)
-
-	logger.Info("test")
-
-	assert.Equal(t, old.Fired, false)
-	assert.Equal(t, cur.Fired, true)
-
-	logger.ReplaceHooks(replaced)
-	logger.Info("test")
-	assert.Equal(t, old.Fired, true)
-}
-
-// Compile test
-func TestLogrusInterfaces(t *testing.T) {
-	var buffer bytes.Buffer
-	// This verifies FieldLogger and Ext1FieldLogger work as designed.
-	// Please don't use them. Use Logger and Entry directly.
-	fn := func(xl Ext1FieldLogger) {
-		var l FieldLogger = xl
-		b := l.WithField("key", "value")
-		b.Debug("Test")
-	}
-	// test logger
-	logger := New()
-	logger.Out = &buffer
-	fn(logger)
-
-	// test Entry
-	e := logger.WithField("another", "value")
-	fn(e)
-}
-
-// Implements io.Writer using channels for synchronization, so we can wait on
-// the Entry.Writer goroutine to write in a non-racey way. This does assume that
-// there is a single call to Logger.Out for each message.
-type channelWriter chan []byte
-
-func (cw channelWriter) Write(p []byte) (int, error) {
-	cw <- p
-	return len(p), nil
-}
-
-func TestEntryWriter(t *testing.T) {
-	cw := channelWriter(make(chan []byte, 1))
-	log := New()
-	log.Out = cw
-	log.Formatter = new(JSONFormatter)
-	log.WithField("foo", "bar").WriterLevel(WarnLevel).Write([]byte("hello\n"))
-
-	bs := <-cw
-	var fields Fields
-	err := json.Unmarshal(bs, &fields)
-	assert.Nil(t, err)
-	assert.Equal(t, fields["foo"], "bar")
-	assert.Equal(t, fields["level"], "warning")
-}
-
-func TestLogLevelEnabled(t *testing.T) {
-	log := New()
-	log.SetLevel(PanicLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
-
-	log.SetLevel(FatalLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
-
-	log.SetLevel(ErrorLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
-
-	log.SetLevel(WarnLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
-
-	log.SetLevel(InfoLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
-
-	log.SetLevel(DebugLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
-
-	log.SetLevel(TraceLevel)
-	assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(DebugLevel))
-	assert.Equal(t, true, log.IsLevelEnabled(TraceLevel))
-}
-
-func TestReportCallerOnTextFormatter(t *testing.T) {
-	l := New()
-
-	l.Formatter.(*TextFormatter).ForceColors = true
-	l.Formatter.(*TextFormatter).DisableColors = false
-	l.WithFields(Fields{"func": "func", "file": "file"}).Info("test")
-
-	l.Formatter.(*TextFormatter).ForceColors = false
-	l.Formatter.(*TextFormatter).DisableColors = true
-	l.WithFields(Fields{"func": "func", "file": "file"}).Info("test")
-}

vendor/github.com/sirupsen/logrus/terminal_check_aix.go

@@ -1,9 +0,0 @@
-// +build !appengine,!js,!windows,aix
-
-package logrus
-
-import "io"
-
-func checkIfTerminal(w io.Writer) bool {
-	return false
-}

vendor/github.com/sirupsen/logrus/terminal_check_bsd.go

@@ -0,0 +1,13 @@
+// +build darwin dragonfly freebsd netbsd openbsd
+
+package logrus
+
+import "golang.org/x/sys/unix"
+
+const ioctlReadTermios = unix.TIOCGETA
+
+func isTerminal(fd int) bool {
+	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	return err == nil
+}
+

vendor/github.com/sirupsen/logrus/terminal_check_no_terminal.go

@@ -1,4 +1,4 @@
-// +build js
+// +build js nacl plan9
 
 package logrus
 

vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go

@@ -1,18 +1,16 @@
-// +build !appengine,!js,!windows,!aix
+// +build !appengine,!js,!windows,!nacl,!plan9
 
 package logrus
 
 import (
 	"io"
 	"os"
-
-	"golang.org/x/crypto/ssh/terminal"
 )
 
 func checkIfTerminal(w io.Writer) bool {
 	switch v := w.(type) {
 	case *os.File:
-		return terminal.IsTerminal(int(v.Fd()))
+		return isTerminal(int(v.Fd()))
 	default:
 		return false
 	}

vendor/github.com/sirupsen/logrus/terminal_check_solaris.go

@@ -0,0 +1,11 @@
+package logrus
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+// IsTerminal returns true if the given file descriptor is a terminal.
+func isTerminal(fd int) bool {
+	_, err := unix.IoctlGetTermio(fd, unix.TCGETA)
+	return err == nil
+}

vendor/github.com/sirupsen/logrus/terminal_check_unix.go

@@ -0,0 +1,13 @@
+// +build linux aix
+
+package logrus
+
+import "golang.org/x/sys/unix"
+
+const ioctlReadTermios = unix.TCGETS
+
+func isTerminal(fd int) bool {
+	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	return err == nil
+}
+

vendor/github.com/sirupsen/logrus/terminal_check_windows.go

@@ -6,15 +6,29 @@ import (
 	"io"
 	"os"
 	"syscall"
+
+	sequences "github.com/konsorten/go-windows-terminal-sequences"
 )
 
+func initTerminal(w io.Writer) {
+	switch v := w.(type) {
+	case *os.File:
+		sequences.EnableVirtualTerminalProcessing(syscall.Handle(v.Fd()), true)
+	}
+}
+
 func checkIfTerminal(w io.Writer) bool {
+	var ret bool
 	switch v := w.(type) {
 	case *os.File:
 		var mode uint32
 		err := syscall.GetConsoleMode(syscall.Handle(v.Fd()), &mode)
-		return err == nil
+		ret = (err == nil)
 	default:
-		return false
+		ret = false
 	}
+	if ret {
+		initTerminal(w)
+	}
+	return ret
 }

vendor/github.com/sirupsen/logrus/terminal_notwindows.go

@@ -1,8 +0,0 @@
-// +build !windows
-
-package logrus
-
-import "io"
-
-func initTerminal(w io.Writer) {
-}

vendor/github.com/sirupsen/logrus/terminal_windows.go

@@ -1,18 +0,0 @@
-// +build !appengine,!js,windows
-
-package logrus
-
-import (
-	"io"
-	"os"
-	"syscall"
-
-	sequences "github.com/konsorten/go-windows-terminal-sequences"
-)
-
-func initTerminal(w io.Writer) {
-	switch v := w.(type) {
-	case *os.File:
-		sequences.EnableVirtualTerminalProcessing(syscall.Handle(v.Fd()), true)
-	}
-}

vendor/github.com/sirupsen/logrus/text_formatter.go

@@ -12,18 +12,13 @@ import (
 )
 
 const (
-	nocolor = 0
+	red    = 31
-	red     = 31
+	yellow = 33
-	green   = 32
+	blue   = 36
-	yellow  = 33
+	gray   = 37
-	blue    = 36
-	gray    = 37
 )
 
-var (
+var baseTimestamp time.Time
-	baseTimestamp time.Time
-	emptyFieldMap FieldMap
-)
 
 func init() {
 	baseTimestamp = time.Now()
@@ -77,16 +72,18 @@ type TextFormatter struct {
 	//         FieldKeyMsg:   "@message"}}
 	FieldMap FieldMap
 
+	// CallerPrettyfier can be set by the user to modify the content
+	// of the function and file keys in the data when ReportCaller is
+	// activated. If any of the returned value is the empty string the
+	// corresponding key will be removed from fields.
+	CallerPrettyfier func(*runtime.Frame) (function string, file string)
+
 	terminalInitOnce sync.Once
 }
 
 func (f *TextFormatter) init(entry *Entry) {
 	if entry.Logger != nil {
 		f.isTerminal = checkIfTerminal(entry.Logger.Out)
-
-		if f.isTerminal {
-			initTerminal(entry.Logger.Out)
-		}
 	}
 }
 
@@ -118,6 +115,8 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 		keys = append(keys, k)
 	}
 
+	var funcVal, fileVal string
+
 	fixedKeys := make([]string, 0, 4+len(data))
 	if !f.DisableTimestamp {
 		fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyTime))
@@ -130,8 +129,19 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 		fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyLogrusError))
 	}
 	if entry.HasCaller() {
-		fixedKeys = append(fixedKeys,
+		if f.CallerPrettyfier != nil {
-			f.FieldMap.resolve(FieldKeyFunc), f.FieldMap.resolve(FieldKeyFile))
+			funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+		} else {
+			funcVal = entry.Caller.Function
+			fileVal = fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+		}
+
+		if funcVal != "" {
+			fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyFunc))
+		}
+		if fileVal != "" {
+			fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyFile))
+		}
 	}
 
 	if !f.DisableSorting {
@@ -166,6 +176,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 	if f.isColored() {
 		f.printColored(b, entry, keys, data, timestampFormat)
 	} else {
+
 		for _, key := range fixedKeys {
 			var value interface{}
 			switch {
@@ -178,9 +189,9 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 			case key == f.FieldMap.resolve(FieldKeyLogrusError):
 				value = entry.err
 			case key == f.FieldMap.resolve(FieldKeyFunc) && entry.HasCaller():
-				value = entry.Caller.Function
+				value = funcVal
 			case key == f.FieldMap.resolve(FieldKeyFile) && entry.HasCaller():
-				value = fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+				value = fileVal
 			default:
 				value = data[key]
 			}
@@ -215,10 +226,21 @@ func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []strin
 	entry.Message = strings.TrimSuffix(entry.Message, "\n")
 
 	caller := ""
-
 	if entry.HasCaller() {
-		caller = fmt.Sprintf("%s:%d %s()",
+		funcVal := fmt.Sprintf("%s()", entry.Caller.Function)
-			entry.Caller.File, entry.Caller.Line, entry.Caller.Function)
+		fileVal := fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+
+		if f.CallerPrettyfier != nil {
+			funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+		}
+
+		if fileVal == "" {
+			caller = funcVal
+		} else if funcVal == "" {
+			caller = fileVal
+		} else {
+			caller = fileVal + " " + funcVal
+		}
 	}
 
 	if f.DisableTimestamp {

vendor/github.com/sirupsen/logrus/text_formatter_test.go

@@ -1,485 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-	"sort"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestFormatting(t *testing.T) {
-	tf := &TextFormatter{DisableColors: true}
-
-	testCases := []struct {
-		value    string
-		expected string
-	}{
-		{`foo`, "time=\"0001-01-01T00:00:00Z\" level=panic test=foo\n"},
-	}
-
-	for _, tc := range testCases {
-		b, _ := tf.Format(WithField("test", tc.value))
-
-		if string(b) != tc.expected {
-			t.Errorf("formatting expected for %q (result was %q instead of %q)", tc.value, string(b), tc.expected)
-		}
-	}
-}
-
-func TestQuoting(t *testing.T) {
-	tf := &TextFormatter{DisableColors: true}
-
-	checkQuoting := func(q bool, value interface{}) {
-		b, _ := tf.Format(WithField("test", value))
-		idx := bytes.Index(b, ([]byte)("test="))
-		cont := bytes.Contains(b[idx+5:], []byte("\""))
-		if cont != q {
-			if q {
-				t.Errorf("quoting expected for: %#v", value)
-			} else {
-				t.Errorf("quoting not expected for: %#v", value)
-			}
-		}
-	}
-
-	checkQuoting(false, "")
-	checkQuoting(false, "abcd")
-	checkQuoting(false, "v1.0")
-	checkQuoting(false, "1234567890")
-	checkQuoting(false, "/foobar")
-	checkQuoting(false, "foo_bar")
-	checkQuoting(false, "foo@bar")
-	checkQuoting(false, "foobar^")
-	checkQuoting(false, "+/-_^@f.oobar")
-	checkQuoting(true, "foobar$")
-	checkQuoting(true, "&foobar")
-	checkQuoting(true, "x y")
-	checkQuoting(true, "x,y")
-	checkQuoting(false, errors.New("invalid"))
-	checkQuoting(true, errors.New("invalid argument"))
-
-	// Test for quoting empty fields.
-	tf.QuoteEmptyFields = true
-	checkQuoting(true, "")
-	checkQuoting(false, "abcd")
-	checkQuoting(true, errors.New("invalid argument"))
-}
-
-func TestEscaping(t *testing.T) {
-	tf := &TextFormatter{DisableColors: true}
-
-	testCases := []struct {
-		value    string
-		expected string
-	}{
-		{`ba"r`, `ba\"r`},
-		{`ba'r`, `ba'r`},
-	}
-
-	for _, tc := range testCases {
-		b, _ := tf.Format(WithField("test", tc.value))
-		if !bytes.Contains(b, []byte(tc.expected)) {
-			t.Errorf("escaping expected for %q (result was %q instead of %q)", tc.value, string(b), tc.expected)
-		}
-	}
-}
-
-func TestEscaping_Interface(t *testing.T) {
-	tf := &TextFormatter{DisableColors: true}
-
-	ts := time.Now()
-
-	testCases := []struct {
-		value    interface{}
-		expected string
-	}{
-		{ts, fmt.Sprintf("\"%s\"", ts.String())},
-		{errors.New("error: something went wrong"), "\"error: something went wrong\""},
-	}
-
-	for _, tc := range testCases {
-		b, _ := tf.Format(WithField("test", tc.value))
-		if !bytes.Contains(b, []byte(tc.expected)) {
-			t.Errorf("escaping expected for %q (result was %q instead of %q)", tc.value, string(b), tc.expected)
-		}
-	}
-}
-
-func TestTimestampFormat(t *testing.T) {
-	checkTimeStr := func(format string) {
-		customFormatter := &TextFormatter{DisableColors: true, TimestampFormat: format}
-		customStr, _ := customFormatter.Format(WithField("test", "test"))
-		timeStart := bytes.Index(customStr, ([]byte)("time="))
-		timeEnd := bytes.Index(customStr, ([]byte)("level="))
-		timeStr := customStr[timeStart+5+len("\"") : timeEnd-1-len("\"")]
-		if format == "" {
-			format = time.RFC3339
-		}
-		_, e := time.Parse(format, (string)(timeStr))
-		if e != nil {
-			t.Errorf("time string \"%s\" did not match provided time format \"%s\": %s", timeStr, format, e)
-		}
-	}
-
-	checkTimeStr("2006-01-02T15:04:05.000000000Z07:00")
-	checkTimeStr("Mon Jan _2 15:04:05 2006")
-	checkTimeStr("")
-}
-
-func TestDisableLevelTruncation(t *testing.T) {
-	entry := &Entry{
-		Time:    time.Now(),
-		Message: "testing",
-	}
-	keys := []string{}
-	timestampFormat := "Mon Jan 2 15:04:05 -0700 MST 2006"
-	checkDisableTruncation := func(disabled bool, level Level) {
-		tf := &TextFormatter{DisableLevelTruncation: disabled}
-		var b bytes.Buffer
-		entry.Level = level
-		tf.printColored(&b, entry, keys, nil, timestampFormat)
-		logLine := (&b).String()
-		if disabled {
-			expected := strings.ToUpper(level.String())
-			if !strings.Contains(logLine, expected) {
-				t.Errorf("level string expected to be %s when truncation disabled", expected)
-			}
-		} else {
-			expected := strings.ToUpper(level.String())
-			if len(level.String()) > 4 {
-				if strings.Contains(logLine, expected) {
-					t.Errorf("level string %s expected to be truncated to %s when truncation is enabled", expected, expected[0:4])
-				}
-			} else {
-				if !strings.Contains(logLine, expected) {
-					t.Errorf("level string expected to be %s when truncation is enabled and level string is below truncation threshold", expected)
-				}
-			}
-		}
-	}
-
-	checkDisableTruncation(true, DebugLevel)
-	checkDisableTruncation(true, InfoLevel)
-	checkDisableTruncation(false, ErrorLevel)
-	checkDisableTruncation(false, InfoLevel)
-}
-
-func TestDisableTimestampWithColoredOutput(t *testing.T) {
-	tf := &TextFormatter{DisableTimestamp: true, ForceColors: true}
-
-	b, _ := tf.Format(WithField("test", "test"))
-	if strings.Contains(string(b), "[0000]") {
-		t.Error("timestamp not expected when DisableTimestamp is true")
-	}
-}
-
-func TestNewlineBehavior(t *testing.T) {
-	tf := &TextFormatter{ForceColors: true}
-
-	// Ensure a single new line is removed as per stdlib log
-	e := NewEntry(StandardLogger())
-	e.Message = "test message\n"
-	b, _ := tf.Format(e)
-	if bytes.Contains(b, []byte("test message\n")) {
-		t.Error("first newline at end of Entry.Message resulted in unexpected 2 newlines in output. Expected newline to be removed.")
-	}
-
-	// Ensure a double new line is reduced to a single new line
-	e = NewEntry(StandardLogger())
-	e.Message = "test message\n\n"
-	b, _ = tf.Format(e)
-	if bytes.Contains(b, []byte("test message\n\n")) {
-		t.Error("Double newline at end of Entry.Message resulted in unexpected 2 newlines in output. Expected single newline")
-	}
-	if !bytes.Contains(b, []byte("test message\n")) {
-		t.Error("Double newline at end of Entry.Message did not result in a single newline after formatting")
-	}
-}
-
-func TestTextFormatterFieldMap(t *testing.T) {
-	formatter := &TextFormatter{
-		DisableColors: true,
-		FieldMap: FieldMap{
-			FieldKeyMsg:   "message",
-			FieldKeyLevel: "somelevel",
-			FieldKeyTime:  "timeywimey",
-		},
-	}
-
-	entry := &Entry{
-		Message: "oh hi",
-		Level:   WarnLevel,
-		Time:    time.Date(1981, time.February, 24, 4, 28, 3, 100, time.UTC),
-		Data: Fields{
-			"field1":     "f1",
-			"message":    "messagefield",
-			"somelevel":  "levelfield",
-			"timeywimey": "timeywimeyfield",
-		},
-	}
-
-	b, err := formatter.Format(entry)
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	assert.Equal(t,
-		`timeywimey="1981-02-24T04:28:03Z" `+
-			`somelevel=warning `+
-			`message="oh hi" `+
-			`field1=f1 `+
-			`fields.message=messagefield `+
-			`fields.somelevel=levelfield `+
-			`fields.timeywimey=timeywimeyfield`+"\n",
-		string(b),
-		"Formatted output doesn't respect FieldMap")
-}
-
-func TestTextFormatterIsColored(t *testing.T) {
-	params := []struct {
-		name               string
-		expectedResult     bool
-		isTerminal         bool
-		disableColor       bool
-		forceColor         bool
-		envColor           bool
-		clicolorIsSet      bool
-		clicolorForceIsSet bool
-		clicolorVal        string
-		clicolorForceVal   string
-	}{
-		// Default values
-		{
-			name:               "testcase1",
-			expectedResult:     false,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           false,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: false,
-		},
-		// Output on terminal
-		{
-			name:               "testcase2",
-			expectedResult:     true,
-			isTerminal:         true,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           false,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: false,
-		},
-		// Output on terminal with color disabled
-		{
-			name:               "testcase3",
-			expectedResult:     false,
-			isTerminal:         true,
-			disableColor:       true,
-			forceColor:         false,
-			envColor:           false,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: false,
-		},
-		// Output not on terminal with color disabled
-		{
-			name:               "testcase4",
-			expectedResult:     false,
-			isTerminal:         false,
-			disableColor:       true,
-			forceColor:         false,
-			envColor:           false,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: false,
-		},
-		// Output not on terminal with color forced
-		{
-			name:               "testcase5",
-			expectedResult:     true,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         true,
-			envColor:           false,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: false,
-		},
-		// Output on terminal with clicolor set to "0"
-		{
-			name:               "testcase6",
-			expectedResult:     false,
-			isTerminal:         true,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      true,
-			clicolorForceIsSet: false,
-			clicolorVal:        "0",
-		},
-		// Output on terminal with clicolor set to "1"
-		{
-			name:               "testcase7",
-			expectedResult:     true,
-			isTerminal:         true,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      true,
-			clicolorForceIsSet: false,
-			clicolorVal:        "1",
-		},
-		// Output not on terminal with clicolor set to "0"
-		{
-			name:               "testcase8",
-			expectedResult:     false,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      true,
-			clicolorForceIsSet: false,
-			clicolorVal:        "0",
-		},
-		// Output not on terminal with clicolor set to "1"
-		{
-			name:               "testcase9",
-			expectedResult:     false,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      true,
-			clicolorForceIsSet: false,
-			clicolorVal:        "1",
-		},
-		// Output not on terminal with clicolor set to "1" and force color
-		{
-			name:               "testcase10",
-			expectedResult:     true,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         true,
-			envColor:           true,
-			clicolorIsSet:      true,
-			clicolorForceIsSet: false,
-			clicolorVal:        "1",
-		},
-		// Output not on terminal with clicolor set to "0" and force color
-		{
-			name:               "testcase11",
-			expectedResult:     false,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         true,
-			envColor:           true,
-			clicolorIsSet:      true,
-			clicolorForceIsSet: false,
-			clicolorVal:        "0",
-		},
-		// Output not on terminal with clicolor_force set to "1"
-		{
-			name:               "testcase12",
-			expectedResult:     true,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: true,
-			clicolorForceVal:   "1",
-		},
-		// Output not on terminal with clicolor_force set to "0"
-		{
-			name:               "testcase13",
-			expectedResult:     false,
-			isTerminal:         false,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: true,
-			clicolorForceVal:   "0",
-		},
-		// Output on terminal with clicolor_force set to "0"
-		{
-			name:               "testcase14",
-			expectedResult:     false,
-			isTerminal:         true,
-			disableColor:       false,
-			forceColor:         false,
-			envColor:           true,
-			clicolorIsSet:      false,
-			clicolorForceIsSet: true,
-			clicolorForceVal:   "0",
-		},
-	}
-
-	cleanenv := func() {
-		os.Unsetenv("CLICOLOR")
-		os.Unsetenv("CLICOLOR_FORCE")
-	}
-
-	defer cleanenv()
-
-	for _, val := range params {
-		t.Run("textformatter_"+val.name, func(subT *testing.T) {
-			tf := TextFormatter{
-				isTerminal:                val.isTerminal,
-				DisableColors:             val.disableColor,
-				ForceColors:               val.forceColor,
-				EnvironmentOverrideColors: val.envColor,
-			}
-			cleanenv()
-			if val.clicolorIsSet {
-				os.Setenv("CLICOLOR", val.clicolorVal)
-			}
-			if val.clicolorForceIsSet {
-				os.Setenv("CLICOLOR_FORCE", val.clicolorForceVal)
-			}
-			res := tf.isColored()
-			if runtime.GOOS == "windows" && !tf.ForceColors && !val.clicolorForceIsSet {
-				assert.Equal(subT, false, res)
-			} else {
-				assert.Equal(subT, val.expectedResult, res)
-			}
-		})
-	}
-}
-
-func TestCustomSorting(t *testing.T) {
-	formatter := &TextFormatter{
-		DisableColors: true,
-		SortingFunc: func(keys []string) {
-			sort.Slice(keys, func(i, j int) bool {
-				if keys[j] == "prefix" {
-					return false
-				}
-				if keys[i] == "prefix" {
-					return true
-				}
-				return strings.Compare(keys[i], keys[j]) == -1
-			})
-		},
-	}
-
-	entry := &Entry{
-		Message: "Testing custom sort function",
-		Time:    time.Now(),
-		Level:   InfoLevel,
-		Data: Fields{
-			"test":      "testvalue",
-			"prefix":    "the application prefix",
-			"blablabla": "blablabla",
-		},
-	}
-	b, err := formatter.Format(entry)
-	require.NoError(t, err)
-	require.True(t, strings.HasPrefix(string(b), "prefix="), "format output is %q", string(b))
-}

vendor/github.com/stretchr/objx/.codeclimate.yml

@@ -0,0 +1,13 @@
+engines:
+  gofmt:
+    enabled: true
+  golint:
+    enabled: true
+  govet:
+    enabled: true
+
+exclude_patterns:
+- ".github/"
+- "vendor/"
+- "codegen/"
+- "doc.go"

vendor/github.com/stretchr/objx/.gitignore

@@ -0,0 +1,11 @@
+# Binaries for programs and plugins
+*.exe
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out

vendor/github.com/stretchr/objx/.travis.yml

@@ -0,0 +1,25 @@
+language: go
+go:
+  - 1.8
+  - 1.9
+  - tip
+
+env:
+  global:
+    - CC_TEST_REPORTER_ID=68feaa3410049ce73e145287acbcdacc525087a30627f96f04e579e75bd71c00
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+install:
+- go get github.com/go-task/task/cmd/task
+
+script:
+- task dl-deps
+- task lint
+- task test-coverage
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

vendor/github.com/stretchr/objx/Gopkg.lock

@@ -0,0 +1,30 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = [
+    "assert",
+    "require"
+  ]
+  revision = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"
+  version = "v1.2.0"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "2d160a7dea4ffd13c6c31dab40373822f9d78c73beba016d662bef8f7a998876"
+  solver-name = "gps-cdcl"
+  solver-version = 1

vendor/github.com/stretchr/objx/Gopkg.toml

@@ -0,0 +1,8 @@
+[prune]
+  unused-packages = true
+  non-go = true
+  go-tests = true
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "~1.2.0"

vendor/github.com/stretchr/objx/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2014 Stretchr, Inc.
+Copyright (c) 2017-2018 objx contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

vendor/github.com/stretchr/objx/README.md

@@ -0,0 +1,80 @@
+# Objx
+[![Build Status](https://travis-ci.org/stretchr/objx.svg?branch=master)](https://travis-ci.org/stretchr/objx)
+[![Go Report Card](https://goreportcard.com/badge/github.com/stretchr/objx)](https://goreportcard.com/report/github.com/stretchr/objx)
+[![Maintainability](https://api.codeclimate.com/v1/badges/1d64bc6c8474c2074f2b/maintainability)](https://codeclimate.com/github/stretchr/objx/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/1d64bc6c8474c2074f2b/test_coverage)](https://codeclimate.com/github/stretchr/objx/test_coverage)
+[![Sourcegraph](https://sourcegraph.com/github.com/stretchr/objx/-/badge.svg)](https://sourcegraph.com/github.com/stretchr/objx)
+[![GoDoc](https://godoc.org/github.com/stretchr/objx?status.svg)](https://godoc.org/github.com/stretchr/objx)
+
+Objx - Go package for dealing with maps, slices, JSON and other data.
+
+Get started:
+
+- Install Objx with [one line of code](#installation), or [update it with another](#staying-up-to-date)
+- Check out the API Documentation http://godoc.org/github.com/stretchr/objx
+
+## Overview
+Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes a powerful `Get` method (among others) that allows you to easily and quickly get access to data within the map, without having to worry too much about type assertions, missing data, default values etc.
+
+### Pattern
+Objx uses a preditable pattern to make access data from within `map[string]interface{}` easy. Call one of the `objx.` functions to create your `objx.Map` to get going:
+
+    m, err := objx.FromJSON(json)
+
+NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong, the rest will be optimistic and try to figure things out without panicking.
+
+Use `Get` to access the value you're interested in.  You can use dot and array
+notation too:
+
+     m.Get("places[0].latlng")
+
+Once you have sought the `Value` you're interested in, you can use the `Is*` methods to determine its type.
+
+     if m.Get("code").IsStr() { // Your code... }
+
+Or you can just assume the type, and use one of the strong type methods to extract the real value:
+
+    m.Get("code").Int()
+
+If there's no value there (or if it's the wrong type) then a default value will be returned, or you can be explicit about the default value.
+
+     Get("code").Int(-1)
+
+If you're dealing with a slice of data as a value, Objx provides many useful methods for iterating, manipulating and selecting that data.  You can find out more by exploring the index below.
+
+### Reading data
+A simple example of how to use Objx:
+
+    // Use MustFromJSON to make an objx.Map from some JSON
+    m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
+
+    // Get the details
+    name := m.Get("name").Str()
+    age := m.Get("age").Int()
+
+    // Get their nickname (or use their name if they don't have one)
+    nickname := m.Get("nickname").Str(name)
+
+### Ranging
+Since `objx.Map` is a `map[string]interface{}` you can treat it as such.  For example, to `range` the data, do what you would expect:
+
+    m := objx.MustFromJSON(json)
+    for key, value := range m {
+      // Your code...
+    }
+
+## Installation
+To install Objx, use go get:
+
+    go get github.com/stretchr/objx
+
+### Staying up to date
+To update Objx to the latest version, run:
+
+    go get -u github.com/stretchr/objx
+
+### Supported go versions
+We support the lastest two major Go versions, which are 1.8 and 1.9 at the moment.
+
+## Contributing
+Please feel free to submit issues, fork the repository and send pull requests!

vendor/github.com/stretchr/objx/Taskfile.yml

@@ -0,0 +1,32 @@
+default:
+  deps: [test]
+
+dl-deps:
+  desc: Downloads cli dependencies
+  cmds:
+    - go get -u github.com/golang/lint/golint
+    - go get -u github.com/golang/dep/cmd/dep
+
+update-deps:
+  desc: Updates dependencies
+  cmds:
+    - dep ensure
+    - dep ensure -update
+
+lint:
+  desc: Runs golint
+  cmds:
+    - go fmt $(go list ./... | grep -v /vendor/)
+    - go vet $(go list ./... | grep -v /vendor/)
+    - golint $(ls *.go | grep -v "doc.go")
+  silent: true
+
+test:
+  desc: Runs go tests
+  cmds:
+    - go test -race  .
+
+test-coverage:
+  desc: Runs go tests and calucates test coverage
+  cmds:
+    - go test -coverprofile=c.out .

vendor/github.com/stretchr/objx/accessors.go

@@ -0,0 +1,148 @@
+package objx
+
+import (
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+// arrayAccesRegexString is the regex used to extract the array number
+// from the access path
+const arrayAccesRegexString = `^(.+)\[([0-9]+)\]$`
+
+// arrayAccesRegex is the compiled arrayAccesRegexString
+var arrayAccesRegex = regexp.MustCompile(arrayAccesRegexString)
+
+// Get gets the value using the specified selector and
+// returns it inside a new Obj object.
+//
+// If it cannot find the value, Get will return a nil
+// value inside an instance of Obj.
+//
+// Get can only operate directly on map[string]interface{} and []interface.
+//
+// Example
+//
+// To access the title of the third chapter of the second book, do:
+//
+//    o.Get("books[1].chapters[2].title")
+func (m Map) Get(selector string) *Value {
+	rawObj := access(m, selector, nil, false)
+	return &Value{data: rawObj}
+}
+
+// Set sets the value using the specified selector and
+// returns the object on which Set was called.
+//
+// Set can only operate directly on map[string]interface{} and []interface
+//
+// Example
+//
+// To set the title of the third chapter of the second book, do:
+//
+//    o.Set("books[1].chapters[2].title","Time to Go")
+func (m Map) Set(selector string, value interface{}) Map {
+	access(m, selector, value, true)
+	return m
+}
+
+// access accesses the object using the selector and performs the
+// appropriate action.
+func access(current, selector, value interface{}, isSet bool) interface{} {
+	switch selector.(type) {
+	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
+		if array, ok := current.([]interface{}); ok {
+			index := intFromInterface(selector)
+			if index >= len(array) {
+				return nil
+			}
+			return array[index]
+		}
+		return nil
+
+	case string:
+		selStr := selector.(string)
+		selSegs := strings.SplitN(selStr, PathSeparator, 2)
+		thisSel := selSegs[0]
+		index := -1
+		var err error
+
+		if strings.Contains(thisSel, "[") {
+			arrayMatches := arrayAccesRegex.FindStringSubmatch(thisSel)
+			if len(arrayMatches) > 0 {
+				// Get the key into the map
+				thisSel = arrayMatches[1]
+
+				// Get the index into the array at the key
+				index, err = strconv.Atoi(arrayMatches[2])
+
+				if err != nil {
+					// This should never happen. If it does, something has gone
+					// seriously wrong. Panic.
+					panic("objx: Array index is not an integer.  Must use array[int].")
+				}
+			}
+		}
+		if curMap, ok := current.(Map); ok {
+			current = map[string]interface{}(curMap)
+		}
+		// get the object in question
+		switch current.(type) {
+		case map[string]interface{}:
+			curMSI := current.(map[string]interface{})
+			if len(selSegs) <= 1 && isSet {
+				curMSI[thisSel] = value
+				return nil
+			}
+			current = curMSI[thisSel]
+		default:
+			current = nil
+		}
+		// do we need to access the item of an array?
+		if index > -1 {
+			if array, ok := current.([]interface{}); ok {
+				if index < len(array) {
+					current = array[index]
+				} else {
+					current = nil
+				}
+			}
+		}
+		if len(selSegs) > 1 {
+			current = access(current, selSegs[1], value, isSet)
+		}
+	}
+	return current
+}
+
+// intFromInterface converts an interface object to the largest
+// representation of an unsigned integer using a type switch and
+// assertions
+func intFromInterface(selector interface{}) int {
+	var value int
+	switch selector.(type) {
+	case int:
+		value = selector.(int)
+	case int8:
+		value = int(selector.(int8))
+	case int16:
+		value = int(selector.(int16))
+	case int32:
+		value = int(selector.(int32))
+	case int64:
+		value = int(selector.(int64))
+	case uint:
+		value = int(selector.(uint))
+	case uint8:
+		value = int(selector.(uint8))
+	case uint16:
+		value = int(selector.(uint16))
+	case uint32:
+		value = int(selector.(uint32))
+	case uint64:
+		value = int(selector.(uint64))
+	default:
+		return 0
+	}
+	return value
+}

vendor/github.com/stretchr/objx/constants.go

@@ -0,0 +1,13 @@
+package objx
+
+const (
+	// PathSeparator is the character used to separate the elements
+	// of the keypath.
+	//
+	// For example, `location.address.city`
+	PathSeparator string = "."
+
+	// SignatureSeparator is the character that is used to
+	// separate the Base64 string from the security signature.
+	SignatureSeparator = "_"
+)

vendor/github.com/stretchr/objx/conversions.go

@@ -0,0 +1,108 @@
+package objx
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+)
+
+// JSON converts the contained object to a JSON string
+// representation
+func (m Map) JSON() (string, error) {
+	result, err := json.Marshal(m)
+	if err != nil {
+		err = errors.New("objx: JSON encode failed with: " + err.Error())
+	}
+	return string(result), err
+}
+
+// MustJSON converts the contained object to a JSON string
+// representation and panics if there is an error
+func (m Map) MustJSON() string {
+	result, err := m.JSON()
+	if err != nil {
+		panic(err.Error())
+	}
+	return result
+}
+
+// Base64 converts the contained object to a Base64 string
+// representation of the JSON string representation
+func (m Map) Base64() (string, error) {
+	var buf bytes.Buffer
+
+	jsonData, err := m.JSON()
+	if err != nil {
+		return "", err
+	}
+
+	encoder := base64.NewEncoder(base64.StdEncoding, &buf)
+	_, err = encoder.Write([]byte(jsonData))
+	if err != nil {
+		return "", err
+	}
+	_ = encoder.Close()
+
+	return buf.String(), nil
+}
+
+// MustBase64 converts the contained object to a Base64 string
+// representation of the JSON string representation and panics
+// if there is an error
+func (m Map) MustBase64() string {
+	result, err := m.Base64()
+	if err != nil {
+		panic(err.Error())
+	}
+	return result
+}
+
+// SignedBase64 converts the contained object to a Base64 string
+// representation of the JSON string representation and signs it
+// using the provided key.
+func (m Map) SignedBase64(key string) (string, error) {
+	base64, err := m.Base64()
+	if err != nil {
+		return "", err
+	}
+
+	sig := HashWithKey(base64, key)
+	return base64 + SignatureSeparator + sig, nil
+}
+
+// MustSignedBase64 converts the contained object to a Base64 string
+// representation of the JSON string representation and signs it
+// using the provided key and panics if there is an error
+func (m Map) MustSignedBase64(key string) string {
+	result, err := m.SignedBase64(key)
+	if err != nil {
+		panic(err.Error())
+	}
+	return result
+}
+
+/*
+	URL Query
+	------------------------------------------------
+*/
+
+// URLValues creates a url.Values object from an Obj. This
+// function requires that the wrapped object be a map[string]interface{}
+func (m Map) URLValues() url.Values {
+	vals := make(url.Values)
+	for k, v := range m {
+		//TODO: can this be done without sprintf?
+		vals.Set(k, fmt.Sprintf("%v", v))
+	}
+	return vals
+}
+
+// URLQuery gets an encoded URL query representing the given
+// Obj. This function requires that the wrapped object be a
+// map[string]interface{}
+func (m Map) URLQuery() (string, error) {
+	return m.URLValues().Encode(), nil
+}

vendor/github.com/stretchr/objx/doc.go

@@ -0,0 +1,66 @@
+/*
+Objx - Go package for dealing with maps, slices, JSON and other data.
+
+Overview
+
+Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes
+a powerful `Get` method (among others) that allows you to easily and quickly get
+access to data within the map, without having to worry too much about type assertions,
+missing data, default values etc.
+
+Pattern
+
+Objx uses a preditable pattern to make access data from within `map[string]interface{}` easy.
+Call one of the `objx.` functions to create your `objx.Map` to get going:
+
+    m, err := objx.FromJSON(json)
+
+NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong,
+the rest will be optimistic and try to figure things out without panicking.
+
+Use `Get` to access the value you're interested in.  You can use dot and array
+notation too:
+
+     m.Get("places[0].latlng")
+
+Once you have sought the `Value` you're interested in, you can use the `Is*` methods to determine its type.
+
+     if m.Get("code").IsStr() { // Your code... }
+
+Or you can just assume the type, and use one of the strong type methods to extract the real value:
+
+   m.Get("code").Int()
+
+If there's no value there (or if it's the wrong type) then a default value will be returned,
+or you can be explicit about the default value.
+
+     Get("code").Int(-1)
+
+If you're dealing with a slice of data as a value, Objx provides many useful methods for iterating,
+manipulating and selecting that data.  You can find out more by exploring the index below.
+
+Reading data
+
+A simple example of how to use Objx:
+
+   // Use MustFromJSON to make an objx.Map from some JSON
+   m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
+
+   // Get the details
+   name := m.Get("name").Str()
+   age := m.Get("age").Int()
+
+   // Get their nickname (or use their name if they don't have one)
+   nickname := m.Get("nickname").Str(name)
+
+Ranging
+
+Since `objx.Map` is a `map[string]interface{}` you can treat it as such.
+For example, to `range` the data, do what you would expect:
+
+    m := objx.MustFromJSON(json)
+    for key, value := range m {
+      // Your code...
+    }
+*/
+package objx

vendor/github.com/stretchr/objx/map.go

@@ -0,0 +1,190 @@
+package objx
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"net/url"
+	"strings"
+)
+
+// MSIConvertable is an interface that defines methods for converting your
+// custom types to a map[string]interface{} representation.
+type MSIConvertable interface {
+	// MSI gets a map[string]interface{} (msi) representing the
+	// object.
+	MSI() map[string]interface{}
+}
+
+// Map provides extended functionality for working with
+// untyped data, in particular map[string]interface (msi).
+type Map map[string]interface{}
+
+// Value returns the internal value instance
+func (m Map) Value() *Value {
+	return &Value{data: m}
+}
+
+// Nil represents a nil Map.
+var Nil = New(nil)
+
+// New creates a new Map containing the map[string]interface{} in the data argument.
+// If the data argument is not a map[string]interface, New attempts to call the
+// MSI() method on the MSIConvertable interface to create one.
+func New(data interface{}) Map {
+	if _, ok := data.(map[string]interface{}); !ok {
+		if converter, ok := data.(MSIConvertable); ok {
+			data = converter.MSI()
+		} else {
+			return nil
+		}
+	}
+	return Map(data.(map[string]interface{}))
+}
+
+// MSI creates a map[string]interface{} and puts it inside a new Map.
+//
+// The arguments follow a key, value pattern.
+//
+//
+// Returns nil if any key argument is non-string or if there are an odd number of arguments.
+//
+// Example
+//
+// To easily create Maps:
+//
+//     m := objx.MSI("name", "Mat", "age", 29, "subobj", objx.MSI("active", true))
+//
+//     // creates an Map equivalent to
+//     m := objx.Map{"name": "Mat", "age": 29, "subobj": objx.Map{"active": true}}
+func MSI(keyAndValuePairs ...interface{}) Map {
+	newMap := Map{}
+	keyAndValuePairsLen := len(keyAndValuePairs)
+	if keyAndValuePairsLen%2 != 0 {
+		return nil
+	}
+	for i := 0; i < keyAndValuePairsLen; i = i + 2 {
+		key := keyAndValuePairs[i]
+		value := keyAndValuePairs[i+1]
+
+		// make sure the key is a string
+		keyString, keyStringOK := key.(string)
+		if !keyStringOK {
+			return nil
+		}
+		newMap[keyString] = value
+	}
+	return newMap
+}
+
+// ****** Conversion Constructors
+
+// MustFromJSON creates a new Map containing the data specified in the
+// jsonString.
+//
+// Panics if the JSON is invalid.
+func MustFromJSON(jsonString string) Map {
+	o, err := FromJSON(jsonString)
+	if err != nil {
+		panic("objx: MustFromJSON failed with error: " + err.Error())
+	}
+	return o
+}
+
+// FromJSON creates a new Map containing the data specified in the
+// jsonString.
+//
+// Returns an error if the JSON is invalid.
+func FromJSON(jsonString string) (Map, error) {
+	var data interface{}
+	err := json.Unmarshal([]byte(jsonString), &data)
+	if err != nil {
+		return Nil, err
+	}
+	return New(data), nil
+}
+
+// FromBase64 creates a new Obj containing the data specified
+// in the Base64 string.
+//
+// The string is an encoded JSON string returned by Base64
+func FromBase64(base64String string) (Map, error) {
+	decoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(base64String))
+	decoded, err := ioutil.ReadAll(decoder)
+	if err != nil {
+		return nil, err
+	}
+	return FromJSON(string(decoded))
+}
+
+// MustFromBase64 creates a new Obj containing the data specified
+// in the Base64 string and panics if there is an error.
+//
+// The string is an encoded JSON string returned by Base64
+func MustFromBase64(base64String string) Map {
+	result, err := FromBase64(base64String)
+	if err != nil {
+		panic("objx: MustFromBase64 failed with error: " + err.Error())
+	}
+	return result
+}
+
+// FromSignedBase64 creates a new Obj containing the data specified
+// in the Base64 string.
+//
+// The string is an encoded JSON string returned by SignedBase64
+func FromSignedBase64(base64String, key string) (Map, error) {
+	parts := strings.Split(base64String, SignatureSeparator)
+	if len(parts) != 2 {
+		return nil, errors.New("objx: Signed base64 string is malformed")
+	}
+
+	sig := HashWithKey(parts[0], key)
+	if parts[1] != sig {
+		return nil, errors.New("objx: Signature for base64 data does not match")
+	}
+	return FromBase64(parts[0])
+}
+
+// MustFromSignedBase64 creates a new Obj containing the data specified
+// in the Base64 string and panics if there is an error.
+//
+// The string is an encoded JSON string returned by Base64
+func MustFromSignedBase64(base64String, key string) Map {
+	result, err := FromSignedBase64(base64String, key)
+	if err != nil {
+		panic("objx: MustFromSignedBase64 failed with error: " + err.Error())
+	}
+	return result
+}
+
+// FromURLQuery generates a new Obj by parsing the specified
+// query.
+//
+// For queries with multiple values, the first value is selected.
+func FromURLQuery(query string) (Map, error) {
+	vals, err := url.ParseQuery(query)
+	if err != nil {
+		return nil, err
+	}
+	m := Map{}
+	for k, vals := range vals {
+		m[k] = vals[0]
+	}
+	return m, nil
+}
+
+// MustFromURLQuery generates a new Obj by parsing the specified
+// query.
+//
+// For queries with multiple values, the first value is selected.
+//
+// Panics if it encounters an error
+func MustFromURLQuery(query string) Map {
+	o, err := FromURLQuery(query)
+	if err != nil {
+		panic("objx: MustFromURLQuery failed with error: " + err.Error())
+	}
+	return o
+}

vendor/github.com/stretchr/objx/mutations.go

@@ -0,0 +1,77 @@
+package objx
+
+// Exclude returns a new Map with the keys in the specified []string
+// excluded.
+func (m Map) Exclude(exclude []string) Map {
+	excluded := make(Map)
+	for k, v := range m {
+		if !contains(exclude, k) {
+			excluded[k] = v
+		}
+	}
+	return excluded
+}
+
+// Copy creates a shallow copy of the Obj.
+func (m Map) Copy() Map {
+	copied := Map{}
+	for k, v := range m {
+		copied[k] = v
+	}
+	return copied
+}
+
+// Merge blends the specified map with a copy of this map and returns the result.
+//
+// Keys that appear in both will be selected from the specified map.
+// This method requires that the wrapped object be a map[string]interface{}
+func (m Map) Merge(merge Map) Map {
+	return m.Copy().MergeHere(merge)
+}
+
+// MergeHere blends the specified map with this map and returns the current map.
+//
+// Keys that appear in both will be selected from the specified map. The original map
+// will be modified. This method requires that
+// the wrapped object be a map[string]interface{}
+func (m Map) MergeHere(merge Map) Map {
+	for k, v := range merge {
+		m[k] = v
+	}
+	return m
+}
+
+// Transform builds a new Obj giving the transformer a chance
+// to change the keys and values as it goes. This method requires that
+// the wrapped object be a map[string]interface{}
+func (m Map) Transform(transformer func(key string, value interface{}) (string, interface{})) Map {
+	newMap := Map{}
+	for k, v := range m {
+		modifiedKey, modifiedVal := transformer(k, v)
+		newMap[modifiedKey] = modifiedVal
+	}
+	return newMap
+}
+
+// TransformKeys builds a new map using the specified key mapping.
+//
+// Unspecified keys will be unaltered.
+// This method requires that the wrapped object be a map[string]interface{}
+func (m Map) TransformKeys(mapping map[string]string) Map {
+	return m.Transform(func(key string, value interface{}) (string, interface{}) {
+		if newKey, ok := mapping[key]; ok {
+			return newKey, value
+		}
+		return key, value
+	})
+}
+
+// Checks if a string slice contains a string
+func contains(s []string, e string) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}

vendor/github.com/stretchr/objx/security.go

@@ -0,0 +1,12 @@
+package objx
+
+import (
+	"crypto/sha1"
+	"encoding/hex"
+)
+
+// HashWithKey hashes the specified string using the security key
+func HashWithKey(data, key string) string {
+	d := sha1.Sum([]byte(data + ":" + key))
+	return hex.EncodeToString(d[:])
+}

vendor/github.com/stretchr/objx/tests.go

@@ -0,0 +1,17 @@
+package objx
+
+// Has gets whether there is something at the specified selector
+// or not.
+//
+// If m is nil, Has will always return false.
+func (m Map) Has(selector string) bool {
+	if m == nil {
+		return false
+	}
+	return !m.Get(selector).IsNil()
+}
+
+// IsNil gets whether the data is nil or not.
+func (v *Value) IsNil() bool {
+	return v == nil || v.data == nil
+}

vendor/github.com/stretchr/objx/value.go

@@ -0,0 +1,53 @@
+package objx
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// Value provides methods for extracting interface{} data in various
+// types.
+type Value struct {
+	// data contains the raw data being managed by this Value
+	data interface{}
+}
+
+// Data returns the raw data contained by this Value
+func (v *Value) Data() interface{} {
+	return v.data
+}
+
+// String returns the value always as a string
+func (v *Value) String() string {
+	switch {
+	case v.IsStr():
+		return v.Str()
+	case v.IsBool():
+		return strconv.FormatBool(v.Bool())
+	case v.IsFloat32():
+		return strconv.FormatFloat(float64(v.Float32()), 'f', -1, 32)
+	case v.IsFloat64():
+		return strconv.FormatFloat(v.Float64(), 'f', -1, 64)
+	case v.IsInt():
+		return strconv.FormatInt(int64(v.Int()), 10)
+	case v.IsInt8():
+		return strconv.FormatInt(int64(v.Int8()), 10)
+	case v.IsInt16():
+		return strconv.FormatInt(int64(v.Int16()), 10)
+	case v.IsInt32():
+		return strconv.FormatInt(int64(v.Int32()), 10)
+	case v.IsInt64():
+		return strconv.FormatInt(v.Int64(), 10)
+	case v.IsUint():
+		return strconv.FormatUint(uint64(v.Uint()), 10)
+	case v.IsUint8():
+		return strconv.FormatUint(uint64(v.Uint8()), 10)
+	case v.IsUint16():
+		return strconv.FormatUint(uint64(v.Uint16()), 10)
+	case v.IsUint32():
+		return strconv.FormatUint(uint64(v.Uint32()), 10)
+	case v.IsUint64():
+		return strconv.FormatUint(v.Uint64(), 10)
+	}
+	return fmt.Sprintf("%#v", v.Data())
+}