Merge lp:~chipaca/snappy/current-data-dir into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Have a “current” symlink in the system data dir ($SNAP_APP_DATA_DIR).

This adds a “current” symlink to the snap datadir.

Not to the home datadir though. That's more complicated.

[Leo Arias (elopio)]

the code looks correct to me. I installed hello-world with snappy from trunk and it does not create the link in /var/lib/apps/hello-world.canonical/. I installed it with snappy from this branch and the link is created. I removed the branch and the link is removed. All good.

review: Approve

=== modified file 'snappy/install_test.go'
--- snappy/install_test.go	2015-06-29 20:21:38 +0000
+++ snappy/install_test.go	2015-09-29 06:07:50 +0000
@@ -78,8 +78,13 @@
 	s.installThree(c, AllowUnauthenticated|DoInstallGC)
 
 	globs, err := filepath.Glob(filepath.Join(snapAppsDir, "foo.sideload", "*"))
-	c.Assert(err, IsNil)
-	c.Assert(globs, HasLen, 2+1) // +1 for "current"
+	c.Check(err, IsNil)
+	c.Check(globs, HasLen, 2+1) // +1 for "current"
+
+	// gc should leave one more data than app
+	globs, err = filepath.Glob(filepath.Join(snapDataDir, "foo.sideload", "*"))
+	c.Check(err, IsNil)
+	c.Check(globs, HasLen, 3+1) // +1 for "current"
 }
 
 // check that if flags does not include DoInstallGC, no gc is done
@@ -89,6 +94,10 @@
 	globs, err := filepath.Glob(filepath.Join(snapAppsDir, "foo.sideload", "*"))
 	c.Assert(err, IsNil)
 	c.Assert(globs, HasLen, 3+1) // +1 for "current"
+
+	globs, err = filepath.Glob(filepath.Join(snapDataDir, "foo.sideload", "*"))
+	c.Check(err, IsNil)
+	c.Check(globs, HasLen, 3+1) // +1 for "current"
 }
 
 func (s *SnapTestSuite) TestInstallAppTwiceFails(c *C) {

=== modified file 'snappy/purge_test.go'
--- snappy/purge_test.go	2015-06-09 19:11:54 +0000
+++ snappy/purge_test.go	2015-09-29 06:07:50 +0000
@@ -114,10 +114,12 @@
 	inter := &MockProgressMeter{}
 	ddir, part := s.mkpkg(c)
 	c.Assert(part.activate(true, inter), IsNil)
+	canary := filepath.Join(ddir, "canary")
+	c.Assert(os.Mkdir(canary, 0755), IsNil)
 
 	err := Purge("hello-app", DoPurgeActive, inter)
 	c.Check(err, IsNil)
-	c.Check(helpers.FileExists(ddir), Equals, false)
+	c.Check(helpers.FileExists(canary), Equals, false)
 	c.Check(inter.notified, HasLen, 0)
 }
 
@@ -125,6 +127,8 @@
 	inter := &MockProgressMeter{}
 	ddir, part := s.mkpkg(c, "v1", "services:\n - name: svc")
 	c.Assert(part.activate(true, inter), IsNil)
+	canary := filepath.Join(ddir, "canary")
+	c.Assert(os.Mkdir(canary, 0755), IsNil)
 
 	called := [][]string{}
 	systemd.SystemctlCmd = func(cmd ...string) ([]byte, error) {
@@ -134,7 +138,7 @@
 
 	err := Purge("hello-app", DoPurgeActive, inter)
 	c.Check(err, IsNil)
-	c.Check(helpers.FileExists(ddir), Equals, false)
+	c.Check(helpers.FileExists(canary), Equals, false)
 	c.Assert(inter.notified, HasLen, 1)
 	c.Check(inter.notified[0], Matches, `Waiting for .* to stop.`)
 	rv := make(map[string]int)

=== modified file 'snappy/set_test.go'
--- snappy/set_test.go	2015-06-02 20:46:07 +0000
+++ snappy/set_test.go	2015-09-29 06:07:50 +0000
@@ -22,7 +22,6 @@
 import (
 	"os"
 	"path/filepath"
-	"strings"
 
 	. "gopkg.in/check.v1"
 
@@ -80,7 +79,12 @@
 
 	path, err := filepath.EvalSymlinks(filepath.Join(snapAppsDir, fooComposedName, "current"))
 	c.Assert(err, IsNil)
-	c.Assert(strings.HasSuffix(path, "/"+fooComposedName+"/2.0"), Equals, true)
+	c.Check(path, Equals, filepath.Join(snapAppsDir, fooComposedName, "2.0"))
+
+	path, err = filepath.EvalSymlinks(filepath.Join(snapDataDir, fooComposedName, "current"))
+	c.Assert(err, IsNil)
+	c.Check(path, Equals, filepath.Join(snapDataDir, fooComposedName, "2.0"))
+
 	meter := &MockProgressMeter{}
 
 	// setActive has some ugly print
@@ -94,6 +98,8 @@
 
 	err = makeSnapActiveByNameAndVersion("foo", "1.0", meter)
 	c.Assert(err, IsNil)
-	path, err = filepath.EvalSymlinks(filepath.Join(snapAppsDir, fooComposedName, "current"))
-	c.Assert(strings.HasSuffix(path, "/"+fooComposedName+"/1.0"), Equals, true)
+	path, _ = filepath.EvalSymlinks(filepath.Join(snapAppsDir, fooComposedName, "current"))
+	c.Check(path, Equals, filepath.Join(snapAppsDir, fooComposedName, "1.0"))
+	path, _ = filepath.EvalSymlinks(filepath.Join(snapDataDir, fooComposedName, "current"))
+	c.Check(path, Equals, filepath.Join(snapDataDir, fooComposedName, "1.0"))
 }

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-09-16 11:23:27 +0000
+++ snappy/snapp.go	2015-09-29 06:07:50 +0000
@@ -1036,8 +1036,22 @@
 		logger.Noticef("Failed to remove %q: %v", currentActiveSymlink, err)
 	}
 
+	dbase := filepath.Join(snapDataDir, QualifiedName(s))
+	currentDataSymlink := filepath.Join(dbase, "current")
+	if err := os.Remove(currentDataSymlink); err != nil && !os.IsNotExist(err) {
+		logger.Noticef("Failed to remove %q: %v", currentDataSymlink, err)
+	}
+
 	// symlink is relative to parent dir
-	return os.Symlink(filepath.Base(s.basedir), currentActiveSymlink)
+	if err := os.Symlink(filepath.Base(s.basedir), currentActiveSymlink); err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll(filepath.Join(dbase, s.Version()), 0755); err != nil {
+		return err
+	}
+
+	return os.Symlink(filepath.Base(s.basedir), currentDataSymlink)
 }
 
 func (s *SnapPart) deactivate(inhibitHooks bool, inter interacter) error {
@@ -1083,6 +1097,11 @@
 		logger.Noticef("Failed to remove %q: %v", currentSymlink, err)
 	}
 
+	currentDataSymlink := filepath.Join(snapDataDir, QualifiedName(s), "current")
+	if err := os.Remove(currentDataSymlink); err != nil && !os.IsNotExist(err) {
+		logger.Noticef("Failed to remove %q: %v", currentDataSymlink, err)
+	}
+
 	return nil
 }