Feature: Add ability to specify the clone branch (#9)

Author: dpatsora

cmd/goci/main.go

@@ -19,6 +19,8 @@ var Component string
 // Tag of the component
 var Tag string
 
+var CommitMessage string
+
 // Changed file display depth(dir1/dir2/.../dir*depth*)
 var Depth = 0
 
@@ -29,6 +31,7 @@ func main() {
 	cli.StringFlag("path", "Path to the versions folder (e.g. opendax/2-6/versions.yaml)", &Path)
 	cli.StringFlag("component", "Name of the component to update", &Component)
 	cli.StringFlag("tag", "Tag to insert into the versions file", &Tag)
+	cli.StringFlag("message", "Commit message", &CommitMessage)
 	cli.AddCommand(cmdVersions)
 
 	cmdChanges := kli.NewCommand("changes", "List files changed in the last commit").Action(actionChanges)

cmd/goci/versions.go

@@ -23,6 +23,8 @@ func actionVersions() error {
 	// Path to versions file
 	if Path == "" {
 		Path = fmt.Sprintf("%s/opendax/%s/versions.yaml", tmp, cnf.Branch)
+	} else {
+		Path = strings.Join([]string{tmp, Path}, "/")
 	}
 	// Remove existing git folder
 	if err := os.RemoveAll(tmp); err != nil {
@@ -75,8 +77,12 @@ func actionVersions() error {
 	v.Save()
 
 	// Commit & Push to global OpenDAX versions
-	fmt.Println("Committing & Pushing to global OpenDAX versions")
-	hash, err := git.Update(repo, &auth, fmt.Sprintf("%s: Update %s version to %s", cnf.Branch, Component, Tag))
+	fmt.Println("Committing & Pushing to remote repository")
+	if CommitMessage == "" {
+		CommitMessage = fmt.Sprintf("%s: Update %s version to %s", cnf.Branch, Component, Tag)
+	}
+
+	hash, err := git.Update(repo, &auth, CommitMessage)
 	if err == nil {
 		fmt.Printf("Pushed with commit hash: %s\n", hash)
 	}

git/git.go

@@ -1,21 +1,24 @@
 package git
 
 import (
+	"fmt"
 	"os"
 
 	git "github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 )
 
 // Config for the git repository
 type Config struct {
-	Username string `env:"GIT_USERNAME" env-default:"kite-bot" env-description:"Git username"`
-	Email    string `env:"GIT_EMAIL" env-default:"[email protected]" env-description:"Git user email"`
-	Token    string `env:"GIT_TOKEN" env-description:"Git access token"`
-	URL      string `env:"GIT_URL" env-default:"https://github.com/openware/versions.git" env-description:"Git repository url"`
-	Branch   string `env:"DRONE_BRANCH" env-default:"2-6-stable" env-description:"drone target branch"`
-	Repo     string `env:"DRONE_REPO_NAME" env-description:"component repo name"`
+	Username    string `env:"GIT_USERNAME" env-default:"kite-bot" env-description:"Git username"`
+	Email       string `env:"GIT_EMAIL" env-default:"[email protected]" env-description:"Git user email"`
+	Token       string `env:"GIT_TOKEN" env-description:"Git access token"`
+	URL         string `env:"GIT_URL" env-default:"https://github.com/openware/versions.git" env-description:"Git repository url"`
+	CloneBranch string `env:"CLONE_BRANCH" env-description:"target clone branch"`
+	Branch      string `env:"DRONE_BRANCH" env-default:"2-6-stable" env-description:"drone target branch"`
+	Repo        string `env:"DRONE_REPO_NAME" env-description:"component repo name"`
 }
 
 // Auth to describe auth method
@@ -45,11 +48,18 @@ func (a *AuthToken) Method() transport.AuthMethod {
 
 // Clone repository with config
 func Clone(cnf *Config, auth Auth, outDir string) (*git.Repository, error) {
-	repo, err := git.PlainClone(outDir, false, &git.CloneOptions{
+	cloneOptions := &git.CloneOptions{
 		Auth:     auth.Method(),
 		URL:      cnf.URL,
 		Progress: os.Stdout,
-	})
+	}
+
+	if cnf.CloneBranch != "" {
+		cloneOptions.ReferenceName = plumbing.NewBranchReferenceName(cnf.CloneBranch)
+		fmt.Printf("Cloning %s branch\n", cnf.CloneBranch)
+	}
+
+	repo, err := git.PlainClone(outDir, false, cloneOptions)
 	if err != nil {
 		return nil, err
 	}