code fix to accomodate zanzibar user who has a different downstream c…

…onverter
uber · Apr 21, 2020 · cc4c7c5 · cc4c7c5
1 parent 54248f4
commit cc4c7c5
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 33 deletions.
diff --git a/codegen/gateway.go b/codegen/gateway.go
@@ -280,8 +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,
-	clientSpecs []*ClientSpec) (*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)
@@ -422,12 +421,6 @@ func NewEndpointSpec(yamlFile string, h *PackageHelper, midSpecs map[string]*Mid
 	if err != nil {
 		return nil, err
 	}
-	err = espec.SetDownstream(clientSpecs, h)
-	if err != nil {
-		return nil, errors.Wrapf(
-			err, "Error parsing downstream info for endpoint: %s", yamlFile,
-		)
-	}
 	return espec, nil
 }
 

diff --git a/codegen/module_system.go b/codegen/module_system.go
@@ -1013,11 +1013,21 @@ func (g *EndpointGenerator) ComputeSpec(
 	for _, yamlFile := range endpointYamls {
 		go func(yamlFile string) {
 			defer wg.Done()
-			espec, err := NewEndpointSpec(yamlFile, g.packageHelper, g.packageHelper.MiddlewareSpecs(), clientSpecs)
+			espec, err := NewEndpointSpec(yamlFile, g.packageHelper, g.packageHelper.MiddlewareSpecs())
 			if err != nil {
 				err = errors.Wrapf(
 					err, "Error creating endpoint spec for endpoint: %s", yamlFile,
 				)
+				ch <- endpointSpecRes{err: err}
+				return
+			}
+			err = espec.SetDownstream(clientSpecs, g.packageHelper)
+			if err != nil {
+				err = errors.Wrapf(
+					err, "Error parsing downstream info for endpoint: %s", yamlFile,
+				)
+				ch <- endpointSpecRes{err: err}
+				return
 			}
 			ch <- endpointSpecRes{espec: espec, err: err}
 		}(yamlFile)
@@ -1269,19 +1279,6 @@ func (g *EndpointGenerator) generateEndpointFile(e *EndpointSpec, instance *Modu
 		DeputyReqHeader:        g.packageHelper.DeputyReqHeader(),
 	}
 
-	var endpoint []byte
-	if e.EndpointType == "http" {
-		endpoint, err = g.templates.ExecTemplate("endpoint.tmpl", meta, g.packageHelper)
-	} else if e.EndpointType == "tchannel" {
-		endpoint, err = g.templates.ExecTemplate("tchannel_endpoint.tmpl", meta, g.packageHelper)
-	} else {
-		err = errors.Errorf("Endpoint type '%s' is not supported", e.EndpointType)
-	}
-
-	if err != nil {
-		return nil, errors.Wrap(err, "Error executing endpoint template")
-	}
-
 	targetPath := e.TargetEndpointPath(thriftServiceName, method.Name)
 	if e.EndpointType == "tchannel" {
 		targetPath = strings.TrimSuffix(targetPath, ".go") + "_tchannel.go"
@@ -1291,20 +1288,50 @@ func (g *EndpointGenerator) generateEndpointFile(e *EndpointSpec, instance *Modu
 		endpointFilePath = targetPath
 	}
 
-	out.Store(endpointFilePath, endpoint)
+	var wg sync.WaitGroup
+	goRoutineCount := 2
+	wg.Add(goRoutineCount)
+	ch := make(chan error, goRoutineCount)
+	go func() {
+		defer wg.Done()
+		var endpoint []byte
+		if e.EndpointType == "http" {
+			endpoint, err = g.templates.ExecTemplate("endpoint.tmpl", meta, g.packageHelper)
+		} else if e.EndpointType == "tchannel" {
+			endpoint, err = g.templates.ExecTemplate("tchannel_endpoint.tmpl", meta, g.packageHelper)
+		} else {
+			err = errors.Errorf("Endpoint type '%s' is not supported", e.EndpointType)
+		}
+		if err != nil {
+			ch <- errors.Wrap(err, "Error executing endpoint template")
+			return
+		}
+		out.Store(endpointFilePath, endpoint)
+	}()
 
-	tmpl := ""
-	if e.IsClientlessEndpoint {
-		tmpl = "clientless-workflow.tmpl"
-	} else {
-		tmpl = "workflow.tmpl"
-	}
+	go func() {
+		defer wg.Done()
+		var tmpl string
+		if e.IsClientlessEndpoint {
+			tmpl = "clientless-workflow.tmpl"
+		} else {
+			tmpl = "workflow.tmpl"
+		}
+		workflow, err := g.templates.ExecTemplate(tmpl, meta, g.packageHelper)
+		if err != nil {
+			ch <- errors.Wrap(err, "Error executing workflow template")
+		}
+		out.Store("workflow/"+endpointFilePath, workflow)
+	}()
 
-	workflow, err := g.templates.ExecTemplate(tmpl, meta, g.packageHelper)
-	if err != nil {
-		return nil, errors.Wrap(err, "Error executing workflow template")
+	go func() {
+		wg.Wait()
+		close(ch)
+	}()
+
+	for err := range ch {
+		return nil, err
 	}
-	out.Store("workflow/"+endpointFilePath, workflow)
 
 	return meta, nil
 }