Layer generators error return type fix (#14526)

app/layer_generators/main.go

@@ -30,8 +30,13 @@ var (
 const (
 	OPEN_TRACING_PARAMS_MARKER = "@openTracingParams"
 	APP_ERROR_TYPE             = "*model.AppError"
+	ERROR_TYPE                 = "error"
 )
 
+func isError(typeName string) bool {
+	return strings.Contains(typeName, APP_ERROR_TYPE) || strings.Contains(typeName, ERROR_TYPE)
+}
+
 func init() {
 	flag.StringVar(&inputFile, "in", path.Join("..", "app_iface.go"), "App interface file")
 	flag.StringVar(&outputFile, "out", path.Join("..", "opentracing_layer.go"), "Output file")
@@ -199,7 +204,7 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		},
 		"errorToBoolean": func(results []string) string {
 			for i, typeName := range results {
-				if strings.Contains(typeName, APP_ERROR_TYPE) {
+				if isError(typeName) {
 					return fmt.Sprintf("resultVar%d == nil", i)
 				}
 			}
@@ -207,7 +212,7 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		},
 		"errorPresent": func(results []string) bool {
 			for _, typeName := range results {
-				if strings.Contains(typeName, APP_ERROR_TYPE) {
+				if isError(typeName) {
 					return true
 				}
 			}
@@ -215,7 +220,7 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		},
 		"errorVar": func(results []string) string {
 			for i, typeName := range results {
-				if strings.Contains(typeName, APP_ERROR_TYPE) {
+				if isError(typeName) {
 					return fmt.Sprintf("resultVar%d", i)
 				}
 			}