DefectDojo
diff --git a/‎args.go‎ ‎cmd/args.go‎args.go renamed to cmd/args.go
Lines changed: 17 additions & 68 deletions b/‎args.go‎ ‎cmd/args.go‎args.go renamed to cmd/args.go
Lines changed: 17 additions & 68 deletions
@@ -1,26 +1,19 @@
-package main
+package cmd
 
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 )
 
-type launchArgs struct {
-	Dev      bool
-	Default  bool
-	Componse bool // TODO: Implement this
-	K8s      bool // TODO: Implement this
-}
-
-func readArgs() launchArgs {
-	//TODO TUrn me to a log writer fmt.Println("Called readArgs")
+// readArgs() takes no arguements and returns filled launchArgs struct unless
+// there are errors in the arguments or the argument provided calls for an
+// early exist such as --version or --help
+func readArgs(d *DDConfig) {
+	d.traceMsg("Called readArgs")
 	// Read in the supported command-line options
 	var version, help, v, h bool
-	opts := launchArgs{}
-	flag.BoolVar(&opts.Default, "default", false, "Do an install based on default config values")
-	flag.BoolVar(&opts.Dev, "dev", false, "Do a development install with known config values")
+	flag.BoolVar(&d.defInstall, "default", false, "Do an install based on default config values")
 	flag.BoolVar(&version, "version", false, "Print the version and exit")
 	flag.BoolVar(&v, "v", false, "Print the version and exit")
 	flag.BoolVar(&help, "help", false, "Print the help message and exit")
@@ -34,21 +27,13 @@ func readArgs() launchArgs {
 	}
 	// Print version
 	if version || v {
-		fmt.Printf("godojo version %s\n", ver)
+		fmt.Printf("godojo version %s\n", d.ver)
 		os.Exit(0)
 	}
 
-	// Handle double options (dev and default currently)
-	if opts.Dev && opts.Default {
-		// Only 1 option should be provided, not both
-		fmt.Println("Error: godojo only supports a single install option")
-		fmt.Println("Both -dev and --default have been provided so exiting.")
-		os.Exit(1)
-	}
-
-	// Handle special install cases of default and dev
-	if opts.Default || opts.Dev {
-		return opts
+	// Handle special install case of default installs
+	if d.defInstall {
+		return
 	}
 
 	// See if the dojoConfig.yml is in the local directory
@@ -58,15 +43,16 @@ func readArgs() launchArgs {
 		fmt.Printf("Error: %v\n", err)
 		os.Exit(1)
 	}
-	_, err = os.Stat(path + "/" + cf)
+	_, err = os.Stat(path + "/" + d.cf)
 	if err != nil {
 		// No config file found, so create one and exit
-		createDefaultConfig(cf, true)
+		writeDefaultConfig(d.cf, true)
 	}
-	traceMsg("Reached the end of readArgs")
-	return opts
+
+	d.traceMsg("Reached the end of readArgs")
 }
 
+// printHelp takes no arguements and prints godojo's help content to stdout
 func printHelp() {
 	// Output the help info
 	fmt.Println("")
@@ -81,9 +67,6 @@ func printHelp() {
 	fmt.Println("  -default")
 	fmt.Println("        OPTIONAL - Do an install based on the default dojoConfig.yml values")
 	fmt.Println("                   Must be used alone and without other arguments")
-	fmt.Println("  -dev")
-	fmt.Println("        OPTIONAL - Do an dev install with fixed values especially for testing")
-	fmt.Println("                   Must be used alone and without other arguments")
 	fmt.Println("  -help, -h")
 	fmt.Println("        Print this help message and exit, ignoring all other arguments")
 	fmt.Println("  -version, -v")
@@ -98,40 +81,6 @@ func printHelp() {
 	fmt.Println("     (Either creates a default config file or installs based on the config file in the same directory)")
 	fmt.Println("$ ./godojo -dev")
 	fmt.Println("     (Does a dev aka development/test install using known and fixed values for the installation")
+	// TODO Consider an example of overriding with an env variable
 	fmt.Println("")
 }
-
-func createDefaultConfig(c string, ex bool) {
-	// Get the current working directory for future operations
-	path, err := os.Getwd()
-	if err != nil {
-		fmt.Println("Unable to determine current working directory, exiting...")
-		fmt.Printf("Error: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Extract the embedded config file
-	f, err := embd.ReadFile(embdConfig)
-	if err != nil {
-		// file was not found.
-		fmt.Println("Unable to extract embedded config file")
-		fmt.Printf("Error: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Write out the embedded default dojoConfig.yml
-	err = ioutil.WriteFile(path+"/"+c, f, 0644)
-	if err != nil {
-		// Cannot write config file
-		fmt.Printf("Unable to write configuration file in %s, exiting...\n", path)
-		fmt.Printf("Error: %v\n", err)
-	}
-
-	if ex {
-		fmt.Println("\nNOTE: A dojoConfig.yml file was not found in the current directory:")
-		fmt.Printf("\t%s\nA default configuration file was written there.\n\n", path)
-		fmt.Println("Please review the configuration settings, adjusting as needed and")
-		fmt.Println("re-run the godojo installer to begin the install you configured.")
-		os.Exit(0)
-	}
-}