Merge branch 'master' of https://github.com/gonitro/nitro

app/client/backoff_test.go

@@ -71,7 +71,7 @@ func (r *testRequest) ContentType() string {
 	return r.contentType
 }
 
-func (r *testRequest) Service() string {
+func (r *testRequest) App() string {
 	return r.service
 }
 

app/client/client.go

@@ -32,7 +32,7 @@ type Message interface {
 // Request is the interface for a synchronous request used by Call or Stream
 type Request interface {
 	// The service to call
-	Service() string
+	App() string
 	// The action to take
 	Method() string
 	// The endpoint to invoke

app/client/lookup.go

@@ -28,11 +28,11 @@ func LookupRoute(ctx context.Context, req Request, opts CallOptions) ([]string,
 	}
 
 	// lookup the routes which can be used to execute the request
-	routes, err := opts.Router.Lookup(req.Service(), query...)
+	routes, err := opts.Router.Lookup(req.App(), query...)
 	if err == router.ErrRouteNotFound {
-		return nil, errors.InternalServerError("nitro", "service %s: %s", req.Service(), err.Error())
+		return nil, errors.InternalServerError("nitro", "service %s: %s", req.App(), err.Error())
 	} else if err != nil {
-		return nil, errors.InternalServerError("nitro", "error getting next %s node: %s", req.Service(), err.Error())
+		return nil, errors.InternalServerError("nitro", "error getting next %s node: %s", req.App(), err.Error())
 	}
 
 	// sort by lowest metric first

app/client/rpc/common_test.go

@@ -6,12 +6,12 @@ import (
 
 var (
 	// mock data
-	testData = map[string][]*registry.Service{
+	testData = map[string][]*registry.App{
 		"foo": {
 			{
 				Name:    "foo",
 				Version: "1.0.0",
-				Nodes: []*registry.Node{
+				Instances: []*registry.Instance{
 					{
 						Id:      "foo-1.0.0-123",
 						Address: "localhost:9999",
@@ -31,7 +31,7 @@ var (
 			{
 				Name:    "foo",
 				Version: "1.0.1",
-				Nodes: []*registry.Node{
+				Instances: []*registry.Instance{
 					{
 						Id:      "foo-1.0.1-321",
 						Address: "localhost:6666",
@@ -44,7 +44,7 @@ var (
 			{
 				Name:    "foo",
 				Version: "1.0.3",
-				Nodes: []*registry.Node{
+				Instances: []*registry.Instance{
 					{
 						Id:      "foo-1.0.3-345",
 						Address: "localhost:8888",

app/client/rpc/rpc_codec.go

@@ -106,7 +106,7 @@ func setHeaders(m *codec.Message, stream string) {
 	}
 
 	set("Id", m.Id)
-	set("Service", m.Target)
+	set("App", m.Target)
 	set("Method", m.Method)
 	set("Endpoint", m.Endpoint)
 	set("Error", m.Error)
@@ -117,7 +117,7 @@ func setHeaders(m *codec.Message, stream string) {
 }
 
 // setupProtocol sets up the old protocol
-func setupProtocol(msg *network.Message, node *registry.Node) codec.NewCodec {
+func setupProtocol(msg *network.Message, node *registry.Instance) codec.NewCodec {
 	// get the protocol from node metadata
 	if protocol := node.Metadata["protocol"]; len(protocol) > 0 {
 		return nil

app/client/rpc/rpc_request.go

@@ -41,7 +41,7 @@ func (r *rpcRequest) ContentType() string {
 	return r.contentType
 }
 
-func (r *rpcRequest) Service() string {
+func (r *rpcRequest) App() string {
 	return r.service
 }
 

app/client/rpc/rpc_request_test.go

@@ -8,8 +8,8 @@ import (
 
 func TestRequestOptions(t *testing.T) {
 	r := newRequest("service", "endpoint", nil, "application/json")
-	if r.Service() != "service" {
-		t.Fatalf("expected 'service' got %s", r.Service())
+	if r.App() != "service" {
+		t.Fatalf("expected 'service' got %s", r.App())
 	}
 	if r.Endpoint() != "endpoint" {
 		t.Fatalf("expected 'endpoint' got %s", r.Endpoint())

app/client/rpc/rpc_stream.go

@@ -59,7 +59,7 @@ func (r *rpcStream) Send(msg interface{}) error {
 
 	req := codec.Message{
 		Id:       r.id,
-		Target:   r.request.Service(),
+		Target:   r.request.App(),
 		Method:   r.request.Method(),
 		Endpoint: r.request.Endpoint(),
 		Type:     codec.Request,
@@ -146,7 +146,7 @@ func (r *rpcStream) Close() error {
 			// no need to check for error
 			r.codec.Write(&codec.Message{
 				Id:       r.id,
-				Target:   r.request.Service(),
+				Target:   r.request.App(),
 				Method:   r.request.Method(),
 				Endpoint: r.request.Endpoint(),
 				Type:     codec.Error,

app/client/rpc/rpc_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 func newTestRouter() router.Router {
-	reg := memory.NewRegistry(memory.Services(testData))
+	reg := memory.NewRegistry(memory.Apps(testData))
 	return regRouter.NewRouter(router.Registry(reg))
 }
 
@@ -28,8 +28,8 @@ func TestCallAddress(t *testing.T) {
 		return func(ctx context.Context, node string, req client.Request, rsp interface{}, opts client.CallOptions) error {
 			called = true
 
-			if req.Service() != service {
-				return fmt.Errorf("expected service: %s got %s", service, req.Service())
+			if req.App() != service {
+				return fmt.Errorf("expected service: %s got %s", service, req.App())
 			}
 
 			if req.Endpoint() != endpoint {
@@ -114,8 +114,8 @@ func TestCallWrapper(t *testing.T) {
 		return func(ctx context.Context, node string, req client.Request, rsp interface{}, opts client.CallOptions) error {
 			called = true
 
-			if req.Service() != service {
-				return fmt.Errorf("expected service: %s got %s", service, req.Service())
+			if req.App() != service {
+				return fmt.Errorf("expected service: %s got %s", service, req.App())
 			}
 
 			if req.Endpoint() != endpoint {
@@ -137,10 +137,10 @@ func TestCallWrapper(t *testing.T) {
 		client.WrapCall(wrap),
 	)
 
-	r.Options().Registry.Register(&registry.Service{
+	r.Options().Registry.Add(&registry.App{
 		Name:    service,
 		Version: "latest",
-		Nodes: []*registry.Node{
+		Instances: []*registry.Instance{
 			{
 				Id:      id,
 				Address: address,

app/crypto/auth.go

@@ -89,7 +89,7 @@ type Resource struct {
 	Name string `json:"name"`
 	// Type of resource, e.g. service
 	Type string `json:"type"`
-	// Endpoint resource e.g NotesService.Create
+	// Endpoint resource e.g NotesApp.Create
 	Endpoint string `json:"endpoint"`
 }
 

app/crypto/rules_test.go

@@ -81,7 +81,7 @@ func TestVerify(t *testing.T) {
 			Error: ErrForbidden,
 		},
 		{
-			Name:     "CatchallServiceRuleMatch",
+			Name:     "CatchallAppRuleMatch",
 			Resource: srvResource,
 			Account:  &Account{},
 			Rules: []*Rule{
@@ -96,7 +96,7 @@ func TestVerify(t *testing.T) {
 			},
 		},
 		{
-			Name:     "CatchallServiceRuleNoMatch",
+			Name:     "CatchallAppRuleNoMatch",
 			Resource: srvResource,
 			Account:  &Account{},
 			Rules: []*Rule{

app/errors/errors.go

@@ -141,8 +141,8 @@ func BadGateway(id, format string, a ...interface{}) error {
 	}
 }
 
-// ServiceUnavailable generates a 503 error
-func ServiceUnavailable(id, format string, a ...interface{}) error {
+// AppUnavailable generates a 503 error
+func AppUnavailable(id, format string, a ...interface{}) error {
 	return &Error{
 		Id:     id,
 		Code:   503,

app/options.go

@@ -113,17 +113,17 @@ func Metadata(md map[string]string) Option {
 	}
 }
 
-// RegisterTTL specifies the TTL to use when registering the app
-func RegisterTTL(t time.Duration) Option {
+// AddTTL specifies the TTL to use when registering the app
+func AddTTL(t time.Duration) Option {
 	return func(o *Options) {
-		o.Server.Init(server.RegisterTTL(t))
+		o.Server.Init(server.AddTTL(t))
 	}
 }
 
-// RegisterInterval specifies the interval on which to re-register
-func RegisterInterval(t time.Duration) Option {
+// AddInterval specifies the interval on which to re-register
+func AddInterval(t time.Duration) Option {
 	return func(o *Options) {
-		o.Server.Init(server.RegisterInterval(t))
+		o.Server.Init(server.AddInterval(t))
 	}
 }
 

app/program.go

@@ -40,7 +40,7 @@ func (s *nitroProgram) Name(name string) {
 	)
 }
 
-// Init initialises options. Additionally it calls cmd.Init
+// Init initialises options. Registeritionally it calls cmd.Init
 // which parses command line flags. cmd.Init is only called
 // on first Init.
 func (s *nitroProgram) Init(opts ...Option) {