From 2ad0221259087883c62c97ef33ee02d2ec3caeea Mon Sep 17 00:00:00 2001
From: Marvin Steadfast <marvin@xsteadfastx.org>
Date: Fri, 16 Apr 2021 15:02:34 +0200
Subject: [PATCH] prepare: embed fs of files instead of own objects

---
 assets/assets.go       | 31 ++++++--------------------
 pkg/prepare/prepare.go | 49 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/assets/assets.go b/assets/assets.go
index cab96bd..db340b7 100644
--- a/assets/assets.go
+++ b/assets/assets.go
@@ -1,27 +1,10 @@
-//nolint:gochecknoglobals,golint,stylecheck,godox
+//nolint:gochecknoglobals,golint,stylecheck
 package assets
 
-import _ "embed"
+import (
+	"embed"
+)
 
-// TODO: Using embed.FS
-
-//go:embed templates/schnutibox.yml.tmpl
-var SchnutiboxConfig string
-
-//go:embed files/schnutibox.service
-var SchnutiboxService []byte
-
-//go:embed templates/fstab.raspbian.tmpl
-var FstabRaspbianTemplate string
-
-//go:embed templates/mopidy.conf.tmpl
-var MopidyConf string
-
-//go:embed files/upmpdcli.conf
-var UpmpdcliConf []byte
-
-//go:embed files/ntp.service
-var NtpService []byte
-
-//go:embed templates/50-neuftech.rules.tmpl
-var UDEVRules string
+//go:embed templates/*
+//go:embed files/*
+var Assets embed.FS
diff --git a/pkg/prepare/prepare.go b/pkg/prepare/prepare.go
index af2d918..00ed79a 100644
--- a/pkg/prepare/prepare.go
+++ b/pkg/prepare/prepare.go
@@ -54,8 +54,13 @@ func BoxService(filename string, enable bool) error {
 		return fmt.Errorf("could not create config dir: %w", err)
 	}
 
+	schnutiboxService, err := assets.Assets.ReadFile("files/schnutibox.service")
+	if err != nil {
+		return fmt.Errorf("could not get service file: %w", err)
+	}
+
 	//nolint:gosec
-	if err := ioutil.WriteFile(filename, assets.SchnutiboxService, 0o644); err != nil {
+	if err := ioutil.WriteFile(filename, schnutiboxService, 0o644); err != nil {
 		return fmt.Errorf("could not write service file: %w", err)
 	}
 
@@ -91,8 +96,13 @@ func NTP() error {
 		return fmt.Errorf("could not install ntp: %w", err)
 	}
 
+	ntpService, err := assets.Assets.ReadFile("files/ntp.service")
+	if err != nil {
+		return fmt.Errorf("could not get ntp service file: %w", err)
+	}
+
 	// nolint:gosec
-	if err := ioutil.WriteFile("/etc/systemd/system/ntp.service", assets.NtpService, 0o644); err != nil {
+	if err := ioutil.WriteFile("/etc/systemd/system/ntp.service", ntpService, 0o644); err != nil {
 		return fmt.Errorf("could not copy ntp service file: %w", err)
 	}
 
@@ -155,10 +165,13 @@ func Fstab(system string) error {
 
 	// Chose the right template.
 	// In future it should be a switch statement.
-	tmpl := assets.FstabRaspbianTemplate
+	tmpl, err := assets.Assets.ReadFile("templates/fstab.raspbian.tmpl")
+	if err != nil {
+		return fmt.Errorf("could not get fstab template: %w", err)
+	}
 
 	// Parse template.
-	t := template.Must(template.New("fstab").Parse(tmpl))
+	t := template.Must(template.New("fstab").Parse(string(tmpl)))
 
 	// Open fstab.
 	f, err := os.Create("/etc/fstab")
@@ -232,7 +245,12 @@ func CreateUDEVrules() error {
 	logger.Info().Msg("writing udev rule file")
 
 	// Parse template.
-	t := template.Must(template.New("udev").Parse(assets.UDEVRules))
+	tmpl, err := assets.Assets.ReadFile("templates/50-neuftech.rules.tmpl")
+	if err != nil {
+		return fmt.Errorf("could not get udev rules file: %w", err)
+	}
+
+	t := template.Must(template.New("udev").Parse(string(tmpl)))
 
 	// Open file.
 	f, err := os.Create("/etc/udev/rules.d/50-neuftech.rules")
@@ -461,7 +479,12 @@ func Mopidy() error {
 		Cfg.Spotify = true
 	}
 
-	t := template.Must(template.New("mopidyConf").Parse(assets.MopidyConf))
+	tmpl, err := assets.Assets.ReadFile("templates/mopidy.conf.tmpl")
+	if err != nil {
+		return fmt.Errorf("could not get mopidy.conf: %w", err)
+	}
+
+	t := template.Must(template.New("mopidyConf").Parse(string(tmpl)))
 
 	f, err := os.Create("/etc/mopidy/mopidy.conf")
 	if err != nil {
@@ -548,8 +571,13 @@ func Upmpdcli() error {
 	}
 
 	// Create config.
+	upmpdcliConf, err := assets.Assets.ReadFile("files/upmpdcli.conf")
+	if err != nil {
+		return fmt.Errorf("could not get upmpdcli.conf: %w", err)
+	}
+
 	// nolint:gosec
-	if err := ioutil.WriteFile("/etc/upmpdcli.conf", assets.UpmpdcliConf, 0o644); err != nil {
+	if err := ioutil.WriteFile("/etc/upmpdcli.conf", upmpdcliConf, 0o644); err != nil {
 		return fmt.Errorf("could not copy upmpdcli config: %w", err)
 	}
 
@@ -561,7 +589,12 @@ func SchnutiboxConfig() error {
 	logger.Info().Msg("writing schnutibox config")
 
 	// Parse template.
-	t := template.Must(template.New("config").Parse(assets.SchnutiboxConfig))
+	tmpl, err := assets.Assets.ReadFile("templates/schnutibox.yml.tmpl")
+	if err != nil {
+		return fmt.Errorf("could not get template: %w", err)
+	}
+
+	t := template.Must(template.New("config").Parse(string(tmpl)))
 
 	// Open file.
 	f, err := os.Create("/etc/schnutibox/schnutibox.yml")