added custom-project flag

fossas · Mar 1, 2018 · d7fbaf2 · d7fbaf2
1 parent 5c5bdcd
commit d7fbaf2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/cmd/fossa/config.go b/cmd/fossa/config.go
@@ -21,10 +21,10 @@ type configFileV1 struct {
 
 	CLI struct {
 		// Upload configuration.
-		APIKey  string `yaml:"api_key"`
-		Server  string
-		Fetcher string // for now we don't allow users to set this
-		Project string
+		APIKey   string `yaml:"api_key"`
+		Server   string
+		Project  string
+		Revision string
 	}
 	Analyze struct {
 		Modules []moduleConfig
@@ -99,12 +99,8 @@ func setDefaultValues(c configFileV1) (configFileV1, error) {
 		c.CLI.APIKey = os.Getenv("FOSSA_API_KEY")
 	}
 
-	// default to `Custom` fetcher type
-	// if they run CLI inside a git repo and haven't given a project name in the config, we change fetcher to git
-	var fetcher = "custom"
-
 	// Infer project and revision from `git`.
-	if c.CLI.Project == "" || c.CLI.Revision == "" {
+	if c.CLI.Project == "" {
 		// TODO: this needs to happen in the module directory, not the working directory
 		repo, err := git.PlainOpen(".")
 		if err == nil {
@@ -114,7 +110,6 @@ func setDefaultValues(c configFileV1) (configFileV1, error) {
 				if err == nil && origin != nil {
 					project = origin.Config().URLs[0]
 					c.CLI.Project = project
-					fetcher = "git" // project is a git remote, so fetcher must be as well
 				}
 			}
 			revision := c.CLI.Revision
@@ -127,19 +122,18 @@ func setDefaultValues(c configFileV1) (configFileV1, error) {
 		}
 	}
 
-	c.CLI.Fetcher = fetcher // set fetcher in config
-
 	return c, nil
 }
 
 type cliConfig struct {
-	apiKey   string
-	fetcher  string
-	project  string
-	revision string
-	endpoint string
-	modules  []moduleConfig
-	debug    bool
+	apiKey        string
+	fetcher       string
+	project       string
+	revision      string
+	endpoint      string
+	modules       []moduleConfig
+	debug         bool
+	customProject bool
 
 	defaultConfig defaultConfig
 	analyzeConfig analyzeConfig
@@ -188,12 +182,13 @@ func parseModuleFlag(moduleFlag string) []moduleConfig {
 
 func initialize(c *cli.Context) (cliConfig, error) {
 	var config = cliConfig{
-		apiKey:   c.String("api_key"),
-		project:  c.String("project"),
-		revision: c.String("revision"),
-		endpoint: c.String("endpoint"),
-		modules:  parseModuleFlag(c.String("modules")),
-		debug:    c.Bool("debug"),
+		apiKey:        c.String("api_key"),
+		project:       c.String("project"),
+		revision:      c.String("revision"),
+		endpoint:      c.String("endpoint"),
+		modules:       parseModuleFlag(c.String("modules")),
+		debug:         c.Bool("debug"),
+		customProject: c.Bool("custom-project"),
 
 		defaultConfig: defaultConfig{
 			build: c.Bool("build"),
@@ -224,9 +219,6 @@ func initialize(c *cli.Context) (cliConfig, error) {
 		return cliConfig{}, err
 	}
 
-	if config.fetcher == "" {
-		config.fetcher = configFile.CLI.Fetcher
-	}
 	if config.project == "" {
 		config.project = configFile.CLI.Project
 	}
@@ -243,6 +235,11 @@ func initialize(c *cli.Context) (cliConfig, error) {
 		config.modules = configFile.Analyze.Modules
 	}
 
+	config.fetcher = "git"
+	if config.customProject {
+		config.fetcher = "custom"
+	}
+
 	// Configure logging.
 	if config.debug {
 		formatter := logging.MustStringFormatter(`%{color}%{time} %{level} %{module}:%{shortpkg}/%{shortfile}/%{shortfunc}%{color:reset} %{message}`)

diff --git a/cmd/fossa/main.go b/cmd/fossa/main.go
@@ -31,6 +31,7 @@ const (
 	analyzeOutputUsage        = "print results to stdout instead of uploading to FOSSA"
 	analyzeAllowResolvedUsage = "allow unresolved dependencies"
 	debugUsage                = "print debug information to stderr"
+	managedBuildUsage         = "upload results as a custom project to FOSSA"
 )
 
 func main() {
@@ -51,6 +52,7 @@ func main() {
 		cli.BoolFlag{Name: "b, 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},
+		cli.BoolFlag{Name: "custom-project", Usage: managedBuildUsage},
 	}
 
 	app.Commands = []cli.Command{
@@ -89,6 +91,7 @@ func main() {
 				cli.BoolFlag{Name: "o, output", Usage: analyzeOutputUsage},
 				cli.BoolFlag{Name: "allow-unresolved", Usage: analyzeAllowResolvedUsage},
 				cli.BoolFlag{Name: "debug", Usage: debugUsage},
+				cli.BoolFlag{Name: "custom-project", Usage: managedBuildUsage},
 			},
 		},
 		{

diff --git a/cmd/fossa/upload.go b/cmd/fossa/upload.go
@@ -134,7 +134,12 @@ func doUpload(conf config.CLIConfig, results []normalizedModule) (string, error)
 
 	analysisLogger.Debugf("Uploading build data from (%#v) modules: %#v", len(results), string(buildData))
 
-	postRef, _ := url.Parse("/api/builds/custom?locator=" + url.QueryEscape(config.MakeLocator(conf.fetcher, conf.project, conf.revision)) + "&v=" + version)
+	fossaEndpoint := "/api/builds/custom?locator=" + url.QueryEscape(config.MakeLocator(conf.fetcher, conf.project, conf.revision)) + "&v=" + version
+	if config.customProject {
+		fossaEndpoint += "&managedBuild=true"
+	}
+
+	postRef, _ := url.Parse(fossaEndpoint)
 	postURL := fossaBaseURL.ResolveReference(postRef).String()
 
 	analysisLogger.Debugf("Sending build data to <%#v>", postURL)
@@ -156,7 +161,7 @@ func doUpload(conf config.CLIConfig, results []normalizedModule) (string, error)
 		return "", fmt.Errorf("invalid API key (check the $FOSSA_API_KEY environment variable)")
 	} else if resp.StatusCode == http.StatusPreconditionRequired {
 		// TODO: handle "Managed Project" workflow
-		return "", fmt.Errorf("invalid project or revision; make sure this version is published and FOSSA has access to your repo")
+		return "", fmt.Errorf("invalid project or revision; make sure this version is published and FOSSA has access to your repo. To submit a custom project, add the --custom-project flag")
 	} else if resp.StatusCode != http.StatusOK {
 		return "", fmt.Errorf("bad server response (%#v)", responseStr)
 	}