Merge lp:snappy/15.04 into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Merge fixes from 15.04 back into trunk.

[lp:snappy/15.04]

709. By David Callé on 2015-09-18

Markdown fix in docs/oem.md by davidc3 approved by mvo

710. By Federico Gimenez on 2015-09-22

Avoid a panic when coreconfig is given invalid config. by chipaca approved by mvo

711. By Michael Vogt on 2015-09-23

merged lp:snappy

[John Lenton (chipaca)]

review: Approve

=== modified file 'coreconfig/config.go'
--- coreconfig/config.go	2015-09-15 21:35:38 +0000
+++ coreconfig/config.go	2015-09-23 08:39:03 +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-23 08:39:03 +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 'docs/oem.md'
--- docs/oem.md	2015-09-11 20:13:00 +0000
+++ docs/oem.md	2015-09-23 08:39:03 +0000
@@ -193,48 +193,47 @@
 
 As an example
 
-```yaml
-name: beagleboneblack.sergiusens
-vendor: Sergio Schvezov <[e-mail]>
-icon: meta/element14.png
-version: 1.1
-type: oem
-
-config:
-    ubuntu-core:
-        hostname: myhostname
-        no-cloud: true
-    config-example.canonical:
-        msg: Yay!
-
-immutable-config:
-    - ubuntu-core/services/*
-    - webdm/*
-
-oem:
-    store:
-        id: mystore
-    branding:
-        name:  Beagle Bone Black
-        logo: logo.png
-    software:
-        built-in:
-            - webdm
-        preinstalled:
-            - system-status.victor
-            - pastebinit.mvo
-            - config-example.canonical
-    hardware:
-        platform: am335x-boneblack
-        architecture: armhf
-        partition-layout: system-AB
-        bootloader: u-boot
-        boot-assets:
-            files:
-                - path: uEnv.txt
-            raw-files:
-                - path: MLO
-                  offset: 131072 # 128 * 1024
-                - path: u-boot.img
-                  offset: 393216 # 384 * 1024
-```
+
+    name: beagleboneblack.sergiusens
+    vendor: Sergio Schvezov <[e-mail]>
+    icon: meta/element14.png
+    version: 1.1
+    type: oem
+
+    config:
+        ubuntu-core:
+            hostname: myhostname
+            no-cloud: true
+        config-example.canonical:
+            msg: Yay!
+
+    immutable-config:
+        - ubuntu-core/services/*
+        - webdm/*
+
+    oem:
+        store:
+            id: mystore
+        branding:
+            name:  Beagle Bone Black
+            logo: logo.png
+        software:
+            built-in:
+                - webdm
+            preinstalled:
+                - system-status.victor
+                - pastebinit.mvo
+                - config-example.canonical
+        hardware:
+            platform: am335x-boneblack
+            architecture: armhf
+            partition-layout: system-AB
+            bootloader: u-boot
+            boot-assets:
+                files:
+                    - path: uEnv.txt
+                raw-files:
+                    - path: MLO
+                      offset: 131072 # 128 * 1024
+                    - path: u-boot.img
+                      offset: 393216 # 384 * 1024