main, ccvm: Extract flag parsing out of work functions

Move flag parsing from Create/Start into their own exported functions in
preparation for using cobra to parse these.

Signed-off-by: Rob Bradford <[email protected]>

Author: rbradford

ccvm/ccvm.go

@@ -75,20 +75,6 @@ func (p *ports) Set(value string) error {
 	return nil
 }
 
-type packageUpgrade string
-
-func (p *packageUpgrade) String() string {
-	return string(*p)
-}
-
-func (p *packageUpgrade) Set(value string) error {
-	if value != "true" && value != "false" {
-		return fmt.Errorf("--package-update parameter should be true or false")
-	}
-	*p = packageUpgrade(value)
-	return nil
-}
-
 type drives []drive
 
 func (d *drives) String() string {
@@ -142,9 +128,10 @@ func checkDirectory(dir string) error {
 	return nil
 }
 
-func createFlags(ctx context.Context, ws *workspace) (*workload, bool, error) {
+// CreateFlags parses the flags to the create command
+func CreateFlags() (string, bool, bool, VMSpec, error) {
 	var debug bool
-	var update packageUpgrade
+	var update bool
 	var customSpec VMSpec
 	fs := flag.NewFlagSet("create", flag.ExitOnError)
 	fs.Usage = func() {
@@ -154,74 +141,72 @@ func createFlags(ctx context.Context, ws *workspace) (*workload, bool, error) {
 	}
 	vmFlags(fs, &customSpec)
 	fs.BoolVar(&debug, "debug", false, "Enables debug mode")
-	fs.Var(&update, "package-upgrade",
+	fs.BoolVar(&update, "package-upgrade", false,
 		"Hint to enable or disable update of VM packages. Should be true or false")
 
 	if err := fs.Parse(flag.Args()[1:]); err != nil {
-		return nil, false, err
+		return "", debug, update, customSpec, err
 	}
 
 	if fs.NArg() != 1 {
 		fs.Usage()
-		return nil, false, errors.New("no workload specified")
+		return "", debug, update, customSpec, errors.New("no workload specified")
 	}
 	workloadName := fs.Arg(0)
 
-	wkl, err := createWorkload(ctx, ws, workloadName)
-	if err != nil {
-		return nil, false, err
-	}
-
-	in := &wkl.spec.VM
-
-	err = in.mergeCustom(&customSpec)
-	if err != nil {
-		return nil, false, err
-	}
-
-	ws.Mounts = in.Mounts
-	ws.Hostname = wkl.spec.Hostname
-	if ws.NoProxy != "" {
-		ws.NoProxy = fmt.Sprintf("%s,%s", ws.Hostname, ws.NoProxy)
-	} else if ws.HTTPProxy != "" || ws.HTTPSProxy != "" {
-		ws.NoProxy = ws.Hostname
-	}
-	ws.PackageUpgrade = string(update)
-
-	return wkl, debug, nil
+	return workloadName, debug, update, customSpec, nil
 }
 
-func startFlags(in *VMSpec) error {
-	customSpec := *in
+// StartFlags parsed the flags for the start command
+func StartFlags() (VMSpec, error) {
+	var customSpec VMSpec
 
 	fs := flag.NewFlagSet("start", flag.ExitOnError)
 	vmFlags(fs, &customSpec)
 	if err := fs.Parse(flag.Args()[1:]); err != nil {
-		return err
+		return customSpec, err
 	}
 
-	return in.mergeCustom(&customSpec)
+	return customSpec, nil
 }
 
 // Create sets up the VM
-func Create(ctx context.Context) error {
+func Create(ctx context.Context, workloadName string, debug bool, update bool, customSpec *VMSpec) error {
 	var err error
 
 	ws, err := prepareEnv(ctx)
 	if err != nil {
 		return err
 	}
 
-	wkld, debug, err := createFlags(ctx, ws)
+	wkld, err := createWorkload(ctx, ws, workloadName)
 	if err != nil {
 		return err
 	}
 
+	in := &wkld.spec.VM
+
+	err = in.mergeCustom(customSpec)
+	if err != nil {
+		return err
+	}
+
+	ws.Mounts = in.Mounts
+	ws.Hostname = wkld.spec.Hostname
+	if ws.NoProxy != "" {
+		ws.NoProxy = fmt.Sprintf("%s,%s", ws.Hostname, ws.NoProxy)
+	} else if ws.HTTPProxy != "" || ws.HTTPSProxy != "" {
+		ws.NoProxy = ws.Hostname
+	}
+	ws.PackageUpgrade = "false"
+	if update {
+		ws.PackageUpgrade = "true"
+	}
+
 	if wkld.spec.NeedsNestedVM && !hostSupportsNestedKVM() {
 		return fmt.Errorf("nested KVM is not enabled.  Please enable and try again")
 	}
 
-	in := &wkld.spec.VM
 	_, err = os.Stat(ws.instanceDir)
 	if err == nil {
 		return fmt.Errorf("instance already exists")
@@ -286,7 +271,7 @@ func Create(ctx context.Context) error {
 }
 
 // Start launches the VM
-func Start(ctx context.Context) error {
+func Start(ctx context.Context, customSpec *VMSpec) error {
 	ws, err := prepareEnv(ctx)
 	if err != nil {
 		return err
@@ -298,6 +283,11 @@ func Start(ctx context.Context) error {
 	}
 	in := &wkld.spec.VM
 
+	err = in.mergeCustom(customSpec)
+	if err != nil {
+		return err
+	}
+
 	memGiB, CPUs := getMemAndCpus()
 	if in.MemGiB == 0 {
 		in.MemGiB = memGiB
@@ -306,11 +296,6 @@ func Start(ctx context.Context) error {
 		in.CPUs = CPUs
 	}
 
-	err = startFlags(in)
-	if err != nil {
-		return err
-	}
-
 	if wkld.spec.NeedsNestedVM && !hostSupportsNestedKVM() {
 		return fmt.Errorf("nested KVM is not enabled.  Please enable and try again")
 	}

main.go

@@ -48,26 +48,32 @@ func init() {
 }
 
 func runCommand(ctx context.Context) error {
-	var err error
-
 	switch os.Args[1] {
 	case "create":
-		err = ccvm.Create(ctx)
+		workloadName, debug, update, customSpec, err := ccvm.CreateFlags()
+		if err != nil {
+			return err
+		}
+		return ccvm.Create(ctx, workloadName, debug, update, &customSpec)
 	case "start":
-		err = ccvm.Start(ctx)
+		customSpec, err := ccvm.StartFlags()
+		if err != nil {
+			return err
+		}
+		return ccvm.Start(ctx, &customSpec)
 	case "stop":
-		err = ccvm.Stop(ctx)
+		return ccvm.Stop(ctx)
 	case "quit":
-		err = ccvm.Quit(ctx)
+		return ccvm.Quit(ctx)
 	case "status":
-		err = ccvm.Status(ctx)
+		return ccvm.Status(ctx)
 	case "connect":
-		err = ccvm.Connect(ctx)
+		return ccvm.Connect(ctx)
 	case "delete":
-		err = ccvm.Delete(ctx)
+		return ccvm.Delete(ctx)
 	}
 
-	return err
+	return nil
 }
 
 func getSignalContext() (context.Context, context.CancelFunc) {