Merge 832f371 into f911853

.gitignore

@@ -30,3 +30,4 @@ test/.cached_binary_test_info.json
 examples/example-gateway/build/example-gateway
 .TMP_ZANZIBAR_TIMESTAMP_FILE.txt
 package-lock.json
+gomock_reflect_*

codegen/gateway.go

@@ -280,11 +280,7 @@ func ensureFields(config map[string]interface{}, mandatoryFields []string, yamlF
 }
 
 // NewEndpointSpec creates an endpoint spec from a yaml file.
-func NewEndpointSpec(
-	yamlFile string,
-	h *PackageHelper,
-	midSpecs map[string]*MiddlewareSpec,
-) (*EndpointSpec, error) {
+func NewEndpointSpec(yamlFile string, h *PackageHelper, midSpecs map[string]*MiddlewareSpec) (*EndpointSpec, error) {
 	_, err := os.Stat(yamlFile)
 	if err != nil {
 		return nil, errors.Wrapf(err, "Could not find file %s: ", yamlFile)
@@ -419,70 +415,13 @@ func NewEndpointSpec(
 		ClientMethod:         clientMethod,
 	}
 
-	defaultMidSpecs, err := getOrderedDefaultMiddlewareSpecs(
-		h.ConfigRoot(),
-		h.DefaultMiddlewareSpecs(),
-		endpointType.(string))
-	if err != nil {
-		return nil, errors.Wrap(
-			err, "error getting ordered default middleware specs",
-		)
-	}
-
-	return augmentEndpointSpec(espec, endpointConfigObj, midSpecs, defaultMidSpecs)
-}
+	defaultMidSpecs := h.DefaultMiddlewareSpecsOrdered()[endpointType.(string)]
 
-func getOrderedDefaultMiddlewareSpecs(
-	cfgDir string,
-	middlewareSpecs map[string]*MiddlewareSpec,
-	classType string,
-) ([]MiddlewareSpec, error) {
-	middlewareObj := map[string][]string{}
-
-	middlewareOrderingFile := filepath.Join(cfgDir, "middlewares/default.yaml")
-	if _, err := os.Stat(middlewareOrderingFile); os.IsNotExist(err) {
-		// Cannot find yaml file, use json file instead
-		middlewareOrderingFile = filepath.Join(cfgDir, "middlewares/default.json")
-		if _, err := os.Stat(middlewareOrderingFile); os.IsNotExist(err) {
-			// This file is not required so it is okay to skip
-			return nil, nil
-		}
-	}
-
-	bytes, err := ioutil.ReadFile(middlewareOrderingFile)
-	if err != nil {
-		return nil, errors.Wrapf(
-			err, "could not read default middleware ordering file: %s", middlewareOrderingFile,
-		)
-	}
-	err = yaml.Unmarshal(bytes, &middlewareObj)
+	espec, err = augmentEndpointSpec(espec, endpointConfigObj, midSpecs, defaultMidSpecs)
 	if err != nil {
-		return nil, errors.Wrapf(
-			err, "could not parse default middleware ordering file: %s", middlewareOrderingFile,
-		)
-	}
-	middlewareOrderingObj := middlewareObj[classType]
-
-	return sortByMiddlewareOrdering(middlewareOrderingObj, middlewareSpecs)
-}
-
-// sortByMiddlewareOrdering sorts middlewareSpecs using the ordering from middlewareOrderingObj
-func sortByMiddlewareOrdering(
-	middlewareOrderingObj []string,
-	middlewareSpecs map[string]*MiddlewareSpec,
-) ([]MiddlewareSpec, error) {
-	middlewares := make([]MiddlewareSpec, 0)
-
-	for _, middlewareName := range middlewareOrderingObj {
-		middlewareSpec, ok := middlewareSpecs[middlewareName]
-		if !ok {
-			return nil, errors.Errorf("could not find middleware %s", middlewareName)
-		}
-
-		middlewares = append(middlewares, *middlewareSpec)
+		return nil, err
 	}
-
-	return middlewares, nil
+	return espec, nil
 }
 
 func testFixtures(endpointConfigObj map[string]interface{}) (map[string]*EndpointTestFixture, error) {
@@ -925,6 +864,15 @@ func (e *EndpointSpec) SetDownstream(
 		return e.ModuleSpec.SetDownstream(e, h)
 	}
 
+	err := e.setMatchingClientSpec(clientModules)
+	if err != nil {
+		return err
+	}
+
+	return e.ModuleSpec.SetDownstream(e, h)
+}
+
+func (e *EndpointSpec) setMatchingClientSpec(clientModules []*ClientSpec) error {
 	var clientSpec *ClientSpec
 	for _, v := range clientModules {
 		if v.ClientID == e.ClientID {
@@ -942,8 +890,7 @@ func (e *EndpointSpec) SetDownstream(
 	}
 
 	e.ClientSpec = clientSpec
-
-	return e.ModuleSpec.SetDownstream(e, h)
+	return nil
 }
 
 // EndpointConfig represent the "config" field of endpoint-config.yaml