Move generated schemas into sub-folders

Author: Ron cohen

processor/error/schema.go renamed to processor/error/generated-schemas/payload.go

@@ -1,10 +1,6 @@
-package error
+package schemas
 
-func Schema() string {
-	return errorSchema
-}
-
-var errorSchema = `{
+const PayloadSchema = `{
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$id": "docs/spec/errors/payload.json",
     "title": "Errors payload",

processor/error/processor.go

@@ -4,6 +4,7 @@ import (
 	"github.com/santhosh-tekuri/jsonschema"
 
 	pr "github.com/elastic/apm-server/processor"
+	generatedschemas "github.com/elastic/apm-server/processor/error/generated-schemas"
 	"github.com/elastic/beats/libbeat/monitoring"
 )
 
@@ -20,7 +21,7 @@ const (
 	errorDocType  = "error"
 )
 
-var schema = pr.CreateSchema(errorSchema, processorName)
+var schema = pr.CreateSchema(generatedschemas.PayloadSchema, processorName)
 
 func NewProcessor() pr.Processor {
 	return &processor{schema: schema}

processor/sourcemap/schema.go renamed to processor/sourcemap/generated-schemas/payload.go

@@ -1,10 +1,6 @@
-package sourcemap
+package schemas
 
-func Schema() string {
-	return sourcemapSchema
-}
-
-var sourcemapSchema = `{
+const SourcemapSchema = `{
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$id": "docs/spec/sourcemaps/sourcemap-metadata.json",
     "title": "Sourcemap Metadata",

processor/sourcemap/processor.go

@@ -9,6 +9,7 @@ import (
 	parser "github.com/go-sourcemap/sourcemap"
 
 	pr "github.com/elastic/apm-server/processor"
+	generatedschemas "github.com/elastic/apm-server/processor/sourcemap/generated-schemas"
 	"github.com/elastic/apm-server/utility"
 	"github.com/elastic/beats/libbeat/monitoring"
 )
@@ -26,7 +27,7 @@ var (
 	decodingError          = monitoring.NewInt(sourcemapUploadMetrics, "decoding.errors")
 )
 
-var schema = pr.CreateSchema(sourcemapSchema, processorName)
+var schema = pr.CreateSchema(generatedschemas.SourcemapSchema, processorName)
 
 func NewProcessor() pr.Processor {
 	return &processor{schema: schema}

processor/transaction/schema.go renamed to processor/transaction/generated-schemas/payload.go

@@ -1,10 +1,6 @@
-package transaction
+package schemas
 
-func Schema() string {
-	return transactionSchema
-}
-
-var transactionSchema = `{
+const PayloadSchema = `{
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$id": "docs/spec/transactions/payload.json",
     "title": "Transactions payload",

processor/transaction/processor.go

@@ -2,6 +2,7 @@ package transaction
 
 import (
 	pr "github.com/elastic/apm-server/processor"
+	generatedschemas "github.com/elastic/apm-server/processor/transaction/generated-schemas"
 	"github.com/elastic/beats/libbeat/monitoring"
 
 	"github.com/santhosh-tekuri/jsonschema"
@@ -21,7 +22,7 @@ const (
 	spanDocType        = "span"
 )
 
-var schema = pr.CreateSchema(transactionSchema, processorName)
+var schema = pr.CreateSchema(generatedschemas.PayloadSchema, processorName)
 
 func NewProcessor() pr.Processor {
 	return &processor{schema: schema}

script/inline_schemas/inline_schemas.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
+	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -12,11 +14,11 @@ const basePath = "./docs/spec/"
 
 func main() {
 	schemaPaths := []struct {
-		path, schemaOut, goVariable, packageName string
+		path, schemaOut, goVariable string
 	}{
-		{"errors/payload.json", "processor/error/schema.go", "errorSchema", "error"},
-		{"transactions/payload.json", "processor/transaction/schema.go", "transactionSchema", "transaction"},
-		{"sourcemaps/payload.json", "processor/sourcemap/schema.go", "sourcemapSchema", "sourcemap"},
+		{"errors/payload.json", "processor/error/generated-schemas/payload.go", "PayloadSchema"},
+		{"transactions/payload.json", "processor/transaction/generated-schemas/payload.go", "PayloadSchema"},
+		{"sourcemaps/payload.json", "processor/sourcemap/generated-schemas/payload.go", "SourcemapSchema"},
 	}
 	for _, schemaInfo := range schemaPaths {
 		file := filepath.Join(filepath.Dir(basePath), schemaInfo.path)
@@ -30,8 +32,11 @@ func main() {
 			panic(err)
 		}
 
-		publicSchema := fmt.Sprintf("func Schema() string {\n\treturn %s\n}\n", schemaInfo.goVariable)
-		goScript := fmt.Sprintf("package %s\n\n%s\nvar %s = `%s`\n", schemaInfo.packageName, publicSchema, schemaInfo.goVariable, schema)
+		goScript := fmt.Sprintf("package schemas\n\nconst %s = `%s`\n", schemaInfo.goVariable, schema)
+		err = os.MkdirAll(path.Dir(schemaInfo.schemaOut), os.ModePerm)
+		if err != nil {
+			panic(err)
+		}
 		err = ioutil.WriteFile(schemaInfo.schemaOut, []byte(goScript), 0644)
 		if err != nil {
 			panic(err)