Merge 0314c85 into 0151745

uber · Mar 28, 2017 · 61a60a5 · 61a60a5
2 parents 0151745 + 0314c85
commit 61a60a5
Show file tree

Hide file tree

Showing 19 changed files with 87 additions and 89 deletions.
diff --git a/benchmarks/benchserver/main.go b/benchmarks/benchserver/main.go
@@ -32,7 +32,7 @@ var PORT int32 = 8092
 
 func main() {
 	logger := zap.New(zap.NewJSONEncoder())
-	backend := testBackend.CreateBackend(PORT)
+	backend := testBackend.CreateHTTPBackend(PORT)
 	err := backend.Bootstrap()
 	if err != nil {
 		panic(err)

diff --git a/codegen/templates/endpoint_test.tmpl b/codegen/templates/endpoint_test.tmpl
@@ -31,7 +31,7 @@ func Test{{.HandlerID | Title}}{{.TestName | Title}}OKResponse(t *testing.T) {
 	var counter int
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"{{$clientName | camel}}"},
+		KnownHTTPBackends: []string{"{{$clientName | camel}}"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "main.go",
 		),
@@ -51,7 +51,7 @@ func Test{{.HandlerID | Title}}{{.TestName | Title}}OKResponse(t *testing.T) {
 		counter++
 	}
 
-	gateway.Backends()["{{$clientName | camel}}"].HandleFunc(
+	gateway.HTTPBackends()["{{$clientName | camel}}"].HandleFunc(
 		"{{$clientMethod.HTTPMethod}}", "{{$clientMethod.HTTPPath}}", fake{{.ClientMethod | Title}},
 	)
 

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_argnotstruct_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_argnotstruct_test.gogen
@@ -17,7 +17,7 @@ func TestArgNotStructSuccessfulRequestOKResponse(t *testing.T) {
 	var counter int
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"bar"},
+		KnownHTTPBackends: []string{"bar"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "main.go",
 		),
@@ -36,7 +36,7 @@ func TestArgNotStructSuccessfulRequestOKResponse(t *testing.T) {
 		counter++
 	}
 
-	gateway.Backends()["bar"].HandleFunc(
+	gateway.HTTPBackends()["bar"].HandleFunc(
 		"POST", "/arg-not-struct-path", fakeArgNotStruct,
 	)
 

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_missingarg_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_missingarg_test.gogen
@@ -17,7 +17,7 @@ func TestMissingArgSuccessfulRequestOKResponse(t *testing.T) {
 	var counter int
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"bar"},
+		KnownHTTPBackends: []string{"bar"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "main.go",
 		),
@@ -36,7 +36,7 @@ func TestMissingArgSuccessfulRequestOKResponse(t *testing.T) {
 		counter++
 	}
 
-	gateway.Backends()["bar"].HandleFunc(
+	gateway.HTTPBackends()["bar"].HandleFunc(
 		"GET", "/missing-arg-path", fakeMissingArg,
 	)
 

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_norequest_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_norequest_test.gogen
@@ -17,7 +17,7 @@ func TestNoRequestSuccessfulRequestOKResponse(t *testing.T) {
 	var counter int
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"bar"},
+		KnownHTTPBackends: []string{"bar"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "main.go",
 		),
@@ -36,7 +36,7 @@ func TestNoRequestSuccessfulRequestOKResponse(t *testing.T) {
 		counter++
 	}
 
-	gateway.Backends()["bar"].HandleFunc(
+	gateway.HTTPBackends()["bar"].HandleFunc(
 		"GET", "/no-request-path", fakeNoRequest,
 	)
 

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_normal_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_normal_test.gogen
@@ -17,7 +17,7 @@ func TestNormalSuccessfulRequestOKResponse(t *testing.T) {
 	var counter int
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"bar"},
+		KnownHTTPBackends: []string{"bar"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "main.go",
 		),
@@ -36,7 +36,7 @@ func TestNormalSuccessfulRequestOKResponse(t *testing.T) {
 		counter++
 	}
 
-	gateway.Backends()["bar"].HandleFunc(
+	gateway.HTTPBackends()["bar"].HandleFunc(
 		"POST", "/bar-path", fakeNormal,
 	)
 

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_toomanyargs_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_toomanyargs_test.gogen
@@ -17,7 +17,7 @@ func TestTooManyArgsSuccessfulRequestOKResponse(t *testing.T) {
 	var counter int
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"bar"},
+		KnownHTTPBackends: []string{"bar"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "main.go",
 		),
@@ -36,7 +36,7 @@ func TestTooManyArgsSuccessfulRequestOKResponse(t *testing.T) {
 		counter++
 	}
 
-	gateway.Backends()["bar"].HandleFunc(
+	gateway.HTTPBackends()["bar"].HandleFunc(
 		"POST", "/too-many-args-path", fakeTooManyArgs,
 	)
 

diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct_test.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct_test.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_missingarg_test.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_missingarg_test.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_norequest_test.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_norequest_test.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal_test.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal_test.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs_test.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs_test.go
diff --git a/...ample-gateway/build/endpoints/googlenow/googlenow_googlenow_method_addcredentials_test.go b/...ample-gateway/build/endpoints/googlenow/googlenow_googlenow_method_addcredentials_test.go
diff --git a/...ple-gateway/build/endpoints/googlenow/googlenow_googlenow_method_checkcredentials_test.go b/...ple-gateway/build/endpoints/googlenow/googlenow_googlenow_method_checkcredentials_test.go
diff --git a/test/endpoints/contacts/save-contacts_test.go b/test/endpoints/contacts/save-contacts_test.go
@@ -38,14 +38,14 @@ var benchBytes = []byte("{\"contacts\":[{\"fragments\":[{\"type\":\"message\",\"
 
 func BenchmarkSaveContacts(b *testing.B) {
 	gateway, err := benchGateway.CreateGateway(nil, &testGateway.Options{
-		KnownBackends: []string{"contacts"},
+		KnownHTTPBackends: []string{"contacts"},
 	})
 	if err != nil {
 		b.Error("got bootstrap err: " + err.Error())
 		return
 	}
 
-	gateway.Backends()["contacts"].HandleFunc(
+	gateway.HTTPBackends()["contacts"].HandleFunc(
 		"POST", "/foo/contacts", func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(202)
 			_, _ = w.Write([]byte("{}"))
@@ -94,7 +94,7 @@ func TestSaveContactsCall(t *testing.T) {
 	var counter int = 0
 
 	gateway, err := testGateway.CreateGateway(t, nil, &testGateway.Options{
-		KnownBackends: []string{"contacts"},
+		KnownHTTPBackends: []string{"contacts"},
 		TestBinary: filepath.Join(
 			getDirName(), "..", "..", "..",
 			"examples", "example-gateway", "build", "main.go",
@@ -105,7 +105,7 @@ func TestSaveContactsCall(t *testing.T) {
 	}
 	defer gateway.Close()
 
-	gateway.Backends()["contacts"].HandleFunc(
+	gateway.HTTPBackends()["contacts"].HandleFunc(
 		"POST", "/foo/contacts", func(w http.ResponseWriter, r *http.Request) {
 			counter++
 			w.WriteHeader(202)