backport(api): Backport branch flag to 0.5.x

Author: elldritch

cmd/fossa/main.go

@@ -27,6 +27,7 @@ const (
 	configUsage               = "path to config file (default: .fossa.{yml,yaml})"
 	fetcherUsage              = "type of fetcher to use for fossa. Default's to custom"
 	projectUsage              = "this repository's URL or VCS endpoint (default: VCS remote 'origin')"
+	branchUsage               = "this repository's branch (default: current VCS branch)"
 	revisionUsage             = "this repository's current revision hash (default: VCS hash HEAD)"
 	endpointUsage             = "the FOSSA server endpoint (default: https://app.fossa.io)"
 	buildForceUsage           = "ignore cached build artifacts"
@@ -45,6 +46,7 @@ func main() {
 	app.Flags = []cli.Flag{
 		cli.StringFlag{Name: "c, config", Usage: configUsage},
 		cli.StringFlag{Name: "p, project", Usage: projectUsage},
+		cli.StringFlag{Name: "branch", Usage: branchUsage},
 		cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 		cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
 		cli.StringFlag{Name: "m, modules", Usage: "the modules to build and analyze"},
@@ -87,6 +89,7 @@ func main() {
 				cli.StringFlag{Name: "c, config", Usage: configUsage},
 				cli.StringFlag{Name: "fetcher", Usage: fetcherUsage},
 				cli.StringFlag{Name: "p, project", Usage: projectUsage},
+				cli.StringFlag{Name: "branch", Usage: branchUsage},
 				cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 				cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
 				cli.StringFlag{Name: "m, modules", Usage: "the modules to analyze"},
@@ -103,6 +106,7 @@ func main() {
 				cli.StringFlag{Name: "c, config", Usage: configUsage},
 				cli.StringFlag{Name: "fetcher", Usage: fetcherUsage},
 				cli.StringFlag{Name: "p, project", Usage: projectUsage},
+				cli.StringFlag{Name: "branch", Usage: branchUsage},
 				cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 				cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
 				cli.IntFlag{Name: "t, timeout", Usage: "timeout for waiting for build status in seconds", Value: 60 * 10},
@@ -117,6 +121,7 @@ func main() {
 				cli.StringFlag{Name: "c, config", Usage: configUsage},
 				cli.StringFlag{Name: "fetcher", Usage: fetcherUsage},
 				cli.StringFlag{Name: "p, project", Usage: projectUsage},
+				cli.StringFlag{Name: "branch", Usage: branchUsage},
 				cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 				cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
 				cli.BoolFlag{Name: "l, locators", Usage: "upload data in locator format instead of JSON"},
@@ -140,6 +145,7 @@ func main() {
 				cli.StringFlag{Name: "c, config", Usage: configUsage},
 				cli.StringFlag{Name: "fetcher", Usage: fetcherUsage},
 				cli.StringFlag{Name: "p, project", Usage: projectUsage},
+				cli.StringFlag{Name: "branch", Usage: branchUsage},
 				cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 				cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
 				cli.BoolFlag{Name: "allow-unresolved", Usage: analyzeAllowResolvedUsage},

cmd/fossa/upload.go

@@ -152,14 +152,19 @@ func doUpload(conf config.CLIConfig, results []normalizedModule) (string, error)
 
 	analysisLogger.Debugf("Uploading build data from (%#v) modules: %#v", len(results), string(buildData))
 
-	fossaEndpoint := "/api/builds/custom?locator=" + url.QueryEscape(string(module.MakeLocator(conf.Fetcher, conf.Project, conf.Revision))) + "&v=" + version
+	branch := "master"
+	if conf.Branch != "" {
+		branch = conf.Branch
+	}
+
+	fossaEndpoint := "/api/builds/custom?locator=" + url.QueryEscape(string(module.MakeLocator(conf.Fetcher, conf.Project, conf.Revision))) + "&branch=" + url.QueryEscape(branch) + "&v=" + url.QueryEscape(version)
 	if conf.Fetcher == "custom" {
 		defaultProjectTitle := results[0].Name
 		cwd, _ := filepath.Abs(".")
 		if cwd != "" {
 			defaultProjectTitle = filepath.Base(cwd)
 		}
-		fossaEndpoint += fmt.Sprintf("&managedBuild=true&title=%s", url.PathEscape(defaultProjectTitle))
+		fossaEndpoint += fmt.Sprintf("&managedBuild=true&title=%s", url.QueryEscape(defaultProjectTitle))
 	}
 
 	postRef, _ := url.Parse(fossaEndpoint)
@@ -185,7 +190,7 @@ func doUpload(conf config.CLIConfig, results []normalizedModule) (string, error)
 		return "", fmt.Errorf("invalid response, but build was uploaded")
 	}
 	locParts := strings.Split(jsonResponse["locator"].(string), "$")
-	getRef, _ := url.Parse("/projects/" + url.QueryEscape(locParts[0]) + "/refs/branch/master/" + url.QueryEscape(locParts[1]) + "/browse/dependencies")
+	getRef, _ := url.Parse("/projects/" + url.QueryEscape(locParts[0]) + "/refs/branch/" + url.QueryEscape(conf.Branch) + "/" + url.QueryEscape(locParts[1]) + "/browse/dependencies")
 	return fmt.Sprint(`
 ============================================================
 

config/file.go

@@ -4,10 +4,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 
-	"github.com/fossas/fossa-cli/module"
 	git "gopkg.in/src-d/go-git.v4"
 	yaml "gopkg.in/yaml.v2"
+
+	"github.com/fossas/fossa-cli/module"
 )
 
 type configFileV1 struct {
@@ -22,6 +24,7 @@ type configFileCLIV1 struct {
 	APIKey   string `yaml:"api_key,omitempty"`
 	Server   string `yaml:"server,omitempty"`
 	Project  string `yaml:"project,omitempty"`
+	Branch   string `yaml:"branch,omitempty"`
 	Revision string `yaml:"revision,omitempty"`
 	Fetcher  string `yaml:"fetcher,omitempty"` // fetcher defaults to custom
 }
@@ -94,26 +97,29 @@ func setDefaultValues(c configFileV1) (configFileV1, error) {
 	}
 
 	// Infer default locator and project from `git`.
-	if c.CLI.Project == "" || c.CLI.Revision == "" {
+	if c.CLI.Project == "" || c.CLI.Revision == "" || c.CLI.Branch == "" {
 		// TODO: this needs to happen in the module directory, not the working
 		// directory
 		repo, err := git.PlainOpen(".")
 		if err == nil {
-			project := c.CLI.Project
-			if project == "" {
+			if c.CLI.Project == "" {
 				origin, err := repo.Remote("origin")
 				if err == nil && origin != nil {
-					project = origin.Config().URLs[0]
-					c.CLI.Project = project
+					c.CLI.Project = origin.Config().URLs[0]
 				}
 			}
-			revision := c.CLI.Revision
-			if revision == "" {
+			if c.CLI.Revision == "" {
 				revision, err := repo.Head()
 				if err == nil {
 					c.CLI.Revision = revision.Hash().String()
 				}
 			}
+			if c.CLI.Branch == "" {
+				revision, err := repo.Head()
+				if err == nil {
+					c.CLI.Branch = strings.TrimPrefix(string(revision.Name()), "refs/heads/")
+				}
+			}
 		}
 	}
 

config/init.go

@@ -45,6 +45,7 @@ func New(c *cli.Context) (CLIConfig, error) {
 		APIKey:         c.String("api_key"),
 		Fetcher:        c.String("fetcher"),
 		Project:        c.String("project"),
+		Branch:         c.String("branch"),
 		Revision:       c.String("revision"),
 		Endpoint:       c.String("endpoint"),
 		Modules:        modules,
@@ -88,6 +89,9 @@ func New(c *cli.Context) (CLIConfig, error) {
 	if config.Project == "" {
 		config.Project = configFile.CLI.Project
 	}
+	if config.Branch == "" {
+		config.Branch = configFile.CLI.Branch
+	}
 	if config.Revision == "" {
 		config.Revision = configFile.CLI.Revision
 	}

config/types.go

@@ -47,6 +47,7 @@ type CLIConfig struct {
 	APIKey   string
 	Fetcher  string
 	Project  string
+	Branch   string
 	Revision string
 	Endpoint string
 	Modules  []module.Config