fix(enter): block --verbose for exec subcommand

internals/cli/cmd_enter.go

@@ -75,18 +75,28 @@ func init() {
 type enterFlags int
 
 const (
+	// If set, disable all logs unless --verbose is passed.
 	enterSilenceLogging enterFlags = 1 << iota
+	// If set, do not allow the usage of --verbose option with subcommand.
+	enterProhibitVerbose
+	// If set, do not run the pebble daemon.
 	enterNoServiceManager
+	// If set, keep the pebble daemon running, even after the subcommand
+	// execution has finished.
 	enterKeepServiceManager
+	// If set, default services (with startup: enabled) must be started before
+	// executing the subcommand.
 	enterRequireServiceAutostart
+	// If set, do not start the default services (with startup: enabled).
+	// Behaviour similar to "--hold".
 	enterProhibitServiceAutostart
 )
 
 func commandEnterFlags(commander flags.Commander) (enterFlags enterFlags, supported bool) {
 	supported = true
 	switch commander.(type) {
 	case *cmdExec:
-		enterFlags = enterSilenceLogging
+		enterFlags = enterSilenceLogging | enterProhibitVerbose
 	case *cmdHelp:
 		enterFlags = enterNoServiceManager
 	case *cmdLs, *cmdPlan, *cmdServices, *cmdVersion:
@@ -153,6 +163,10 @@ func (cmd *cmdEnter) Execute(args []string) error {
 		return fmt.Errorf("enter: cannot provide --run before %q subcommand", parser.Active.Name)
 	}
 
+	if enterFlags&enterProhibitVerbose != 0 && cmd.Verbose {
+		return fmt.Errorf("enter: cannot provide -v/--verbose before %q subcommand", parser.Active.Name)
+	}
+
 	if enterFlags&enterNoServiceManager != 0 {
 		if err := commander.Execute(extraArgs); err != nil {
 			cmd.parser.Command.Active = parser.Command.Active

internals/cli/cmd_enter_test.go

@@ -143,6 +143,16 @@ func (s *PebbleSuite) TestEnterServicesNoRun(c *C) {
 	c.Check(exitCode, Equals, 1)
 }
 
+func (s *PebbleSuite) TestEnterExecNoVerbose(c *C) {
+	restore := fakeArgs("pebble", "enter", "--verbose", "exec", "date")
+	defer restore()
+
+	exitCode := cli.PebbleMain()
+	c.Check(s.Stderr(), Equals, "error: enter: cannot provide -v/--verbose before \"exec\" subcommand\n")
+	c.Check(s.Stdout(), Equals, "")
+	c.Check(exitCode, Equals, 1)
+}
+
 func (s *PebbleSuite) TestEnterExecListDir(c *C) {
 	files := []string{"foo", "bar", "baz"}
 	for _, file := range files {