Merge lp:~chipaca/snappy/systemimage-exported-consts into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Export systemimage's constants (name, origin, and vendor).

[Leo Arias (elopio)]

seems ok to me. I just don't understand why now All returns also the updates. There is no mention about it in the commit message, the function comment is not updated and there is no test for that change.

review: Needs Fixing

[John Lenton (chipaca)]

Ah! good catch. Need to reverse that change.

[lp:~chipaca/snappy/systemimage-exported-consts]

741. By John Lenton on 2015-10-07

Reverted unneeded change to SysImgRepo's All() method

[Leo Arias (elopio)]

review: Approve

=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-10-05 19:12:55 +0000
+++ snappy/systemimage.go	2015-10-07 15:55:08 +0000
@@ -39,11 +39,16 @@
 	"launchpad.net/snappy/provisioning"
 )
 
+// SystemImagePart have constant name, origin, and vendor.
 const (
-	systemImagePartName   = "ubuntu-core"
-	systemImagePartOrigin = "ubuntu"
-	systemImagePartVendor = "Canonical Ltd."
+	SystemImagePartName = "ubuntu-core"
+	// SystemImagePartOrigin is the origin of any system image part
+	SystemImagePartOrigin = "ubuntu"
+	// SystemImagePartVendor is the vendor of any system image part
+	SystemImagePartVendor = "Canonical Ltd."
+)
 
+const (
 	// location of the channel config on the filesystem.
 	//
 	// This file specifies the s-i version installed on the rootfs
@@ -97,17 +102,17 @@
 
 // Name returns the name
 func (s *SystemImagePart) Name() string {
-	return systemImagePartName
+	return SystemImagePartName
 }
 
 // Origin returns the origin ("ubuntu")
 func (s *SystemImagePart) Origin() string {
-	return systemImagePartOrigin
+	return SystemImagePartOrigin
 }
 
 // Vendor returns the vendor ("Canonical Ltd.")
 func (s *SystemImagePart) Vendor() string {
-	return systemImagePartVendor
+	return SystemImagePartVendor
 }
 
 // Version returns the version
@@ -248,7 +253,7 @@
 	if err = s.partition.ToggleNextBoot(); err != nil {
 		return "", err
 	}
-	return systemImagePartName, nil
+	return SystemImagePartName, nil
 }
 
 // Ensure the expected version update was applied to the expected partition.
@@ -440,7 +445,7 @@
 
 // Search searches the SystemImageRepository for the given terms
 func (s *SystemImageRepository) Search(terms string) (versions []Part, err error) {
-	if strings.Contains(terms, systemImagePartName) {
+	if strings.Contains(terms, SystemImagePartName) {
 		part := makeCurrentPart(s.partition)
 		versions = append(versions, part)
 	}
@@ -449,7 +454,7 @@
 
 // Details returns details for the given snap
 func (s *SystemImageRepository) Details(name string, origin string) ([]Part, error) {
-	if name == systemImagePartName && origin == systemImagePartOrigin {
+	if name == SystemImagePartName && origin == SystemImagePartOrigin {
 		return []Part{makeCurrentPart(s.partition)}, nil
 	}
 
@@ -457,28 +462,33 @@
 }
 
 // Updates returns the available updates
-func (s *SystemImageRepository) Updates() (parts []Part, err error) {
+func (s *SystemImageRepository) Updates() ([]Part, error) {
 	configFile := filepath.Join(systemImageRoot, systemImageChannelConfig)
 	updateStatus, err := systemImageClientCheckForUpdates(configFile)
+	if err != nil {
+		return nil, err
+	}
 
 	current := makeCurrentPart(s.partition)
 	// no VersionCompare here because the channel provides a "order" and
 	// that may go backwards when switching channels(?)
 	if current.Version() != updateStatus.targetVersion {
-		parts = append(parts, &SystemImagePart{
+		return []Part{&SystemImagePart{
 			version:        updateStatus.targetVersion,
 			versionDetails: updateStatus.targetVersionDetails,
 			lastUpdate:     updateStatus.lastUpdate,
 			updateSize:     updateStatus.updateSize,
 			channelName:    current.(*SystemImagePart).channelName,
-			partition:      s.partition})
+			partition:      s.partition}}, nil
 	}
 
-	return parts, err
+	return nil, nil
 }
 
 // Installed returns the installed snaps from this repository
-func (s *SystemImageRepository) Installed() (parts []Part, err error) {
+func (s *SystemImageRepository) Installed() ([]Part, error) {
+	var parts []Part
+
 	// current partition
 	curr := makeCurrentPart(s.partition)
 	if curr != nil {
@@ -491,7 +501,7 @@
 		parts = append(parts, other)
 	}
 
-	return parts, err
+	return parts, nil
 }
 
 // All installed parts. SystemImageParts are non-removable.

=== modified file 'snappy/systemimage_test.go'
--- snappy/systemimage_test.go	2015-09-29 09:45:15 +0000
+++ snappy/systemimage_test.go	2015-10-07 15:55:08 +0000
@@ -115,9 +115,9 @@
 	c.Assert(err, IsNil)
 	// we have one active and one inactive
 	c.Assert(parts, HasLen, 2)
-	c.Assert(parts[0].Name(), Equals, systemImagePartName)
-	c.Assert(parts[0].Origin(), Equals, systemImagePartOrigin)
-	c.Assert(parts[0].Vendor(), Equals, systemImagePartVendor)
+	c.Assert(parts[0].Name(), Equals, SystemImagePartName)
+	c.Assert(parts[0].Origin(), Equals, SystemImagePartOrigin)
+	c.Assert(parts[0].Vendor(), Equals, SystemImagePartVendor)
 	c.Assert(parts[0].Version(), Equals, "1")
 	c.Assert(parts[0].Hash(), Equals, "e09c13f68fccef3b2fe0f5c8ff5c61acf2173b170b1f2a3646487147690b0970ef6f2c555d7bcb072035f29ee4ea66a6df7f6bb320d358d3a7d78a0c37a8a549")
 	c.Assert(parts[0].IsActive(), Equals, true)
@@ -461,8 +461,8 @@
 	parts, err := s.systemImage.Installed()
 	c.Assert(err, IsNil)
 	c.Assert(parts, HasLen, 2)
-	c.Assert(parts[0].Origin(), Equals, systemImagePartOrigin)
-	c.Assert(parts[1].Origin(), Equals, systemImagePartOrigin)
+	c.Assert(parts[0].Origin(), Equals, SystemImagePartOrigin)
+	c.Assert(parts[1].Origin(), Equals, SystemImagePartOrigin)
 }
 
 func (s *SITestSuite) TestCannotUpdateIfSideLoaded(c *C) {