fixed app-layer generator, re-enabled struct2interface in make… (#14260)

* fixed app-layer generator, re-enabled struct2interface in makefile

app/layer_generators/main.go

@@ -100,11 +100,20 @@ func extractMethodMetadata(method *ast.Field, src []byte) methodData {
 			}
 		}
 	}
+
 	if e.Results != nil {
-		for _, result := range e.Results.List {
-			results = append(results, formatNode(src, result.Type))
+		for _, r := range e.Results.List {
+			typeStr := formatNode(src, r.Type)
+			if len(r.Names) > 0 {
+				for _, k := range r.Names {
+					results = append(results, fmt.Sprintf("%s %s", k.Name, typeStr))
+				}
+			} else {
+				results = append(results, typeStr)
+			}
 		}
 	}
+
 	for paramName := range paramsToTrace {
 		found := false
 		for _, param := range params {
@@ -179,12 +188,6 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 			return strings.Join(results, ", ")
 		},
 		"joinResultsForSignature": func(results []string) string {
-			switch len(results) {
-			case 0:
-				return ""
-			case 1:
-				return strings.Join(results, ", ")
-			}
 			return fmt.Sprintf("(%s)", strings.Join(results, ", "))
 		},
 		"genResultsVars": func(results []string) string {
@@ -196,7 +199,7 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		},
 		"errorToBoolean": func(results []string) string {
 			for i, typeName := range results {
-				if typeName == APP_ERROR_TYPE {
+				if strings.Contains(typeName, APP_ERROR_TYPE) {
 					return fmt.Sprintf("resultVar%d == nil", i)
 				}
 			}
@@ -204,7 +207,7 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		},
 		"errorPresent": func(results []string) bool {
 			for _, typeName := range results {
-				if typeName == "*model.AppError" {
+				if strings.Contains(typeName, APP_ERROR_TYPE) {
 					return true
 				}
 			}
@@ -212,7 +215,7 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		},
 		"errorVar": func(results []string) string {
 			for i, typeName := range results {
-				if typeName == "*model.AppError" {
+				if strings.Contains(typeName, APP_ERROR_TYPE) {
 					return fmt.Sprintf("resultVar%d", i)
 				}
 			}