Skip to content

Commit

Permalink
Add Go1.11+ to prerequisites and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nleiva committed Nov 6, 2018
1 parent 0feb58a commit 988383c
Show file tree
Hide file tree
Showing 1,461 changed files with 47 additions and 778,829 deletions.
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
language: go
sudo: false
go:
- 1.11.x
- tip
os:
- linux
- osx
matrix:
include:
- go: "1.9.x"
script: go test -v . -coverprofile=coverage.txt -covermode=atomic
- go: "1.10.x"
script: go test -v ./... -coverprofile=coverage.txt -covermode=atomic
- go: "1.11.x"
script: go test -v -mod=vendor ./... -coverprofile=coverage.txt -covermode=atomic
- go: tip
script: go test -v -mod=vendor ./... -coverprofile=coverage.txt -covermode=atomic
allow_failures:
- go: tip
fast_finish: true
env:
- GO111MODULE=on
install: true
script:
- go test -v ./... -coverprofile=coverage.txt -covermode=atomic
after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ The end goal is to enable use-cases where multiple interactions with devices are

## Prerequisite Tools

* [Go (at least Go 1.9)](https://golang.org/dl/)
* [Go (at least Go 1.11)](https://golang.org/dl/)

## Usage

Expand Down
14 changes: 7 additions & 7 deletions client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ func unaryInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServ

// Validates username and password
func authorize(ctx context.Context) error {
if md, ok := metadata.FromContext(ctx); ok {
if md, ok := metadata.FromIncomingContext(ctx); ok {
if len(md["username"]) > 0 && md["username"][0] == defaultUser &&
len(md["password"]) > 0 && md["password"][0] == defaultPass {
return nil
Expand Down Expand Up @@ -336,10 +336,10 @@ func Server(t *testing.T, svc string) *grpc.Server {
go func() {
err := s.Serve(lis)
// Serve always returns a non-nil error :-(
if strings.Contains(err.Error(), "use of closed network connection") {
return
}
if err != nil {
if strings.Contains(err.Error(), "use of closed network connection") {
return
}
t.Fatalf("failed to serve: %v", err)
}
}()
Expand Down Expand Up @@ -367,10 +367,10 @@ func ServerInsecure(t *testing.T, svc string) *grpc.Server {
go func() {
err := s.Serve(lis)
// Serve always returns a non-nil error :-(
if strings.Contains(err.Error(), "use of closed network connection") {
return
}
if err != nil {
if strings.Contains(err.Error(), "use of closed network connection") {
return
}
t.Fatalf("failed to serve: %v", err)
}
}()
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/nleiva/xrgrpc

require (
github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7
github.com/golang/protobuf v1.2.0
github.com/pkg/errors v0.8.0
golang.org/x/net v0.0.0-20170716174642-b3756b4b77d7
golang.org/x/text v0.0.0-20170714085652-836efe42bb4a
google.golang.org/genproto v0.0.0-20170711235230-b0a3dcfcd1a9
google.golang.org/grpc v1.4.2
golang.org/x/net v0.0.0-20181106065722-10aee1819953
golang.org/x/sys v0.0.0-20181106135930-3a76605856fd // indirect
google.golang.org/genproto v0.0.0-20181101192439-c830210a61df // indirect
google.golang.org/grpc v1.16.0
)
39 changes: 29 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 h1:ulJ2cj/xlDlrwLCvWH4UeV9vJ/jXP6wEGgTSF7EOnmQ=
github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
golang.org/x/net v0.0.0-20170716174642-b3756b4b77d7 h1:FCqk7JXVeupwwnGVopQCC0a0xRK0Rj7SL5AyjjWo4pk=
golang.org/x/net v0.0.0-20170716174642-b3756b4b77d7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/text v0.0.0-20170714085652-836efe42bb4a h1:5P/R6TrcPsZMpLDBV9RhwUM1qsvTRx+6tJIVxOTGMvY=
golang.org/x/text v0.0.0-20170714085652-836efe42bb4a/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
google.golang.org/genproto v0.0.0-20170711235230-b0a3dcfcd1a9 h1:wxGvmadi0ZZjsFJf3uyqRb1Eg4Jawj4ofWGwW09gfds=
google.golang.org/genproto v0.0.0-20170711235230-b0a3dcfcd1a9/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/grpc v1.4.2 h1:d4DykO1p+3WAqT1w9zFKof8mkM/vYnWI0r8fjVz092o=
google.golang.org/grpc v1.4.2/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181106065722-10aee1819953 h1:LuZIitY8waaxUfNIdtajyE/YzA/zyf0YxXG27VpLrkg=
golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181106135930-3a76605856fd h1:5lx5yH6109ClL0rlBzOj++ZkX/njUT+RVgTO2RMbmZo=
golang.org/x/sys v0.0.0-20181106135930-3a76605856fd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20181101192439-c830210a61df h1:Ri2mROsxIxitlzRQ0pYoP8/dsqeLEolHrhh29dltSI4=
google.golang.org/genproto v0.0.0-20181101192439-c830210a61df/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/grpc v1.16.0 h1:dz5IJGuC2BB7qXR5AyHNwAUBhZscK2xVez7mznh72sY=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
16 changes: 0 additions & 16 deletions vendor/github.com/golang/protobuf/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions vendor/github.com/golang/protobuf/.travis.yml

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/golang/protobuf/AUTHORS

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/golang/protobuf/CONTRIBUTORS

This file was deleted.

31 changes: 0 additions & 31 deletions vendor/github.com/golang/protobuf/LICENSE

This file was deleted.

40 changes: 0 additions & 40 deletions vendor/github.com/golang/protobuf/Make.protobuf

This file was deleted.

55 changes: 0 additions & 55 deletions vendor/github.com/golang/protobuf/Makefile

This file was deleted.

Loading

0 comments on commit 988383c

Please sign in to comment.