Commit 4fcc789

authored

Merge pull request #4108 from Horiodino/depricate--yes

Use --start flag to start VM for 'clone' and 'edit' commands

2 parents 282d5d2 + 1e368f3 commit 4fcc789Copy full SHA for 4fcc789

File tree

+27

-12

lines changed

+27

-12

lines changed

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ Not to be confused with 'limactl copy' ('limactl cp').`
`34`	`34`	`ValidArgsFunction: cloneBashComplete,`
`35`	`35`	`GroupID: advancedCommand,`
`36`	`36`	`}`
	`37`	`+ cloneCommand.Flags().Bool("start", false, "Start the instance after cloning")`
`37`	`38`	`editflags.RegisterEdit(cloneCommand, "[limactl edit] ")`
`38`	`39`	`return cloneCommand`
`39`	`40`	`}`
`@@ -48,6 +49,7 @@ func newRenameCommand() *cobra.Command {`
`48`	`49`	`ValidArgsFunction: cloneBashComplete,`
`49`	`50`	`GroupID: advancedCommand,`
`50`	`51`	`}`
	`52`	`+ renameCommand.Flags().Bool("start", false, "Start the instance after renaming")`
`51`	`53`	`editflags.RegisterEdit(renameCommand, "[limactl edit] ")`
`52`	`54`	`return renameCommand`
`53`	`55`	`}`
`@@ -113,15 +115,18 @@ func cloneOrRenameAction(cmd *cobra.Command, args []string) error {`
`113`	`115`	`}`
`114`	`116`	`}`
`115`	`117`
`116`		`- if !tty {`
`117`		`- // use "start" to start it`
`118`		`- return nil`
`119`		`- }`
`120`		`- startNow, err := askWhetherToStart()`
	`118`	`+ start, err := flags.GetBool("start")`
`121`	`119`	`if err != nil {`
`122`	`120`	`return err`
`123`	`121`	`}`
`124`		`- if !startNow {`
	`122`	`+`
	`123`	`+ if tty && !flags.Changed("start") {`
	`124`	`+ start, err = askWhetherToStart()`
	`125`	`+ if err != nil {`
	`126`	`+ return err`
	`127`	`+ }`
	`128`	`+ }`
	`129`	`+ if !start {`
`125`	`130`	`return nil`
`126`	`131`	`}`
`127`	`132`	`err = reconcile.Reconcile(ctx, newInst.Name)`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ func newEditCommand() *cobra.Command {`
`36`	`36`	`ValidArgsFunction: editBashComplete,`
`37`	`37`	`GroupID: basicCommand,`
`38`	`38`	`}`
	`39`	`+ editCommand.Flags().Bool("start", false, "Start the instance after editing")`
`39`	`40`	`editflags.RegisterEdit(editCommand, "")`
`40`	`41`	`return editCommand`
`41`	`42`	`}`
`@@ -140,19 +141,23 @@ func editAction(cmd *cobra.Command, args []string) error {`
`140`	`141`	`logrus.Infof("Instance %q configuration edited", inst.Name)`
`141`	`142`	`}`
`142`	`143`
`143`		`- if !tty {`
`144`		`- // use "start" to start it`
`145`		`- return nil`
`146`		`- }`
`147`	`144`	`if inst == nil {`
`148`	`145`	`// edited a limayaml file directly`
`149`	`146`	`return nil`
`150`	`147`	`}`
`151`		`- startNow, err := askWhetherToStart()`
	`148`	`+`
	`149`	`+ start, err := flags.GetBool("start")`
`152`	`150`	`if err != nil {`
`153`	`151`	`return err`
`154`	`152`	`}`
`155`		`- if !startNow {`
	`153`	`+`
	`154`	`+ if tty && !flags.Changed("start") {`
	`155`	`+ start, err = askWhetherToStart()`
	`156`	`+ if err != nil {`
	`157`	`+ return err`
	`158`	`+ }`
	`159`	`+ }`
	`160`	`+ if !start {`
`156`	`161`	`return nil`
`157`	`162`	`}`
`158`	`163`	`err = reconcile.Reconcile(ctx, inst.Name)`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,11 @@ func newApp() *cobra.Command {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`if cmd.Flags().Changed("yes") {`
	`158`	`+ switch cmd.Name() {`
	`159`	`+ case "clone", "edit", "rename":`
	`160`	`+ logrus.Warn("--yes flag is deprecated (--tty=false is still supported and works in the same way. Also consider using --start)")`
	`161`	`+ }`
	`162`	`+`
`158`	`163`	`// Sets the value of the yesValue flag by using the yes flag.`
`159`	`164`	`yesValue, _ := cmd.Flags().GetBool("yes")`
`160`	`165`	`if yesValue {`

Comments

(0)