Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to go modules and initialize v8 of the project #285

Closed
wants to merge 3 commits into from
Closed

Switch to go modules and initialize v8 of the project #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22444df
Remove dep files and vendor folder.
gurudesu Nov 4, 2020
e54a7ca
Add go modules support and make base version v8.
gurudesu Nov 4, 2020
eddbb00
Update docs to reference the v8 version of twirp.
gurudesu Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions Gopkg.lock
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Gopkg.toml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ is a good read.
Use `go get` to install the Go client-and-server generator:

```
go get github.com/twitchtv/twirp/protoc-gen-twirp
go get github.com/twitchtv/twirp/v8/protoc-gen-twirp
```

You will also need:
Expand Down
2 changes: 1 addition & 1 deletion clientcompat/clientcompat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package main
import (
"context"

"github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
"github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
)

type clientCompat struct {
Expand Down
4 changes: 2 additions & 2 deletions clientcompat/gocompat/gocompat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"

"github.com/golang/protobuf/proto"
"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
"github.com/twitchtv/twirp/v8"
"github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions clientcompat/internal/clientcompat/clientcompat.twirp.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clientcompat/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"os"
"reflect"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
"github.com/twitchtv/twirp/v8"
"github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion clientcompat/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/gogo/protobuf/proto"
"github.com/pkg/errors"
"github.com/twitchtv/twirp/clientcompat/internal/clientcompat"
"github.com/twitchtv/twirp/v8/clientcompat/internal/clientcompat"
)

func runClient(clientBin string, msg *clientcompat.ClientCompatMessage) (resp []byte, errCode string, err error) {
Expand Down
2 changes: 1 addition & 1 deletion context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"errors"
"net/http"

"github.com/twitchtv/twirp/internal/contextkeys"
"github.com/twitchtv/twirp/v8/internal/contextkeys"
)

// MethodName extracts the name of the method being handled in the given
Expand Down
2 changes: 1 addition & 1 deletion ctxsetters/ctxsetters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/http"
"strconv"

"github.com/twitchtv/twirp/internal/contextkeys"
"github.com/twitchtv/twirp/v8/internal/contextkeys"
)

func WithMethodName(ctx context.Context, name string) context.Context {
Expand Down
2 changes: 1 addition & 1 deletion docs/example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ import (
"context"
"math/rand"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/v8"
pb "github.com/twitchtv/twirpexample/rpc/haberdasher"
)

Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Download and install `protoc-gen-go` using the normal Go tools:

```sh
$ go get -u github.com/golang/protobuf/protoc-gen-go
$ go get -u github.com/twitchtv/twirp/protoc-gen-twirp
$ go get -u github.com/twitchtv/twirp/v8/protoc-gen-twirp
```

The normal Go tools will install `protoc-gen-go` in `$GOBIN`, defaulting to
Expand Down
2 changes: 1 addition & 1 deletion errors_1_13_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"testing"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/v8"
)

type myError string
Expand Down
4 changes: 2 additions & 2 deletions example/cmd/client/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"log"
"net/http"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/example"
"github.com/twitchtv/twirp/v8"
"github.com/twitchtv/twirp/v8/example"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions example/cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"net/http"
"os"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/example"
"github.com/twitchtv/twirp/hooks/statsd"
"github.com/twitchtv/twirp/v8"
"github.com/twitchtv/twirp/v8/example"
"github.com/twitchtv/twirp/v8/hooks/statsd"
)

type randomHaberdasher struct{}
Expand Down
6 changes: 3 additions & 3 deletions example/service.twirp.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module github.com/twitchtv/twirp/v8

go 1.15

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415
github.com/golang/protobuf v1.2.1-0.20180919224659-7716a980bcee
github.com/pkg/errors v0.8.0
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.0
)
17 changes: 17 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCPyPYZfqHdJmc8MK4wrBjMft6BAM=
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/protobuf v1.2.1-0.20180919224659-7716a980bcee h1:+mVzS2zW4kko5TLp0Q543d7oHN8+gmBcR6HehSTbJCA=
github.com/golang/protobuf v1.2.1-0.20180919224659-7716a980bcee/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
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=
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/stretchr/testify v1.2.0 h1:LThGCOvhuJic9Gyd1VBCkhyUXmO8vKaBFvBsJ2k03rg=
github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
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=
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
2 changes: 1 addition & 1 deletion hooks/statsd/statsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"
"time"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/v8"
)

var reqStartTimestampKey = new(int)
Expand Down
4 changes: 2 additions & 2 deletions hooks/statsd/statsd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/internal/twirptest"
"github.com/twitchtv/twirp/v8"
"github.com/twitchtv/twirp/v8/internal/twirptest"
)

func TestSanitize(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/gen/wrappers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import (

"github.com/golang/protobuf/protoc-gen-go/descriptor"
plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
"github.com/twitchtv/twirp/internal/gen/stringutils"
"github.com/twitchtv/twirp/v8/internal/gen/stringutils"
)

// Each type we import as a protocol buffer (other than FileDescriptorProto) needs
Expand Down
2 changes: 1 addition & 1 deletion internal/twirptest/client_1_13_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/http"
"testing"

"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/v8"
)

func TestClientContextCanceled(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/twirptest/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"testing"

"github.com/pkg/errors"
"github.com/twitchtv/twirp"
"github.com/twitchtv/twirp/v8"
)

// reqInspector is a tool to check inspect HTTP Requests as they pass
Expand Down
6 changes: 3 additions & 3 deletions internal/twirptest/empty_service/empty_service.twirp.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/twirptest/gogo_compat/gogo_compat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package gogo_compat
import (
"testing"

"github.com/twitchtv/twirp/internal/descriptors"
"github.com/twitchtv/twirp/v8/internal/descriptors"
)

func TestCompilation(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions internal/twirptest/gogo_compat/service.twirp.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/twirptest/google_protobuf_imports/service.twirp.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading