Skip to content

Commit

Permalink
Revert "renaming NYTimes to nytimes, will fix examples vendor dir aft…
Browse files Browse the repository at this point in the history
…er we do official rollout"

This reverts commit 2bf2618.
  • Loading branch information
jprobinson committed Sep 28, 2018
1 parent 2bf2618 commit dd88e15
Show file tree
Hide file tree
Showing 20 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![GoDoc](https://godoc.org/github.com/nytimes/marvin?status.svg)](https://godoc.org/github.com/nytimes/marvin)
[![GoDoc](https://godoc.org/github.com/NYTimes/marvin?status.svg)](https://godoc.org/github.com/NYTimes/marvin)

# Marvin is a go-kit server for Google App Engine
### Marvin + GAE -> _let's get it oooonnnn!_
![Marvin!](https://cdn-images-1.medium.com/max/1600/1*btef9arpHHTzuknPFBHdUw.jpeg)

Marvin provides common tools and structure for services being built on Google App Engine by leaning heavily on the [go-kit/kit/transport/http package](http://godoc.org/github.com/go-kit/kit/transport/http). The [service interface here](http://godoc.org/github.com/nytimes/marvin#Service) is very similar to the service interface in [NYT's gizmo/server/kit package](https://godoc.org/github.com/nytimes/gizmo/server/kit#Service) so teams can build very similar looking software but use vasty different styles of infrastructure.
Marvin provides common tools and structure for services being built on Google App Engine by leaning heavily on the [go-kit/kit/transport/http package](http://godoc.org/github.com/go-kit/kit/transport/http). The [service interface here](http://godoc.org/github.com/NYTimes/marvin#Service) is very similar to the service interface in [NYT's gizmo/server/kit package](https://godoc.org/github.com/NYTimes/gizmo/server/kit#Service) so teams can build very similar looking software but use vasty different styles of infrastructure.

Marvin has been built to work with Go 1.8, which is available on App Engine Standard.

Expand Down
2 changes: 1 addition & 1 deletion examples/reading-list/Gopkg.lock

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

2 changes: 1 addition & 1 deletion examples/reading-list/Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@


[[constraint]]
name = "github.com/nytimes/marvin"
name = "github.com/NYTimes/marvin"
version = "0.1.1"

[[constraint]]
Expand Down
6 changes: 3 additions & 3 deletions examples/reading-list/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ A few highlights of this service worth calling out:
* [service.yaml](service.yaml)
* An Open API specification that describes the endpoints and how they support JSON _or_ Protobufs.
* [gen-proto.sh](gen-proto.sh)
* A script that relies on github.com/nytimes/openapi2proto to generate Protobuf IDL from the Open API spec along with the Protobuf stubs via protoc.
* A script that relies on github.com/NYTimes/openapi2proto to generate Protobuf IDL from the Open API spec along with the Protobuf stubs via protoc.
* [service.go](service.go)
* The actual [marvin.MixedService](http://godoc.org/github.com/nytimes/marvin#MixedService) implementation.
* The actual [marvin.MixedService](http://godoc.org/github.com/NYTimes/marvin#MixedService) implementation.
* [client.go](client.go)
* A go-kit client for programmatically accessing the API.
* [cmd/cli/main.go](cmd/cli/main.go)
Expand All @@ -33,7 +33,7 @@ A few highlights of this service worth calling out:
* The app config is in a nested directory to enable vendoring.
* This structure (along with using the legacy SDK) is the only way we've been able to get it to work with the current SDKs available.
* [.drone.yaml](.drone.yaml)
* An example configuration file for [Drone CI](http://readme.drone.io/) using the [nytimes/drone-gae](https://github.com/nytimes/drone-gae) plugin for managing automated deployments to App Engine.
* An example configuration file for [Drone CI](http://readme.drone.io/) using the [NYTimes/drone-gae](https://github.com/nytimes/drone-gae) plugin for managing automated deployments to App Engine.


This live demo is currently running on [https://nyt-reading-list.appspot.com](https://nyt-reading-list.appspot.com/list.json).
2 changes: 1 addition & 1 deletion examples/reading-list/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"strconv"
"time"

"github.com/NYTimes/marvin"
"github.com/go-kit/kit/endpoint"
"github.com/go-kit/kit/log"
"github.com/go-kit/kit/sd"
"github.com/go-kit/kit/sd/lb"
httptransport "github.com/go-kit/kit/transport/http"
"github.com/golang/protobuf/proto"
"github.com/nytimes/marvin"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/reading-list/cmd/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"

readinglist "github.com/nytimes/marvin/examples/reading-list"
readinglist "github.com/NYTimes/marvin/examples/reading-list"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion examples/reading-list/gen-proto.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

go get -u github.com/nytimes/openapi2proto/cmd/openapi2proto
go get -u github.com/NYTimes/openapi2proto/cmd/openapi2proto

openapi2proto -spec service.yaml > service.proto;

Expand Down
2 changes: 1 addition & 1 deletion examples/reading-list/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"strconv"

"github.com/nytimes/marvin"
"github.com/NYTimes/marvin"
"github.com/pkg/errors"
"google.golang.org/appengine/log"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/reading-list/put.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"strings"

"github.com/NYTimes/marvin"
"github.com/golang/protobuf/proto"
"github.com/nytimes/marvin"
)

// go-kit endpoint.Endpoint with core business logic
Expand Down
4 changes: 2 additions & 2 deletions examples/reading-list/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package main
import (
"google.golang.org/appengine"

"github.com/nytimes/marvin"
"github.com/NYTimes/marvin"

readinglist "github.com/nytimes/marvin/examples/reading-list"
readinglist "github.com/NYTimes/marvin/examples/reading-list"
)

// a tiny main package that simply initializes the service
Expand Down
2 changes: 1 addition & 1 deletion examples/reading-list/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"net/http"
"strings"

"github.com/NYTimes/marvin"
"github.com/go-kit/kit/endpoint"
httptransport "github.com/go-kit/kit/transport/http"
"github.com/nytimes/marvin"

"google.golang.org/appengine/user"
)
Expand Down
4 changes: 2 additions & 2 deletions examples/reading-list/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"google.golang.org/appengine"

"github.com/NYTimes/marvin"
"github.com/NYTimes/marvin/marvintest"
"github.com/kr/pretty"
"github.com/nytimes/marvin"
"github.com/nytimes/marvin/marvintest"
)

type testStep struct {
Expand Down

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

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

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

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

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

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

2 changes: 1 addition & 1 deletion marvintest/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"google.golang.org/appengine/aetest"

"github.com/nytimes/marvin/internal"
"github.com/NYTimes/marvin/internal"
)

// SetupTestContext will start up dev_appserver.py via `appengine/aetest` and inject the
Expand Down
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
httptransport "github.com/go-kit/kit/transport/http"
"github.com/golang/protobuf/proto"

"github.com/nytimes/marvin/internal"
"github.com/NYTimes/marvin/internal"
)

type contextKey int
Expand Down

0 comments on commit dd88e15

Please sign in to comment.