Skip to content

Commit

Permalink
Metaverse merge (#262)
Browse files Browse the repository at this point in the history
* migrate to metaverse/truss

* migrate lingering tuneinc references

* remove newcontext hack now that we are in go1.11

* use gogo protobuf

* support go1.11 modules
  • Loading branch information
zaquestion authored Jan 17, 2019
1 parent 7dc4d5d commit 2d37b9a
Show file tree
Hide file tree
Showing 164 changed files with 33,897 additions and 1,398 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ sudo: false

go:
- tip
- 1.11.x
- 1.10.x
- 1.9.x

go_import_path: github.com/tuneinc/truss
go_import_path: github.com/metaverse/truss

before_install:
# protobuf
Expand Down
8 changes: 4 additions & 4 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ Whenever templates are modified, the templates must be recompiled to binary,
this is done with:

```
$ go generate github.com/tuneinc/truss/...
$ go generate github.com/metaverse/truss/...
```

Then to build truss and its protoc plugin to your $GOPATH/bin directory:

```
$ go install github.com/tuneinc/truss/...
$ go install github.com/metaverse/truss/...
```

Both can be done from the Makefile in the root directory:

```
$ cd $GOPATH/github.com/tuneinc/truss
$ cd $GOPATH/github.com/metaverse/truss
$ make
```

Expand All @@ -36,7 +36,7 @@ Before submitting a pull request always run tests that cover modified code.
Also build truss and run truss's integration test. This can be done by

```
$ cd $GOPATH/src/github.com/tuneinc/truss
$ cd $GOPATH/src/github.com/metaverse/truss
$ make
$ make test
# If the tests failed and you want to remove generated code
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ MAINTAINER [email protected]

RUN apk update && apk upgrade && apk add --no-cache protobuf git

RUN go version && go get -u -v github.com/golang/protobuf/protoc-gen-go
RUN go version && go get -u -v github.com/gogo/protobuf/protoc-gen-go

COPY ./ $GOPATH/src/github.com/tuneinc/truss
COPY ./ $GOPATH/src/github.com/metaverse/truss

RUN go install -v github.com/tuneinc/truss/...
RUN go install -v github.com/metaverse/truss/...

WORKDIR /go/src/protos

Expand Down
102 changes: 91 additions & 11 deletions Gopkg.lock

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

4 changes: 0 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ required = [
name = "github.com/davecgh/go-spew"
version = "1.1.0"

[[constraint]]
name = "github.com/golang/protobuf"
version = "1.1.0"

[[constraint]]
name = "github.com/pkg/errors"
version = "0.8.0"
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ VERSION_DATE := $(shell $(MAKEFILE_PATH)/commit_date.sh)
default: truss

dependencies:
go get -u github.com/golang/protobuf/protoc-gen-go
go get -u github.com/golang/protobuf/proto
go get -u github.com/gogo/protobuf/protoc-gen-gogo
go get -u github.com/gogo/protobuf/protoc-gen-gogofaster
go get -u github.com/gogo/protobuf/proto
go get -u github.com/jteeuwen/go-bindata/...

# Generate go files containing the all template files in []byte form
gobindata:
go generate github.com/tuneinc/truss/gengokit/template
go generate github.com/metaverse/truss/gengokit/template

# Install truss
truss: gobindata
go install -ldflags '-X "main.Version=$(SHA)" -X "main.VersionDate=$(VERSION_DATE)"' github.com/tuneinc/truss/cmd/truss
go install -ldflags '-X "main.Version=$(SHA)" -X "main.VersionDate=$(VERSION_DATE)"' github.com/metaverse/truss/cmd/truss

# Run the go tests and the truss integration tests
test: test-go test-integration
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Truss [![Build Status](https://travis-ci.org/tuneinc/truss.svg?branch=master)](https://travis-ci.org/tuneinc/truss)
# Truss [![Build Status](https://travis-ci.org/metaverse/truss.svg?branch=master)](https://travis-ci.org/metaverse/truss)

Truss handles the painful parts of services, freeing you to focus on the
business logic.
Expand All @@ -19,15 +19,15 @@ Otherwise [install from source.](https://github.com/google/protobuf)
1. Install Truss with

```
go get -u -d github.com/tuneinc/truss
cd $GOPATH/src/github.com/tuneinc/truss
go get -u -d github.com/metaverse/truss
cd $GOPATH/src/github.com/metaverse/truss
make dependencies
make
```
On Windows, do the following instead:
```
go get -u -d github.com/tuneinc/truss
cd %GOPATH%/src/github.com/tuneinc/truss
go get -u -d github.com/metaverse/truss
cd %GOPATH%/src/github.com/metaverse/truss
wininstall.bat
```

Expand Down
4 changes: 2 additions & 2 deletions TUTORIAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ We will build a simple service based on [echo.proto](./_example/echo.proto)
If everything passes you’re good to go.
If you see any complaints about packages not installed, `go get` those packages
If you encounter any other issues - ask the developers
3. To update to newer version of truss, do `git pull`, or `go get -u github.com/tuneinc/truss/...` truss again.
3. To update to newer version of truss, do `git pull`, or `go get -u github.com/metaverse/truss/...` truss again.

# Writing your first service

Expand All @@ -36,7 +36,7 @@ message LouderRequest {
The RPC calls can be annotated with HTTP transport option (endpoint name and type of request). For this we must import the google annotations library.

```
import "github.com/tuneinc/truss/deftree/googlethirdparty/annotations.proto";
import "github.com/metaverse/truss/deftree/googlethirdparty/annotations.proto";
service Echo {
...
Expand Down
2 changes: 1 addition & 1 deletion cmd/_integration-tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ all: test
test: clean test-transport test-middlewares test-cli

truss:
go install -ldflags '-X "main.Version=$(SHA)" -X "main.VersionDate=$(VERSION_DATE)"' github.com/tuneinc/truss/cmd/truss
go install -ldflags '-X "main.Version=$(SHA)" -X "main.VersionDate=$(VERSION_DATE)"' github.com/metaverse/truss/cmd/truss

test-transport: truss
@which truss
Expand Down
Loading

0 comments on commit 2d37b9a

Please sign in to comment.