Revert "Add tchannel middlewares (#401)"

This reverts commit f84768c.

codegen/gateway.go

@@ -564,7 +564,10 @@ func NewEndpointSpec(
 		ClientMethod:       clientMethod,
 	}
 
-	return augmentEndpointSpec(espec, endpointConfigObj, midSpecs)
+	if endpointType == "tchannel" {
+		return espec, nil
+	}
+	return augmentHTTPEndpointSpec(espec, endpointConfigObj, midSpecs)
 }
 
 func testFixtures(endpointConfigObj map[string]interface{}) (map[string]*EndpointTestFixture, error) {
@@ -742,11 +745,17 @@ func resolveHeaderModels(ms *ModuleSpec, modelPath string) (map[string]*TypedHea
 	}
 }
 
-func augmentEndpointSpec(
+func augmentHTTPEndpointSpec(
 	espec *EndpointSpec,
 	endpointConfigObj map[string]interface{},
 	midSpecs map[string]*MiddlewareSpec,
 ) (*EndpointSpec, error) {
+	testFixtures, err := testFixtures(endpointConfigObj)
+	if err != nil {
+		return nil, errors.Wrap(err, "Unable to parse test cases")
+	}
+	espec.TestFixtures = testFixtures
+
 	endpointMids, ok := endpointConfigObj["middlewares"].([]interface{})
 	if !ok {
 		return nil, errors.Errorf(
@@ -847,22 +856,15 @@ func augmentEndpointSpec(
 	}
 
 	espec.Middlewares = middlewares
-	if "http" == endpointConfigObj["endpointType"] {
-		testFixtures, err := testFixtures(endpointConfigObj)
-		if err != nil {
-			return nil, errors.Wrap(err, "Unable to parse test cases")
-		}
-		espec.TestFixtures = testFixtures
 
-		// augment request headers
-		if err := resolveHeaders(espec, endpointConfigObj, reqHeaders); err != nil {
-			return nil, err
-		}
+	// augment request headers
+	if err := resolveHeaders(espec, endpointConfigObj, reqHeaders); err != nil {
+		return nil, err
+	}
 
-		// augment response headers
-		if err := resolveHeaders(espec, endpointConfigObj, resHeaders); err != nil {
-			return nil, err
-		}
+	// augment response headers
+	if err := resolveHeaders(espec, endpointConfigObj, resHeaders); err != nil {
+		return nil, err
 	}
 
 	return espec, nil

codegen/module_system.go

@@ -295,17 +295,7 @@ func NewDefaultModuleSystem(
 		)
 	}
 
-	if err := system.RegisterClassType("middleware", "http", &MiddlewareGenerator{
-		templates:     tmpl,
-		packageHelper: h,
-	}); err != nil {
-		return nil, errors.Wrapf(
-			err,
-			"Error registering Gateway middleware class type",
-		)
-	}
-
-	if err := system.RegisterClassType("middleware", "tchannel", &MiddlewareGenerator{
+	if err := system.RegisterClassType("middleware", "default", &MiddlewareGenerator{
 		templates:     tmpl,
 		packageHelper: h,
 	}); err != nil {
@@ -1197,16 +1187,10 @@ func (g *MiddlewareGenerator) Generate(
 }
 
 func (g *MiddlewareGenerator) generateMiddlewareFile(instance *ModuleInstance, out map[string][]byte) error {
-	templateName := "middleware_http.tmpl"
-	if instance.ClassType == "tchannel" {
-		templateName = "middleware_tchannel.tmpl"
-	}
-
-	bytes, err := g.templates.ExecTemplate(templateName, instance, g.packageHelper)
+	bytes, err := g.templates.ExecTemplate("middleware.tmpl", instance, g.packageHelper)
 	if err != nil {
 		return err
 	}
-
 	out[instance.InstanceName+".go"] = bytes
 	return nil
 }

codegen/templates/tchannel_endpoint.tmpl

@@ -3,7 +3,6 @@
 {{- $spec := .Spec }}
 package {{$instance.PackageInfo.PackageName}}
 
-{{- $middlewares := .Spec.Middlewares }}
 import (
 	"context"
 
@@ -16,12 +15,6 @@ import (
 	{{$pkg.AliasName}} "{{$pkg.PackageName}}"
 	{{end -}}
 
-	{{- if len $middlewares | ne 0 }}
-	{{- range $idx, $middleware := $middlewares }}
-	{{$middleware.Name}} "{{$middleware.ImportPath}}"
-	{{- end}}
-	{{- end}}
-
 	module "{{$instance.PackageInfo.ModulePackagePath}}"
 )
 
@@ -40,21 +33,7 @@ func New{{$handlerName}}(deps *module.Dependencies) *{{$handlerName}} {
 	handler.endpoint = zanzibar.NewTChannelEndpoint(
 		deps.Default.Logger, deps.Default.Scope,
 		"{{$spec.EndpointID}}", "{{$spec.HandleID}}", "{{.ThriftService}}::{{.Name}}",
-		{{ if len $middlewares | ne 0 -}}
-			zanzibar.NewTchannelStack([]zanzibar.MiddlewareTchannelHandle{
-			{{range $idx, $middleware := $middlewares -}}
-				deps.Middleware.{{$middleware.Name | pascal}}.NewMiddlewareHandle(
-					{{$middleware.Name}}.Options{
-					{{range $key, $value := $middleware.PrettyOptions -}}
-						{{$key}} : {{$value}},
-					{{end -}}
-					},
-				),
-			{{end -}}
-			}, handler),
-		{{- else -}}
-			handler,
-		{{- end}}
+		handler,
 	)
 	return handler
 }