Merge pull request #233 from gandhikrishna/updatetchannel

Fixed Broken master, Updated tchannel-go to 1.32.0

Author: gandhikrishna

.github/workflows/test.yaml

@@ -18,7 +18,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15
+        go-version: 1.16.6
     - name: Setup Python 2.7
       uses: actions/setup-python@v2
       with:
@@ -52,7 +52,7 @@ jobs:
         ./scripts/travis/get-cram.sh
         npm install -g [email protected]
     - name: Run Setup
-      run: make setup      
+      run: make setup
     - name: Lint
       run: make lint
     - name: Unit Tests
@@ -64,6 +64,6 @@ jobs:
     - name: Generate coverage report
       run: make coveralls
     - name: Upload coverage report
-      uses: shogo82148/actions-goveralls@v1
+      uses: shogo82148/actions-goveralls@02a150c2be8d92067983c74e9be237da98abfaad
       with:
         path-to-profile: ${{ env.GOPATH }}/src/github.com/${{ github.repository }}/acc.out

Makefile

@@ -52,7 +52,6 @@ mocks:
 dev_deps:
 	go get -u github.com/uber/tchannel-go/thrift/thrift-gen
 	go get -u golang.org/x/lint/golint/...
-	./scripts/go-get-version.sh github.com/vektra/mockery/.../@130a05e
 
 setup: dev_deps
 	glide install

examples/keyvalue/gen-go/keyvalue/constants.go

@@ -6,7 +6,7 @@ package keyvalue
 import (
 	"fmt"
 
-	athrift "github.com/apache/thrift/lib/go/thrift"
+	athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 	"github.com/uber/tchannel-go/thrift"
 )
 

examples/keyvalue/gen-go/keyvalue/keyvalueservice.go

@@ -6,7 +6,7 @@ package ping
 import (
 	"fmt"
 
-	athrift "github.com/apache/thrift/lib/go/thrift"
+	athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 	"github.com/uber/tchannel-go/thrift"
 )
 

examples/keyvalue/gen-go/keyvalue/tchan-keyvalue.go

@@ -6,7 +6,7 @@ package ping
 import (
 	"fmt"
 
-	athrift "github.com/apache/thrift/lib/go/thrift"
+	athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 	"github.com/uber/tchannel-go/thrift"
 )
 

examples/keyvalue/gen-go/keyvalue/ttypes.go

@@ -6,7 +6,7 @@ package role
 import (
 	"fmt"
 
-	athrift "github.com/apache/thrift/lib/go/thrift"
+	athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 	"github.com/uber/tchannel-go/thrift"
 )
 

examples/ping-thrift-gen/gen-go/ping/constants.go

@@ -31,12 +31,12 @@ import (
 	events "github.com/uber/ringpop-go/events/test/mocks"
 	"github.com/uber/ringpop-go/test/thrift/pingpong"
 
-	athrift "github.com/apache/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 	"github.com/uber/tchannel-go"
 	"github.com/uber/tchannel-go/json"
+	athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 	"github.com/uber/tchannel-go/thrift"
 	"golang.org/x/net/context"
 )
@@ -219,7 +219,6 @@ func (s *ForwarderTestSuite) TestForwardThriftWithCtxOption() {
 	bytes1, err := SerializeThrift(request)
 	s.NoError(err, "expected ping to be serialized")
 
-
 	k := ContextKey("key")
 	ctx := thrift.Wrap(context.WithValue(context.Background(), k, "val"))
 

examples/ping-thrift-gen/gen-go/ping/pingpongservice.go

@@ -16,7 +16,7 @@ import:
   - require
 - package: github.com/uber-common/bark
 - package: github.com/uber/tchannel-go
-  version: 1.8.0
+  version: 1.32.0
   subpackages:
   - json
   - raw
@@ -25,3 +25,5 @@ import:
 - package: golang.org/x/net
   subpackages:
   - context
+- package: golang.org/x/sys
+  version: master

examples/ping-thrift-gen/gen-go/ping/tchan-ping.go

@@ -38,11 +38,11 @@ import (
 	"github.com/uber/ringpop-go/shared"
 	"github.com/uber/ringpop-go/swim"
 
-	athrift "github.com/apache/thrift/lib/go/thrift"
 	"github.com/benbjohnson/clock"
 	"github.com/dgryski/go-farm"
 	log "github.com/uber-common/bark"
 	"github.com/uber/tchannel-go"
+	athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 )
 
 // Interface specifies the public facing methods a user of ringpop is able to

examples/ping-thrift-gen/gen-go/ping/ttypes.go

@@ -3,7 +3,7 @@ package mocks
 import "github.com/uber/tchannel-go/thrift"
 import "github.com/stretchr/testify/mock"
 
-import athrift "github.com/apache/thrift/lib/go/thrift"
+import athrift "github.com/uber/tchannel-go/thirdparty/github.com/apache/thrift/lib/go/thrift"
 
 type TChanClient struct {
 	mock.Mock