Create remote on need

Author: clarsonneur

cmds/checkcmd/check.go

@@ -35,9 +35,12 @@ const (
 func (c *Check) Action([]string) {
 	c.config = core.NewConfig("release-mgt.yaml")
 
+	_, err := c.config.Load()
+	kingpin.FatalIfError(err, "Unable to load %s properly.", c.config.Filename())
+
 	c.github = core.NewGithub()
 
-	err := c.github.CheckGithub()
+	err = c.github.CheckGithub()
 	kingpin.FatalIfError(err, "Unable to get github-release")
 
 	c.git = core.NewGit()

cmds/statecmd/state.go

@@ -33,10 +33,13 @@ const (
 // Action execute the `check` command
 func (c *State) Action([]string) {
 	c.config = core.NewConfig("release-mgt.yaml")
+	
+	_, err := c.config.Load()
+	kingpin.FatalIfError(err, "Unable to load %s properly.", c.config.Filename())
 
 	c.github = core.NewGithub()
 
-	err := c.github.CheckGithub()
+	err = c.github.CheckGithub()
 	kingpin.FatalIfError(err, "Unable to get github-release")
 
 	c.git = core.NewGit()

cmds/tagcmd/tag.go

@@ -40,9 +40,12 @@ const (
 func (c *Tag) Action([]string) {
 	c.config = core.NewConfig("release-mgt.yaml")
 
+	_, err := c.config.Load()
+	kingpin.FatalIfError(err, "Unable to load %s properly.", c.config.Filename())
+
 	c.github = core.NewGithub()
 
-	err := c.github.CheckGithub()
+	err = c.github.CheckGithub()
 	kingpin.FatalIfError(err, "Unable to get github-release")
 
 	c.git = core.NewGit()
@@ -79,24 +82,18 @@ func (c *Tag) Action([]string) {
 		os.Exit(1)
 	}
 
+	c.git.SetRemote(c.config.Yaml.Upstream.Name, c.config.Yaml.Upstream.Protocol, c.config.Yaml.Upstream.Server, c.config.Yaml.Upstream.RepoPath)
+
+
 	// Check remote. Create it if missing.
-	options := make(map[string]string)
-	if *c.user != "" {
-		options["username"] = *c.user
-	}
-	if *c.pass != "" {
-		options["password"] = *c.pass
-	}
-	if *c.remoteName != "" {
-		options["remote-name"] = *c.remoteName
-	}
-	if *c.removeRemote {
-		options["auto-remove-remote"] = "true"
-	}
+	options := make(core.GitRemoteConfig)
+
+	options.Set("username", *c.user)
+	options.Set("password", *c.pass)
+	options.SetIfNotContains("remote-name", *c.remoteName, "ci-upstream")
+	options.SetIf("auto-remove-remote", "false", !*c.removeRemote)
+	options.Set("protocol", *c.proto)
 
-	if *c.proto != "" {
-		options["protocol"] = *c.proto
-	}
 	if err = c.git.CreateRemote(options); err != nil {
 		fmt.Printf("%s\n", err)
 		os.Exit(1)

core/config.go

@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/forj-oss/forjj-modules/trace"
 	"gopkg.in/yaml.v2"
 )
 
 // Config is the top Configuration object.
 type Config struct {
-	yaml yamlConfig
+	Yaml YamlConfig
 	file string
 }
 
@@ -22,27 +23,39 @@ func NewConfig(file string) (ret *Config) {
 	return
 }
 
+// Filename return the configuration file name.
+func (c Config) Filename() string {
+	return c.file
+}
+
 // Load the configuration file
-func (c *Config) Load() (err error) {
+func (c *Config) Load() (loaded bool, err error) {
 	if c == nil {
-		return errors.New("Config object is nil. Unable to load")
+		err = errors.New("Config object is nil. Unable to load")
+		return
 	}
 
 	var fd *os.File
 	fd, err = os.Open(c.file)
 	if err != nil {
-		return fmt.Errorf("Unable to load '%s'. %s", c.file, err)
+		gotrace.Warning("%s not loaded. %s", c.file, err)
+		return
 	}
 
 	decoder := yaml.NewDecoder(fd)
 
 	if decoder == nil {
-		return fmt.Errorf("Unable to load '%s'. yaml decoder object not created", c.file)
+		err = fmt.Errorf("Unable to load '%s'. yaml decoder object not created", c.file)
+		return
 	}
 
-	err = decoder.Decode(&c.yaml)
+	err = decoder.Decode(&c.Yaml)
 	if err != nil {
-		return fmt.Errorf("Unable to read yaml file '%s'. %s", c.file, err)
+		err = fmt.Errorf("Unable to read yaml file '%s'. %s", c.file, err)
+		return
 	}
+
+	gotrace.Info("%s loaded.", c.file)
+	loaded = true
 	return
 }

core/git-remote-config.go

@@ -0,0 +1,52 @@
+package core
+
+type GitRemoteConfig map[string]string
+
+// Set if value and name is set
+func (grc GitRemoteConfig) Set(name, value string) {
+	if value == "" || name == "" {
+		return
+	}
+
+	grc[name] = value
+}
+
+// SetIfNotContains set value if the value is not one on the listed ifNot
+func (grc GitRemoteConfig) SetIfNotContains(name, value string, ifNot ...string) {
+	for _, v := range ifNot {
+		if value == v {
+			return
+		}
+
+	}
+
+	grc.Set(name, value)
+}
+
+// SetIf set value if the value is not one on the listed ifNot
+func (grc GitRemoteConfig) SetIf(name, value string, ifCase bool) {
+	if !ifCase {
+		return
+	}
+
+	grc.Set(name, value)
+}
+
+// Get if value and name is set
+func (grc GitRemoteConfig) Get(name string, defaultValues ...string) (value string) {
+	if name == "" {
+		return
+	}
+
+	if v, found := grc[name]; found && v != "" {
+		return v
+	}
+
+	for _, v := range defaultValues {
+		if v != "" {
+			return v
+		}
+	}
+
+	return
+}

core/git.go

@@ -35,10 +35,14 @@ func NewGit() (ret *Git) {
 	return
 }
 
-func (g *Git) SetRemote(protocol, host, repoPath string) {
+func (g *Git) SetRemote(name, protocol, host, repoPath string) {
 	if g == nil {
 		return
 	}
+	g.remoteName = name
+	g.protocol = protocol
+	g.host = host
+	g.repoPath = repoPath
 }
 
 // OpenRepo open the GIT repo
@@ -118,36 +122,30 @@ func (g *Git) CreateTag(name string) (err error) {
 }
 
 // CreateRemote create or update a remote.
-func (g *Git) CreateRemote(options map[string]string) (_ error) {
-	if v, found := options["remote-name"]; found {
-		g.remoteName = v
-	}
+func (g *Git) CreateRemote(options GitRemoteConfig) (_ error) {
+	g.remoteName = options.Get("remote-name", g.remoteName, "ci-upstream")
 
 	if g.host == "" || g.repoPath == "" {
 		return errors.New("Unable to create a remote without host/repo-path setup in 'release-mgt.yaml'")
 	}
 
 	if r, err := g.repo.Remote(g.remoteName); r == nil && err.Error() != git.ErrRemoteNotFound.Error() {
 		return err
+	} else if r != nil {
+		g.removeRemote = false
+		gotrace.Trace("Remote '%s' already exist. Not recreated.", g.remoteName)
+		return nil
 	}
 
 	if v, found := options["auto-remove-remote"]; !found || v == "true" {
 		g.removeRemote = true
 	}
-	if g.remoteName == "" {
-		g.remoteName = "ci-upstream"
-	}
-	protocol := "https"
-	if v, found := options["protocol"]; found {
-		protocol = v
-	}
-	if protocol == "" {
-		protocol = "https"
-	}
+
 	remoteConfig := gitconfig.RemoteConfig{
 		Name: g.remoteName,
 	}
-	switch protocol {
+
+	switch protocol := options.Get("protocol", g.protocol, "https"); protocol {
 	case "https", "http":
 		var user *url.Userinfo
 		if u, foundUser := options["user"]; foundUser {
@@ -189,6 +187,7 @@ func (g *Git) CreateRemote(options map[string]string) (_ error) {
 	if _, err := g.repo.CreateRemote(&remoteConfig); err != nil {
 		return err
 	}
+	gotrace.Trace("Remote '%s' created.", g.remoteName)
 
 	return
 }
@@ -205,6 +204,7 @@ func (g *Git) CleanRemote() (_ error) {
 	r, err := g.repo.Remote(g.remoteName)
 	if r != nil {
 		g.repo.DeleteRemote(g.remoteName)
+		gotrace.Trace("Remote '%s' removed.", g.remoteName)
 	}
 
 	return err

core/yaml-config.go

@@ -1,5 +1,5 @@
 package core
 
-type yamlConfig struct {
-	Upstream yamlUpstream
+type YamlConfig struct {
+	Upstream YamlUpstream
 }

core/yaml-upstream.go

@@ -1,7 +1,7 @@
 package core
 
 
-type yamlUpstream struct {
+type YamlUpstream struct {
 	Name string
 	Server string
 	RepoPath string `yaml:"repo-path"`