mixin: use config package to generate config

This patch removes the hardcoded config inside mixin and uses config
package to generate the default builder.conf

It also renames the global variable `config` to `configFile` to avoid
conflic with the config package.

Signed-off-by: Rodrigo Chiossi <rodrigo.chiossi@intel.com>

mixin/helpers.go

@@ -23,6 +23,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/clearlinux/mixer-tools/config"
 	"github.com/clearlinux/mixer-tools/helpers"
 	"github.com/clearlinux/mixer-tools/swupd"
 
@@ -103,9 +104,13 @@ func setUpMixDir(upstreamVer, mixVer int) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(filepath.Join(mixWS, "builder.conf"),
-		[]byte(builderConf), 0644)
-	if err != nil {
+	config.UseNewConfig = true
+	var c config.MixConfig
+	c.LoadDefaultsForPath(true, "/usr/share/mix")
+	c.Swupd.Bundle = "os-core"
+	c.Swupd.ContentURL = "file:///usr/share/mix/update/www"
+	c.Swupd.VersionURL = "file:///usr/share/mix/update/www"
+	if err = c.SaveConfig(filepath.Join(mixWS, "builder.conf")); err != nil {
 		return err
 	}
 	err = ioutil.WriteFile(filepath.Join(mixWS, "mixversion"),
@@ -146,10 +151,10 @@ func parseHeaderNoopInstall(pkg, installOut string) (string, error) {
 	return "", errors.New("unable to find repo for package")
 }
 
-func getPackageRepo(pkg string, ver int, config string) (string, error) {
+func getPackageRepo(pkg string, ver int, configFile string) (string, error) {
 	packagerCmd := []string{
 		"dnf",
-		"--config=" + config,
+		"--config=" + configFile,
 		fmt.Sprintf("--releasever=%d", ver),
 		"install",
 		"--assumeno",

mixin/main.go

@@ -15,26 +15,7 @@
 package main
 
 var mixWS = "/usr/share/mix"
-var config = "/usr/share/mix/builder.conf"
-
-const builderConf = `[Mixer]
-LOCAL_BUNDLE_DIR = /usr/share/mix/local-bundles
-
-[Builder]
-SERVER_STATE_DIR = /usr/share/mix/update
-BUNDLE_DIR = /usr/share/mix/local-bundles
-YUM_CONF = /usr/share/mix/.yum-mix.conf
-CERT = /usr/share/mix/Swupd_Root.pem
-VERSIONS_PATH =/usr/share/mix
-LOCAL_RPM_DIR = /usr/share/mix/local-rpms
-LOCAL_REPO_DIR = /usr/share/mix/local
-
-[swupd]
-BUNDLE=os-core
-CONTENTURL=file:///usr/share/mix/update/www
-VERSIONURL=file:///usr/share/mix/update/www
-FORMAT=1
-`
+var configFile = "/usr/share/mix/builder.conf"
 
 func main() {
 	Execute()

mixin/package.go

@@ -63,7 +63,7 @@ var packageAddFlags packageAddCmdFlags
 func init() {
 	for _, cmd := range packageCmds {
 		packageCmd.AddCommand(cmd)
-		cmd.Flags().StringVarP(&config, "config", "c", "/usr/share/mix/builder.conf", "Builder config to use")
+		cmd.Flags().StringVarP(&configFile, "config", "c", "/usr/share/mix/builder.conf", "Builder config to use")
 	}
 
 	addPackageCmd.Flags().BoolVar(&packageAddFlags.build, "build", false, "Build mix update after adding package to bundle")

mixin/repo.go

@@ -97,7 +97,7 @@ func repoPrep() error {
 func init() {
 	for _, cmd := range repoCmds {
 		repoCmd.AddCommand(cmd)
-		cmd.Flags().StringVarP(&config, "config", "c", "/usr/share/mix/builder.conf", "Builder config to use")
+		cmd.Flags().StringVarP(&configFile, "config", "c", "/usr/share/mix/builder.conf", "Builder config to use")
 	}
 
 	RootCmd.AddCommand(repoCmd)
@@ -108,7 +108,7 @@ func runAddRepo(cmd *cobra.Command, args []string) {
 	if err != nil {
 		fail(err)
 	}
-	b, err := builder.NewFromConfig(config)
+	b, err := builder.NewFromConfig(configFile)
 	if err != nil {
 		fail(err)
 	}
@@ -130,7 +130,7 @@ func runRemoveRepo(cmd *cobra.Command, args []string) {
 	if err != nil {
 		fail(err)
 	}
-	b, err := builder.NewFromConfig(config)
+	b, err := builder.NewFromConfig(configFile)
 	if err != nil {
 		fail(err)
 	}
@@ -152,7 +152,7 @@ func runListRepos(cmd *cobra.Command, args []string) {
 	if err != nil {
 		fail(err)
 	}
-	b, err := builder.NewFromConfig(config)
+	b, err := builder.NewFromConfig(configFile)
 	if err != nil {
 		fail(err)
 	}
@@ -173,7 +173,7 @@ func runInitRepo(cmd *cobra.Command, args []string) {
 	if err != nil {
 		fail(err)
 	}
-	b, err := builder.NewFromConfig(config)
+	b, err := builder.NewFromConfig(configFile)
 	if err != nil {
 		fail(err)
 	}
@@ -205,7 +205,7 @@ func runSetURLRepo(cmd *cobra.Command, args []string) {
 		fail(err)
 	}
 
-	b, err := builder.NewFromConfig(config)
+	b, err := builder.NewFromConfig(configFile)
 	if err != nil {
 		fail(err)
 	}