Commit 84d2482d authored by Christopher Speller's avatar Christopher Speller
Browse files

Updating go depencancies. Switching to go1.6 vendoring (#2949)

parent d1efb66a
{
"ImportPath": "github.com/mattermost/platform",
"GoVersion": "go1.5.1",
"Packages": [
"./..."
],
"GoVersion": "go1.6",
"GodepVersion": "v65",
"Deps": [
{
"ImportPath": "github.com/NYTimes/gziphandler",
"Rev": "a88790d49798560db24af70fb6a10a66e2549a72"
},
{
"ImportPath": "github.com/gorilla/handlers",
"Comment": "v1.1-4-gd0f2612",
"Rev": "d0f261246491e3a8613039e90764460448dc05f5"
"Rev": "63027b26b87e2ae2ce3810393d4b81021cfd3a35"
},
{
"ImportPath": "github.com/alecthomas/log4go",
"Rev": "8e9057c3b25c409a34c0b9737cdc82cbcafeabce"
"Rev": "e5dc62318d9bd58682f1dceb53a4b24e8253682f"
},
{
"ImportPath": "github.com/braintree/manners",
"Comment": "0.4.0-9-g3fdfada",
"Rev": "3fdfadabc96863ceec055bd73ab1e80324e72706"
"Comment": "0.4.0-15-g82a8879",
"Rev": "82a8879fc5fd0381fa8b2d8033b19bf255252088"
},
{
"ImportPath": "github.com/cloudfoundry/jibber_jabber",
......@@ -33,79 +26,86 @@
},
{
"ImportPath": "github.com/disintegration/imaging",
"Rev": "546cb3c5137b3f1232e123a26aa033aade6b3066"
"Rev": "d8bbae1de109b518dabc98c6c1633eb358c148a4"
},
{
"ImportPath": "github.com/garyburd/redigo/internal",
"Rev": "6ece6e0a09f28cc399b21550cbf37ab39ba63cce"
"Rev": "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"
},
{
"ImportPath": "github.com/garyburd/redigo/redis",
"Rev": "6ece6e0a09f28cc399b21550cbf37ab39ba63cce"
"Rev": "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"
},
{
"ImportPath": "github.com/go-gorp/gorp",
"Comment": "v1.7-148-gc0e2e1a",
"Rev": "c0e2e1a7adaa00e47c4f6ae8faaad6991a4570ac"
"Comment": "v1.7-184-g6a3c8a8",
"Rev": "6a3c8a87d0457cf700e57046c41e19b7cf3c44fa"
},
{
"ImportPath": "github.com/go-ldap/ldap",
"Comment": "v2.2",
"Rev": "e9a325d64989e2844be629682cb085d2c58eef8d"
"Comment": "v2.3.0",
"Rev": "0e7db8eb77695b5a952f0e5d78df9ab160050c73"
},
{
"ImportPath": "github.com/go-sql-driver/mysql",
"Comment": "v1.2-125-gd512f20",
"Rev": "d512f204a577a4ab037a1816604c48c9c13210be"
"Comment": "v1.2-194-g7ebe0a5",
"Rev": "7ebe0a500653eeb1859664bed5e48dec1e164e73"
},
{
"ImportPath": "github.com/goamz/goamz/aws",
"Rev": "be371d06631a6ea076cccefc6654fa5c29be074d"
"Rev": "02d5144a587b982e33b95f484a34164ce6923c99"
},
{
"ImportPath": "github.com/goamz/goamz/s3",
"Rev": "be371d06631a6ea076cccefc6654fa5c29be074d"
"Rev": "02d5144a587b982e33b95f484a34164ce6923c99"
},
{
"ImportPath": "github.com/golang/freetype",
"Comment": "release-120-gf29eb11",
"Rev": "f29eb116deb328d02ee5c573f02d442ca67d5532"
"Comment": "release-129-gc67e4d9",
"Rev": "c67e4d98d212356ec0d9436a1edcbb6eb799f847"
},
{
"ImportPath": "github.com/golang/freetype/raster",
"Comment": "release-120-gf29eb11",
"Rev": "f29eb116deb328d02ee5c573f02d442ca67d5532"
"Comment": "release-129-gc67e4d9",
"Rev": "c67e4d98d212356ec0d9436a1edcbb6eb799f847"
},
{
"ImportPath": "github.com/golang/freetype/truetype",
"Comment": "release-120-gf29eb11",
"Rev": "f29eb116deb328d02ee5c573f02d442ca67d5532"
"Comment": "release-129-gc67e4d9",
"Rev": "c67e4d98d212356ec0d9436a1edcbb6eb799f847"
},
{
"ImportPath": "github.com/golang/groupcache/lru",
"Rev": "604ed5785183e59ae2789449d89e73f3a2a77987"
"Rev": "4eab30f13db9d8b25c752e99d1583628ac2fa422"
},
{
"ImportPath": "github.com/gorilla/context",
"Rev": "1c83b3eabd45b6d76072b66b746c20815fb2872d"
"Comment": "v1.1-2-ga8d44e7",
"Rev": "a8d44e7d8e4d532b6a27a02dd82abb31cc1b01bd"
},
{
"ImportPath": "github.com/gorilla/handlers",
"Comment": "v1.1-6-g66e6c6f",
"Rev": "66e6c6f01d8da976ee113437745ca029c2b585a6"
},
{
"ImportPath": "github.com/gorilla/mux",
"Rev": "9c068cf16d982f8bd444b8c352acbeec34c4fe5b"
"Comment": "v1.1-7-g9c19ed5",
"Rev": "9c19ed558d5df4da88e2ade9c8940d742aef0e7e"
},
{
"ImportPath": "github.com/gorilla/websocket",
"Rev": "3986be78bf859e01f01af631ad76da5b269d270c"
"Rev": "1f512fc3f05332ba7117626cdfb4e07474e58e60"
},
{
"ImportPath": "github.com/lib/pq",
"Comment": "go1.0-cutoff-63-g11fc39a",
"Rev": "11fc39a580a008f1f39bb3d11d984fb34ed778d9"
"Comment": "go1.0-cutoff-86-gdd3290b",
"Rev": "dd3290b2f71a8b30bee8e4e75a337a825263d26f"
},
{
"ImportPath": "github.com/lib/pq/oid",
"Comment": "go1.0-cutoff-63-g11fc39a",
"Rev": "11fc39a580a008f1f39bb3d11d984fb34ed778d9"
"Comment": "go1.0-cutoff-86-gdd3290b",
"Rev": "dd3290b2f71a8b30bee8e4e75a337a825263d26f"
},
{
"ImportPath": "github.com/mattermost/rsc/gf256",
......@@ -115,10 +115,14 @@
"ImportPath": "github.com/mattermost/rsc/qr",
"Rev": "bbaefb05eaa0389ea712340066837c8ce4d287f9"
},
{
"ImportPath": "github.com/mattermost/rsc/qr/coding",
"Rev": "bbaefb05eaa0389ea712340066837c8ce4d287f9"
},
{
"ImportPath": "github.com/mssola/user_agent",
"Comment": "v0.4.1-5-g783ec61",
"Rev": "783ec61292aee3fc2f442ce740aa491e4849b794"
"Comment": "v0.4.1-14-g8e786bc",
"Rev": "8e786bcb38b846e5eb8eb5f036d9144fc7b0a1f8"
},
{
"ImportPath": "github.com/nicksnyder/go-i18n/i18n",
......@@ -142,7 +146,8 @@
},
{
"ImportPath": "github.com/pborman/uuid",
"Rev": "dee7705ef7b324f27ceb85a121c61f2c2e8ce988"
"Comment": "v1.0-11-gc55201b",
"Rev": "c55201b036063326c5b1b89ccfe45a184973d073"
},
{
"ImportPath": "github.com/rwcarlsen/goexif/exif",
......@@ -158,31 +163,35 @@
},
{
"ImportPath": "golang.org/x/crypto/bcrypt",
"Rev": "f18420efc3b4f8e9f3d51f6bd2476e92c46260e9"
"Rev": "91ab96ae987aef3e74ab78b3aaf026109d206148"
},
{
"ImportPath": "golang.org/x/crypto/blowfish",
"Rev": "f18420efc3b4f8e9f3d51f6bd2476e92c46260e9"
"Rev": "91ab96ae987aef3e74ab78b3aaf026109d206148"
},
{
"ImportPath": "golang.org/x/image/bmp",
"Rev": "baddd3465a05d84a6d8d3507547a91cb188c81ea"
"Rev": "f551d3a6b7fc11df315ad9e18b404280680f8bec"
},
{
"ImportPath": "golang.org/x/image/font",
"Rev": "baddd3465a05d84a6d8d3507547a91cb188c81ea"
"Rev": "f551d3a6b7fc11df315ad9e18b404280680f8bec"
},
{
"ImportPath": "golang.org/x/image/math/fixed",
"Rev": "baddd3465a05d84a6d8d3507547a91cb188c81ea"
"Rev": "f551d3a6b7fc11df315ad9e18b404280680f8bec"
},
{
"ImportPath": "golang.org/x/image/tiff",
"Rev": "baddd3465a05d84a6d8d3507547a91cb188c81ea"
"Rev": "f551d3a6b7fc11df315ad9e18b404280680f8bec"
},
{
"ImportPath": "golang.org/x/image/tiff/lzw",
"Rev": "baddd3465a05d84a6d8d3507547a91cb188c81ea"
"Rev": "f551d3a6b7fc11df315ad9e18b404280680f8bec"
},
{
"ImportPath": "golang.org/x/sys/unix",
"Rev": "b776ec39b3e54652e09028aaaaac9757f4f8211a"
},
{
"ImportPath": "gopkg.in/asn1-ber.v1",
......@@ -191,8 +200,8 @@
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
"Comment": "v1.2.5",
"Rev": "2cdd39bd6129c6a49c74fb07fb9d77ba1271c572"
"Comment": "v1.3.0",
"Rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"
},
{
"ImportPath": "gopkg.in/throttled/throttled.v1",
......@@ -206,7 +215,7 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "f7716cbe52baa25d2e9b0d0da546fcf909fc16b4"
"Rev": "a83829b6f1293c91addabc89d0571c246397bbf4"
}
]
}
package main
import (
"time"
)
import l4g "code.google.com/p/log4go"
func main() {
log := l4g.NewLogger()
defer log.Close()
log.AddFilter("stdout", l4g.DEBUG, l4g.NewConsoleLogWriter())
log.Info("The time is now: %s", time.Now().Format("15:04:05 MST 2006/01/02"))
}
package main
import (
"bufio"
"fmt"
"io"
"os"
"time"
)
import l4g "code.google.com/p/log4go"
const (
filename = "flw.log"
)
func main() {
// Get a new logger instance
log := l4g.NewLogger()
// Create a default logger that is logging messages of FINE or higher
log.AddFilter("file", l4g.FINE, l4g.NewFileLogWriter(filename, false))
log.Close()
/* Can also specify manually via the following: (these are the defaults) */
flw := l4g.NewFileLogWriter(filename, false)
flw.SetFormat("[%D %T] [%L] (%S) %M")
flw.SetRotate(false)
flw.SetRotateSize(0)
flw.SetRotateLines(0)
flw.SetRotateDaily(false)
log.AddFilter("file", l4g.FINE, flw)
// Log some experimental messages
log.Finest("Everything is created now (notice that I will not be printing to the file)")
log.Info("The time is now: %s", time.Now().Format("15:04:05 MST 2006/01/02"))
log.Critical("Time to close out!")
// Close the log
log.Close()
// Print what was logged to the file (yes, I know I'm skipping error checking)
fd, _ := os.Open(filename)
in := bufio.NewReader(fd)
fmt.Print("Messages logged to file were: (line numbers not included)\n")
for lineno := 1; ; lineno++ {
line, err := in.ReadString('\n')
if err == io.EOF {
break
}
fmt.Printf("%3d:\t%s", lineno, line)
}
fd.Close()
// Remove the file so it's not lying around
os.Remove(filename)
}
package main
import (
"flag"
"fmt"
"net"
"os"
)
var (
port = flag.String("p", "12124", "Port number to listen on")
)
func e(err error) {
if err != nil {
fmt.Printf("Erroring out: %s\n", err)
os.Exit(1)
}
}
func main() {
flag.Parse()
// Bind to the port
bind, err := net.ResolveUDPAddr("0.0.0.0:" + *port)
e(err)
// Create listener
listener, err := net.ListenUDP("udp", bind)
e(err)
fmt.Printf("Listening to port %s...\n", *port)
for {
// read into a new buffer
buffer := make([]byte, 1024)
_, _, err := listener.ReadFrom(buffer)
e(err)
// log to standard output
fmt.Println(string(buffer))
}
}
package main
import (
"time"
)
import l4g "code.google.com/p/log4go"
func main() {
log := l4g.NewLogger()
log.AddFilter("network", l4g.FINEST, l4g.NewSocketLogWriter("udp", "192.168.1.255:12124"))
// Run `nc -u -l -p 12124` or similar before you run this to see the following message
log.Info("The time is now: %s", time.Now().Format("15:04:05 MST 2006/01/02"))
// This makes sure the output stream buffer is written
log.Close()
}
package main
import l4g "code.google.com/p/log4go"
func main() {
// Load the configuration (isn't this easy?)
l4g.LoadConfiguration("example.xml")
// And now we're ready!
l4g.Finest("This will only go to those of you really cool UDP kids! If you change enabled=true.")
l4g.Debug("Oh no! %d + %d = %d!", 2, 2, 2+2)
l4g.Info("About that time, eh chaps?")
}
<logging>
<filter enabled="true">
<tag>stdout</tag>
<type>console</type>
<!-- level is (:?FINEST|FINE|DEBUG|TRACE|INFO|WARNING|ERROR) -->
<level>DEBUG</level>
</filter>
<filter enabled="true">
<tag>file</tag>
<type>file</type>
<level>FINEST</level>
<property name="filename">test.log</property>
<!--
%T - Time (15:04:05 MST)
%t - Time (15:04)
%D - Date (2006/01/02)
%d - Date (01/02/06)
%L - Level (FNST, FINE, DEBG, TRAC, WARN, EROR, CRIT)
%S - Source
%M - Message
It ignores unknown format strings (and removes them)
Recommended: "[%D %T] [%L] (%S) %M"
-->
<property name="format">[%D %T] [%L] (%S) %M</property>
<property name="rotate">false</property> <!-- true enables log rotation, otherwise append -->
<property name="maxsize">0M</property> <!-- \d+[KMG]? Suffixes are in terms of 2**10 -->
<property name="maxlines">0K</property> <!-- \d+[KMG]? Suffixes are in terms of thousands -->
<property name="daily">true</property> <!-- Automatically rotates when a log message is written after midnight -->
</filter>
<filter enabled="true">
<tag>xmllog</tag>
<type>xml</type>
<level>TRACE</level>
<property name="filename">trace.xml</property>
<property name="rotate">true</property> <!-- true enables log rotation, otherwise append -->
<property name="maxsize">100M</property> <!-- \d+[KMG]? Suffixes are in terms of 2**10 -->
<property name="maxrecords">6K</property> <!-- \d+[KMG]? Suffixes are in terms of thousands -->
<property name="daily">false</property> <!-- Automatically rotates when a log message is written after midnight -->
</filter>
<filter enabled="false"><!-- enabled=false means this logger won't actually be created -->
<tag>donotopen</tag>
<type>socket</type>
<level>FINEST</level>
<property name="endpoint">192.168.1.255:12124</property> <!-- recommend UDP broadcast -->
<property name="protocol">udp</property> <!-- tcp or udp -->
</filter>
</logging>
package test_helpers
// A PEM-encoded TLS cert with SAN IPs "127.0.0.1" and "[::1]", expiring at the
// last second of 2049 (the end of ASN.1 time).
// generated from src/pkg/crypto/tls:
// go run generate_cert.go --rsa-bits 512 --host 127.0.0.1,::1,example.com --ca --start-date "Jan 1 00:00:00 1970" --duration=1000000h
var (
Cert = []byte(`-----BEGIN CERTIFICATE-----
MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
bzAeFw03MDAxMDEwMDAwMDBaFw00OTEyMzEyMzU5NTlaMBIxEDAOBgNVBAoTB0Fj
bWUgQ28wWjALBgkqhkiG9w0BAQEDSwAwSAJBAN55NcYKZeInyTuhcCwFMhDHCmwa
IUSdtXdcbItRB/yfXGBhiex00IaLXQnSU+QZPRZWYqeTEbFSgihqi1PUDy8CAwEA
AaNoMGYwDgYDVR0PAQH/BAQDAgCkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1Ud
EwEB/wQFMAMBAf8wLgYDVR0RBCcwJYILZXhhbXBsZS5jb22HBH8AAAGHEAAAAAAA
AAAAAAAAAAAAAAEwCwYJKoZIhvcNAQEFA0EAAoQn/ytgqpiLcZu9XKbCJsJcvkgk
Se6AbGXgSlq+ZCEVo0qIwSgeBqmsJxUu7NCSOwVJLYNEBO2DtIxoYVk+MA==
-----END CERTIFICATE-----`)
Key = []byte(`-----BEGIN RSA PRIVATE KEY-----
MIIBPAIBAAJBAN55NcYKZeInyTuhcCwFMhDHCmwaIUSdtXdcbItRB/yfXGBhiex0
0IaLXQnSU+QZPRZWYqeTEbFSgihqi1PUDy8CAwEAAQJBAQdUx66rfh8sYsgfdcvV
NoafYpnEcB5s4m/vSVe6SU7dCK6eYec9f9wpT353ljhDUHq3EbmE4foNzJngh35d
AekCIQDhRQG5Li0Wj8TM4obOnnXUXf1jRv0UkzE9AHWLG5q3AwIhAPzSjpYUDjVW
MCUXgckTpKCuGwbJk7424Nb8bLzf3kllAiA5mUBgjfr/WtFSJdWcPQ4Zt9KTMNKD
EUO0ukpTwEIl6wIhAMbGqZK3zAAFdq8DD2jPx+UJXnh0rnOkZBzDtJ6/iN69AiEA
1Aq8MJgTaYsDQWyU/hDq5YkDJc9e9DSCvUIzqxQWMQE=
-----END RSA PRIVATE KEY-----`)
)
package test_helpers
import "net"
type Conn struct {
net.Conn
CloseCalled bool
}
func (c *Conn) Close() error {
c.CloseCalled = true
return nil
}
package test_helpers
import (
"errors"
"net"
)
type Listener struct {
AcceptRelease chan bool
CloseCalled chan bool
}
func NewListener() *Listener {
return &Listener{
make(chan bool, 1),
make(chan bool, 1),
}
}
func (l *Listener) Addr() net.Addr {
addr, _ := net.ResolveTCPAddr("tcp", "127.0.0.1:8080")
return addr
}
func (l *Listener) Close() error {
l.CloseCalled <- true
l.AcceptRelease <- true
return nil
}
func (l *Listener) Accept() (net.Conn, error) {
<-l.AcceptRelease
return nil, errors.New("connection closed")
}
package test_helpers
import (
"io/ioutil"
"os"
)
type TempFile struct {
*os.File
}
func NewTempFile(content []byte) (*TempFile, error) {
f, err := ioutil.TempFile("", "graceful-test")
if err != nil {
return nil, err
}
f.Write(content)
return &TempFile{f}, nil
}
func (tf *TempFile) Unlink() {
if tf.File != nil {
os.Remove(tf.Name())
tf.File = nil
}
}
package test_helpers
import "sync"
type WaitGroup struct {
sync.Mutex
Count int
WaitCalled chan int
}
func NewWaitGroup() *WaitGroup {
return &WaitGroup{
WaitCalled: make(chan int, 1),
}
}
func (wg *WaitGroup) Add(delta int) {
wg.Lock()
wg.Count++
wg.Unlock()
}
func (wg *WaitGroup) Done() {
wg.Lock()
wg.Count--
wg.Unlock()
}
func (wg *WaitGroup) Wait() {
wg.Lock()
wg.WaitCalled <- wg.Count
wg.Unlock()
}
git fetch
git checkout %GIT_COMMIT%
SET GOPATH=%CD%\Godeps\_workspace;c:\Users\Administrator\go
c:\Go\bin\go test -v .
package dgoogauth
import (
"strconv"
"testing"
"time"
)
// Test vectors via:
// http://code.google.com/p/google-authenticator/source/browse/libpam/pam_google_authenticator_unittest.c
// https://google-authenticator.googlecode.com/hg/libpam/totp.html