feat(upload): Configurable upload branch

Author: elldritch

cmd/fossa/cmd/upload/upload.go

@@ -101,7 +101,7 @@ func Run(ctx *cli.Context) {
 		log.Logger.Fatalf("Upload failed: %s", err.Error())
 	}
 	baseURL, err := url.Parse(c.Endpoint)
-	reportURL, err := url.Parse("/projects/" + url.QueryEscape(locator.Fetcher+"+"+locator.Project) + "/refs/branch/master/" + url.QueryEscape(locator.Revision) + "/browse/dependencies")
+	reportURL, err := url.Parse("/projects/" + url.QueryEscape(locator.Fetcher+"+"+locator.Project) + "/refs/branch/" + c.Branch + "/" + url.QueryEscape(locator.Revision) + "/browse/dependencies")
 	log.Printf(`
 ============================================================
 

cmd/fossa/flags/flags.go

@@ -9,11 +9,12 @@ func WithAPIFlags(f []cli.Flag) []cli.Flag {
 }
 
 var (
-	API      = []cli.Flag{Endpoint, Fetcher, Project, Revision}
+	API      = []cli.Flag{Endpoint, Fetcher, Project, Revision, Branch}
 	Endpoint = cli.StringFlag{Name: "e, endpoint", Usage: "the FOSSA server endpoint (default: 'https://app.fossa.io')"}
 	Fetcher  = cli.StringFlag{Name: "f, fetcher", Usage: "type of fetcher to use for fossa. (default: 'custom')"}
 	Project  = cli.StringFlag{Name: "p, project", Usage: "this repository's URL or VCS endpoint (default: VCS remote 'origin')"}
 	Revision = cli.StringFlag{Name: "r, revision", Usage: "this repository's current revision hash (default: VCS hash HEAD)"}
+	Branch   = cli.StringFlag{Name: "b, branch", Usage: "this repository's current branch (default: current VCS branch)"}
 )
 
 func WithGlobalFlags(f []cli.Flag) []cli.Flag {

cmd/fossa/main.go

@@ -12,6 +12,7 @@ import (
 	"github.com/fossas/fossa-cli/builders"
 	"github.com/fossas/fossa-cli/cmd/fossa/cmd/update"
 	"github.com/fossas/fossa-cli/cmd/fossa/cmd/upload"
+	"github.com/fossas/fossa-cli/cmd/fossa/flags"
 	"github.com/fossas/fossa-cli/cmd/fossa/version"
 	"github.com/fossas/fossa-cli/config"
 	"github.com/fossas/fossa-cli/log"
@@ -50,6 +51,7 @@ func main() {
 		cli.StringFlag{Name: "p, project", Usage: projectUsage},
 		cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 		cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
+		flags.Branch,
 		cli.StringSliceFlag{Name: "m, modules", Usage: "the modules to build and analyze"},
 		cli.StringFlag{Name: "fetcher", Usage: fetcherUsage},
 		// --strategy=pipreqs
@@ -60,7 +62,7 @@ func main() {
 		// --no-ansi
 		cli.BoolFlag{Name: "o, output", Usage: analyzeOutputUsage},
 		cli.BoolFlag{Name: "allow-unresolved", Usage: analyzeAllowResolvedUsage},
-		cli.BoolFlag{Name: "b, build", Usage: "run a default build in module directories if they have not been pre-built"},
+		cli.BoolFlag{Name: "build", Usage: "run a default build in module directories if they have not been pre-built"},
 		cli.BoolFlag{Name: "f, force", Usage: buildForceUsage},
 		cli.BoolFlag{Name: "debug", Usage: debugUsage},
 	}
@@ -98,6 +100,7 @@ func main() {
 				cli.StringFlag{Name: "p, project", Usage: projectUsage},
 				cli.StringFlag{Name: "r, revision", Usage: revisionUsage},
 				cli.StringFlag{Name: "e, endpoint", Usage: endpointUsage},
+				flags.Branch,
 				cli.StringSliceFlag{Name: "m, modules", Usage: "the modules to analyze"},
 				cli.BoolFlag{Name: "o, output", Usage: analyzeOutputUsage},
 				cli.BoolFlag{Name: "allow-unresolved", Usage: analyzeAllowResolvedUsage},

cmd/fossa/upload.go

@@ -184,7 +184,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/" + conf.Branch + "/" + url.QueryEscape(locParts[1]) + "/browse/dependencies")
 	return fmt.Sprint(`
 ============================================================
 

config/file.go

@@ -23,6 +23,7 @@ type configFileCLIV1 struct {
 	Server   string `yaml:"server,omitempty"`
 	Project  string `yaml:"project,omitempty"`
 	Revision string `yaml:"revision,omitempty"`
+	Branch   string `yaml:"branch,omitempty"`
 	Fetcher  string `yaml:"fetcher,omitempty"` // fetcher defaults to custom
 }
 
@@ -94,26 +95,30 @@ 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.Revision = revision.Hash().String()
+				}
+				c.CLI.Branch = revision.Name().String()
+			}
 		}
 	}
 

config/init.go

@@ -52,6 +52,7 @@ func New(c *cli.Context) (CLIConfig, error) {
 		Fetcher:  c.String("fetcher"),
 		Project:  c.String("project"),
 		Revision: c.String("revision"),
+		Branch:   c.String("branch"),
 		Endpoint: c.String("endpoint"),
 		Modules:  modules,
 

config/types.go

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