Merge lp:~chipaca/snappy/dont-panic into lp:snappy/15.04

[John Lenton]

Avoid a panic when coreconfig is given invalid config.

[Michael Vogt (mvo)]

Thanks!

review: Approve

[Michael Vogt (mvo)]

We should probably target this to 15.04, ok?

[Michael Vogt (mvo)]

\o/

review: Approve

=== modified file '_integration-tests/testutils/image/image.go'
--- _integration-tests/testutils/image/image.go	2015-07-28 04:03:52 +0000
+++ _integration-tests/testutils/image/image.go	2015-09-21 15:47:26 +0000
@@ -51,7 +51,7 @@
 	udfCommand := []string{"sudo", "ubuntu-device-flash", "--verbose"}
 
 	if img.revision != "" {
-		udfCommand = append(udfCommand, "--revision", img.revision)
+		udfCommand = append(udfCommand, "--revision="+img.revision)
 	}
 
 	imagePath := img.imagePath(imageDir)
 
=== added file 'cmd/snappy/cmd_console.go'
--- cmd/snappy/cmd_console.go	1970-01-01 00:00:00 +0000
+++ cmd/snappy/cmd_console.go	2015-09-21 15:47:26 +0000
@@ -0,0 +1,165 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/peterh/liner"
+
+	"launchpad.net/snappy/logger"
+)
+
+// for testing
+var stdout io.Writer = os.Stdout
+
+type cmdConsole struct {
+	repl          *liner.State
+	extraCommands []consoleCommand
+}
+
+func init() {
+	_, err := parser.AddCommand("console",
+		"Run snappy console interface",
+		"Run snappy console interface",
+		&cmdConsole{})
+	if err != nil {
+		logger.Panicf("Unable to console: %v", err)
+	}
+}
+
+func (x *cmdConsole) Execute(args []string) error {
+	return x.doConsole()
+}
+
+type consoleCommand struct {
+	name string
+	fn   func(line string) error
+}
+
+func (x *cmdConsole) snappyCompleter(line string) (c []string) {
+	// FIXME: add smartz and also complete arguments of
+	//        commands
+	for _, cmd := range parser.Commands() {
+		if strings.HasPrefix(cmd.Name, strings.ToLower(line)) {
+			c = append(c, cmd.Name)
+		}
+	}
+	for _, cmd := range x.extraCommands {
+		if strings.HasPrefix(cmd.name, line) {
+			c = append(c, cmd.name)
+		}
+	}
+
+	return c
+}
+
+func (x *cmdConsole) initConsole() error {
+	// FIXME: add history (ReadHistory/WriteHistory)
+
+	x.extraCommands = []consoleCommand{
+		{"help", x.doHelp},
+		{"shell", x.doShell},
+	}
+
+	x.repl = liner.NewLiner()
+	x.repl.SetCompleter(x.snappyCompleter)
+
+	return nil
+}
+
+func (x *cmdConsole) CloseConsole() {
+	x.repl.Close()
+}
+
+func (x *cmdConsole) PrintWelcomeMessage() {
+	fmt.Println("Welcome to the snappy console")
+	fmt.Println("Type 'help' for help")
+	fmt.Println("Type 'shell' for entering a shell")
+}
+
+func (x *cmdConsole) doShell(line string) error {
+	// restore terminal for the shell
+	x.CloseConsole()
+	defer x.initConsole()
+
+	sh := os.Getenv("SHELL")
+	if sh == "" {
+		sh = "/bin/sh"
+	}
+	cmd := exec.Command(sh)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (x *cmdConsole) doHelp(line string) error {
+	line = strings.TrimPrefix(line, "help")
+	line = strings.TrimSpace(line)
+	parser.Active = nil
+	// find subcmd
+	for _, cmd := range parser.Commands() {
+		if strings.HasPrefix(line, cmd.Name) {
+			parser.Active = cmd
+			break
+		}
+	}
+	parser.WriteHelp(stdout)
+
+	return nil
+}
+
+func (x *cmdConsole) doConsole() error {
+	x.initConsole()
+	defer x.CloseConsole()
+	x.PrintWelcomeMessage()
+
+outer:
+	for {
+		line, err := x.repl.Prompt("> ")
+		if err != nil {
+			return err
+		}
+		x.repl.AppendHistory(line)
+
+		for _, cmd := range x.extraCommands {
+			if strings.HasPrefix(line, cmd.name) {
+				if err := cmd.fn(line); err != nil {
+					fmt.Println(err)
+				}
+				continue outer
+			}
+		}
+
+		if _, err = parser.ParseArgs(strings.Fields(line)); err != nil {
+			fmt.Println(err)
+		}
+
+	}
+}
 
=== added file 'cmd/snappy/cmd_console_test.go'
--- cmd/snappy/cmd_console_test.go	1970-01-01 00:00:00 +0000
+++ cmd/snappy/cmd_console_test.go	2015-09-21 15:47:26 +0000
@@ -0,0 +1,57 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"bytes"
+
+	. "gopkg.in/check.v1"
+)
+
+func (s *CmdTestSuite) TestCmdConsoleCompleter(c *C) {
+	// setup
+	x := cmdConsole{}
+
+	err := x.initConsole()
+	c.Assert(err, IsNil)
+
+	// from cmdline parser
+	c.Check(x.snappyCompleter("hw-"), DeepEquals, []string{"hw-assign", "hw-info", "hw-unassign"})
+
+	// extra consoleCommand
+	c.Check(x.snappyCompleter("he"), DeepEquals, []string{"help"})
+	c.Check(x.snappyCompleter("help"), DeepEquals, []string{"help"})
+}
+
+func (s *CmdTestSuite) TestDoHelpGeneric(c *C) {
+	stdout = bytes.NewBuffer(nil)
+
+	x := cmdConsole{}
+	x.doHelp("")
+	c.Assert(stdout.(*bytes.Buffer).String(), Matches, `(?sm).*Available commands:`)
+}
+
+func (s *CmdTestSuite) TestDoHelpSet(c *C) {
+	stdout = bytes.NewBuffer(nil)
+
+	x := cmdConsole{}
+	x.doHelp("set")
+	c.Assert(stdout.(*bytes.Buffer).String(), Matches, `(?sm).*Set properties of system or package`)
+}
 
=== modified file 'coreconfig/config.go'
--- coreconfig/config.go	2015-09-15 21:35:38 +0000
+++ coreconfig/config.go	2015-09-21 15:47:26 +0000
@@ -58,9 +58,15 @@
 	watchdogStartupPath = "/etc/default/watchdog"
 )
 
-// ErrInvalidUnitStatus signals that a unit is not returning a status
-// of "enabled" or "disabled".
-var ErrInvalidUnitStatus = errors.New("invalid unit status")
+var (
+	// ErrInvalidUnitStatus signals that a unit is not returning a status
+	// of "enabled" or "disabled".
+	ErrInvalidUnitStatus = errors.New("invalid unit status")
+
+	// ErrInvalidConfig is returned from Set when the value
+	// provided is not a valid configuration string.
+	ErrInvalidConfig = errors.New("invalid ubuntu-core configuration")
+)
 
 type systemConfig struct {
 	Autopilot *bool           `yaml:"autopilot,omitempty"`
@@ -194,6 +200,9 @@
 		return "", err
 	}
 	newConfig := configWrap.Config.UbuntuCore
+	if newConfig == nil {
+		return "", ErrInvalidConfig
+	}
 
 	rNewConfig := reflect.ValueOf(newConfig).Elem()
 	rType := rNewConfig.Type()
 
=== modified file 'coreconfig/config_test.go'
--- coreconfig/config_test.go	2015-09-15 21:36:22 +0000
+++ coreconfig/config_test.go	2015-09-21 15:47:26 +0000
@@ -148,6 +148,18 @@
 	c.Assert(rawConfig, Equals, expected)
 }
 
+func (cts *ConfigTestSuite) TestSetBadValueDoesNotPanic(c *C) {
+	for _, s := range []string{
+		"",
+		"\n",
+		"config:\n",
+		"config:\n ubuntu-core:\n",
+	} {
+		_, err := Set(s)
+		c.Assert(err, Equals, ErrInvalidConfig)
+	}
+}
+
 // TestSetTimezone is a broad test, close enough to be an integration test.
 func (cts *ConfigTestSuite) TestSetTimezone(c *C) {
 	// TODO figure out if we care about exact output or just want valid yaml.
 
=== modified file 'debian/control'
--- debian/control	2015-09-14 19:04:47 +0000
+++ debian/control	2015-09-21 15:47:26 +0000
@@ -15,6 +15,7 @@
                golang-go-flags-dev,
                golang-go.crypto-dev,
                golang-goconfigparser-dev,
+               golang-go-liner-dev,
                golang-pb-dev,
                golang-uboot-go-dev,
                golang-yaml.v2-dev,
 
=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-09-16 12:04:05 +0000
+++ dependencies.tsv	2015-09-21 15:47:26 +0000
@@ -6,6 +6,7 @@
 github.com/gosexy/gettext	git	98b7b91596d20b96909e6b60d57411547dd9959c	2013-02-21T11:21:43Z
 github.com/jessevdk/go-flags	git	1acbbaff2f347c412a0c7884873bd72cc9c1f5b4	2015-08-16T10:05:21Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
+github.com/peterh/liner	git	1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced	2015-04-02T04:04:07Z
 github.com/mvo5/uboot-go	git	361f6ebcbb54f389d15dc9faefa000e996ba3e37	2015-07-22T06:53:46Z
 golang.org/x/crypto	git	60052bd85f2d91293457e8811b0cf26b773de469	2015-06-22T23:34:07Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z