Merge lp:~sergiusens/snappy/originsOrNamespaceWhatever into lp:~snappy-dev/snappy/15.04-deprecated

[Sergio Schvezov]

Save store manifest on install and use that information to present the namespace/origin.

This wasn't a straightforward backport.

[lp:~sergiusens/snappy/originsOrNamespaceWhatever]

454. By Sergio Schvezov on 2015-07-06

Read the type from the store

[Ricardo Salveti (rsalveti)]

Looks good.

review: Approve

=== modified file 'snappy/dirs.go'
--- snappy/dirs.go	2015-04-20 16:51:29 +0000
+++ snappy/dirs.go	2015-07-06 19:42:05 +0000
@@ -30,6 +30,7 @@
 	snapAppArmorDir  string
 	snapSeccompDir   string
 	snapUdevRulesDir string
+	snapMetaDir      string
 
 	snapBinariesDir  string
 	snapServicesDir  string
@@ -39,6 +40,8 @@
 	cloudMetaDataFile   string
 )
 
+var snappyDir = filepath.Join("var", "lib", "snappy")
+
 // SetRootDir allows settings a new global root directory, this is useful
 // for e.g. chroot operations
 func SetRootDir(rootdir string) {
@@ -50,6 +53,7 @@
 	snapDataHomeGlob = filepath.Join(rootdir, "/home/*/apps/")
 	snapAppArmorDir = filepath.Join(rootdir, "/var/lib/apparmor/clicks")
 	snapSeccompDir = filepath.Join(rootdir, "/var/lib/snappy/seccomp/profiles")
+	snapMetaDir = filepath.Join(rootdir, snappyDir, "meta")
 
 	snapBinariesDir = filepath.Join(snapAppsDir, "bin")
 	snapServicesDir = filepath.Join(rootdir, "/etc/systemd/system")

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-06-04 15:00:44 +0000
+++ snappy/errors.go	2015-07-06 19:42:05 +0000
@@ -269,3 +269,15 @@
 func (e ErrApparmorGenerate) Error() string {
 	return fmt.Sprintf("apparmor generate fails with %v: '%v'", e.exitCode, string(e.output))
 }
+
+// ErrInvalidYaml is returned if a yaml file can not be parsed
+type ErrInvalidYaml struct {
+	file string
+	err  error
+	yaml []byte
+}
+
+func (e *ErrInvalidYaml) Error() string {
+	// %#v of string(yaml) so the yaml is presented as a human-readable string, but in a single greppable line
+	return fmt.Sprintf("can not parse %s: %v (from: %#v)", e.file, e.err, string(e.yaml))
+}

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-04-30 16:56:15 +0000
+++ snappy/parts.go	2015-07-06 19:42:05 +0000
@@ -18,9 +18,11 @@
 package snappy
 
 import (
+	"encoding/json"
 	"fmt"
 	"net"
 	"net/url"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -30,6 +32,29 @@
 // SnapType represents the kind of snap (app, core, frameworks, oem)
 type SnapType string
 
+// MarshalJSON returns *m as the JSON encoding of m.
+func (m SnapType) MarshalJSON() ([]byte, error) {
+	return json.Marshal(string(m))
+}
+
+// UnmarshalJSON sets *m to a copy of data.
+func (m *SnapType) UnmarshalJSON(data []byte) error {
+	var str string
+	if err := json.Unmarshal(data, &str); err != nil {
+		return err
+	}
+
+	// this is a workaround as the store sends "application" but snappy uses
+	// "app" for TypeApp
+	if str == "application" {
+		*m = SnapTypeApp
+	} else {
+		*m = SnapType(str)
+	}
+
+	return nil
+}
+
 // SystemConfig is a config map holding configs for multiple packages
 type SystemConfig map[string]interface{}
 
@@ -339,3 +364,8 @@
 func PackageNameActive(name string) bool {
 	return ActiveSnapByName(name) != nil
 }
+
+// manifestPath returns the would be path for the store manifest meta data
+func manifestPath(s Part) string {
+	return filepath.Join(snapMetaDir, fmt.Sprintf("%s_%s.manifest", Dirname(s), s.Version()))
+}

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-07-06 15:35:48 +0000
+++ snappy/snapp.go	2015-07-06 19:42:05 +0000
@@ -163,6 +163,7 @@
 // SnapPart represents a generic snap type
 type SnapPart struct {
 	m           *packageYaml
+	remoteM     *remoteSnap
 	namespace   string
 	hash        string
 	isActive    bool
@@ -214,13 +215,13 @@
 	IconURL         string             `json:"icon_url"`
 	LastUpdated     string             `json:"last_updated,omitempty"`
 	Name            string             `json:"package_name"`
-	Namespace       string             `json:"origin"`
+	Namespace       string             `json:"origin" yaml:"origin"`
 	Prices          map[string]float64 `json:"prices,omitempty"`
 	Publisher       string             `json:"publisher,omitempty"`
 	RatingsAverage  float64            `json:"ratings_average,omitempty"`
 	SupportURL      string             `json:"support_url"`
 	Title           string             `json:"title"`
-	Type            string             `json:"content,omitempty"`
+	Type            SnapType           `json:"content"`
 	Version         string             `json:"version"`
 }
 
@@ -478,6 +479,20 @@
 	}
 	part.hash = h.ArchiveSha512
 
+	remoteManifestPath := manifestPath(part)
+	if helpers.FileExists(remoteManifestPath) {
+		content, err := ioutil.ReadFile(remoteManifestPath)
+		if err != nil {
+			return nil, err
+		}
+
+		var r remoteSnap
+		if err := yaml.Unmarshal(content, &r); err != nil {
+			return nil, &ErrInvalidYaml{file: remoteManifestPath, err: err, yaml: content}
+		}
+		part.remoteM = &r
+	}
+
 	return part, nil
 }
 
@@ -509,6 +524,10 @@
 
 // Namespace returns the namespace
 func (s *SnapPart) Namespace() string {
+	if r := s.remoteM; r != nil {
+		return r.Namespace
+	}
+
 	return s.namespace
 }
 
@@ -552,6 +571,10 @@
 
 // DownloadSize returns the dowload size
 func (s *SnapPart) DownloadSize() int64 {
+	if r := s.remoteM; r != nil {
+		return r.DownloadSize
+	}
+
 	return -1
 }
 
@@ -852,8 +875,7 @@
 
 // Type returns the type of the SnapPart (app, oem, ...)
 func (s *RemoteSnapPart) Type() SnapType {
-	// FIXME: the store does not publish this info
-	return SnapTypeApp
+	return s.pkg.Type
 }
 
 // Name returns the name
@@ -981,6 +1003,20 @@
 	return w.Name(), w.Sync()
 }
 
+func (s *RemoteSnapPart) saveStoreManifest() error {
+	content, err := yaml.Marshal(s.pkg)
+	if err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll(snapMetaDir, 0755); err != nil {
+		return err
+	}
+
+	// don't worry about previous contents
+	return ioutil.WriteFile(manifestPath(s), content, 0644)
+}
+
 // Install installs the snap
 func (s *RemoteSnapPart) Install(pbar progress.Meter, flags InstallFlags) (string, error) {
 	downloadedSnap, err := s.Download(pbar)
@@ -989,6 +1025,10 @@
 	}
 	defer os.Remove(downloadedSnap)
 
+	if err := s.saveStoreManifest(); err != nil {
+		return "", err
+	}
+
 	return installClick(downloadedSnap, flags, pbar, s.Namespace())
 }
 

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-06-04 15:00:44 +0000
+++ snappy/snapp_test.go	2015-07-06 19:42:05 +0000
@@ -656,6 +656,10 @@
 
 	snap := RemoteSnapPart{}
 	snap.pkg.AnonDownloadURL = mockServer.URL + "/snap"
+	snap.pkg.IconURL = mockServer.URL + "/icon"
+	snap.pkg.Name = "foo"
+	snap.pkg.Namespace = "bar"
+	snap.pkg.Version = "1.0"
 
 	p := &MockProgressMeter{}
 	name, err := snap.Install(p, 0)
@@ -664,6 +668,15 @@
 	st, err := os.Stat(snapPackage)
 	c.Assert(err, IsNil)
 	c.Assert(p.written, Equals, int(st.Size()))
+
+	installed, err := ListInstalled()
+	c.Assert(err, IsNil)
+	c.Assert(installed, HasLen, 1)
+
+	c.Check(installed[0].Namespace(), Equals, "bar")
+
+	_, err = os.Stat(filepath.Join(snapMetaDir, "foo.bar_1.0.manifest"))
+	c.Check(err, IsNil)
 }
 
 func (s *SnapTestSuite) TestRemoteSnapUpgradeService(c *C) {
@@ -1026,6 +1039,30 @@
 	c.Check(yaml.checkForPackageInstalled("otherns"), IsNil)
 }
 
+func (s *SnapTestSuite) TestUsesStoreMetaData(c *C) {
+	data := "name: afoo\nversion: 1\nvendor: foo\ntype: framework"
+	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
+	c.Assert(err, IsNil)
+	c.Assert(makeSnapActive(yamlPath), IsNil)
+
+	err = os.MkdirAll(snapMetaDir, 0755)
+	c.Assert(err, IsNil)
+
+	data = "name: afoo\nalias: afoo\ndescription: something nice\ndownloadsize: 10\norigin: someplace"
+	err = ioutil.WriteFile(filepath.Join(snapMetaDir, "afoo_1.manifest"), []byte(data), 0644)
+	c.Assert(err, IsNil)
+
+	snaps, err := ListInstalled()
+	c.Assert(err, IsNil)
+	c.Assert(snaps, HasLen, 1)
+
+	c.Check(snaps[0].Name(), Equals, "afoo")
+	c.Check(snaps[0].Version(), Equals, "1")
+	c.Check(snaps[0].Type(), Equals, SnapTypeFramework)
+	c.Check(snaps[0].Namespace(), Equals, "someplace")
+	c.Check(snaps[0].DownloadSize(), Equals, int64(10))
+}
+
 func (s *SnapTestSuite) TestDetectsNameClash(c *C) {
 	data := []byte(`name: afoo
 version: 1.0