Improve and simplify generation of fields

dev-tools/cmd/asset/asset.go

@@ -21,13 +21,10 @@ package main
 
 import (
 	"bufio"
-	"bytes"
 	"flag"
 	"fmt"
-	"go/format"
 	"io/ioutil"
 	"os"
-	"strings"
 
 	"github.com/elastic/beats/libbeat/asset"
 	"github.com/elastic/beats/licenses"
@@ -84,33 +81,16 @@ func main() {
 		}
 	}
 
-	// Depending on OS or tools configuration, files can contain carriages (\r),
-	// what leads to different results, remove them before encoding.
-	encData, err := asset.EncodeData(strings.Replace(string(data), "\r", "", -1))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error encoding the data: %s\n", err)
-		os.Exit(1)
-	}
-
 	licenseHeader, err := licenses.Find(license)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Invalid license: %s\n", err)
 		os.Exit(1)
 	}
-	var buf bytes.Buffer
 	if name == "" {
 		name = file
 	}
-	asset.Template.Execute(&buf, asset.Data{
-		Beat:     beatName,
-		Name:     name,
-		Priority: priority,
-		Data:     encData,
-		License:  licenseHeader,
-		Package:  pkg,
-	})
 
-	bs, err := format.Source(buf.Bytes())
+	bs, err := asset.CreateAsset(licenseHeader, beatName, name, pkg, data, priority, file)
 	if err != nil {
 		panic(err)
 	}

dev-tools/cmd/module_fields/module_fields.go

@@ -18,10 +18,8 @@
 package main
 
 import (
-	"bytes"
 	"flag"
 	"fmt"
-	"go/format"
 	"io/ioutil"
 	"log"
 	"os"
@@ -88,25 +86,10 @@ func main() {
 
 		data, err := fields.GenerateFieldsYml(files)
 		if err != nil {
-			log.Fatalf("Error fetching files for module %v: %v", module, err)
-		}
-
-		encData, err := asset.EncodeData(string(data))
-		if err != nil {
-			log.Fatalf("Error encoding the data: %v", err)
+			log.Fatalf("error fetching files for package %v: %v", module, err)
 		}
 
-		var buf bytes.Buffer
-		asset.Template.Execute(&buf, asset.Data{
-			License:  license,
-			Beat:     beatName,
-			Name:     module,
-			Data:     encData,
-			Priority: "asset.ModuleFieldsPri",
-			Package:  module,
-		})
-
-		bs, err := format.Source(buf.Bytes())
+		bs, err := asset.CreateAsset(license, beatName, module, module, data, "asset.ModuleFieldsPri", dir+"/"+module)
 		if err != nil {
 			log.Fatalf("Error creating golang file from template: %v", err)
 		}

dev-tools/mage/fields.go

@@ -101,7 +101,7 @@ func GenerateModuleFieldsGo(moduleDir string) error {
 		filepath.Join(beatsDir, moduleFieldsCmdPath),
 		"-beat", BeatName,
 		"-license", toLibbeatLicenseName(BeatLicense),
-		filepath.Join(CWD(), moduleDir),
+		filepath.Join(moduleDir),
 	)
 
 	return moduleFieldsCmd()