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

[John Lenton]

Override sideloaded package version.

When sideloading a package use the base 36 numeral for the current utimestamp instead of the package-provided version.

[Federico Gimenez (fgimenez)]

PASSED: Continuous integration, rev:634
http://10.55.60.183:8080/job/snappy-rolling-ci/22/
Executed test runs:

Click here to trigger a rebuild:
http://10.55.60.183:8080/job/snappy-rolling-ci/22/rebuild

review: Approve (continuous-integration)

[Leo Arias (elopio)]

sorry, ignore the spirit of federico. I'm going to shut down this jenkins and start a new one.

[Snappy Tarmac (snappydevtarmac)]

PASSED: Continuous integration, rev:634
$BUILD_URL
Executed test runs:

Click here to trigger a rebuild:
$BUILD_URL/rebuild

review: Approve (continuous-integration)

[Leo Arias (elopio)]

damn it with this url.

[lp:~chipaca/snappy/schmideload]

635. By John Lenton on 2015-08-21

oops, package version sorting chunks things around numbers; remove numbers from "random" versions.

636. By John Lenton on 2015-08-21

fix tests of random string

[Michael Vogt (mvo)]

Looks good, thanks!

review: Approve

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-07-01 21:09:59 +0000
+++ helpers/helpers.go	2015-08-21 12:14:29 +0000
@@ -261,9 +261,10 @@
 	return fileInfo.IsDir()
 }
 
+const letters = "ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy"
+
 // MakeRandomString returns a random string of length length
 func MakeRandomString(length int) string {
-	var letters = "abcdefghijklmnopqrstuvwxyABCDEFGHIJKLMNOPQRSTUVWXY"
 
 	out := ""
 	for i := 0; i < length; i++ {
@@ -273,6 +274,19 @@
 	return out
 }
 
+// NewSideloadVersion returns a version number such that later calls
+// should return versions that compare larger.
+func NewSideloadVersion() string {
+	n := time.Now().UTC().UnixNano()
+	bs := make([]byte, 12)
+	for i := 11; i >= 0; i-- {
+		bs[i] = letters[n&31]
+		n = n >> 5
+	}
+
+	return string(bs)
+}
+
 // AtomicWriteFile updates the filename atomically and works otherwise
 // exactly like io/ioutil.WriteFile()
 func AtomicWriteFile(filename string, data []byte, perm os.FileMode) (err error) {

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-07-01 18:27:44 +0000
+++ helpers/helpers_test.go	2015-08-21 12:14:29 +0000
@@ -215,10 +215,10 @@
 	rand.Seed(1)
 
 	s1 := MakeRandomString(10)
-	c.Assert(s1, Equals, "GMWjGsAPga")
+	c.Assert(s1, Equals, "gmwJgSapGA")
 
 	s2 := MakeRandomString(5)
-	c.Assert(s2, Equals, "TlmOD")
+	c.Assert(s2, Equals, "tLMod")
 }
 
 func (ts *HTestSuite) TestAtomicWriteFile(c *C) {

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-07-29 00:58:34 +0000
+++ snappy/click.go	2015-08-21 12:14:29 +0000
@@ -471,21 +471,7 @@
 	return dir[len(globalRootDir):]
 }
 
-func checkPackageForNameClashes(baseDir string) error {
-	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
-	if err != nil {
-		return err
-	}
-
-	return m.checkForNameClashes()
-}
-
-func addPackageServices(baseDir string, inhibitHooks bool, inter interacter) error {
-	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
-	if err != nil {
-		return err
-	}
-
+func (m *packageYaml) addPackageServices(baseDir string, inhibitHooks bool, inter interacter) error {
 	for _, service := range m.ServiceYamls {
 		aaProfile, err := getSecurityProfile(m, service.Name, baseDir)
 		if err != nil {
@@ -547,11 +533,7 @@
 	return nil
 }
 
-func removePackageServices(baseDir string, inter interacter) error {
-	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
-	if err != nil {
-		return err
-	}
+func (m *packageYaml) removePackageServices(baseDir string, inter interacter) error {
 	sysd := systemd.New(globalRootDir, inter)
 	for _, service := range m.ServiceYamls {
 		serviceName := filepath.Base(generateServiceFileName(m, service))
@@ -589,12 +571,7 @@
 	return nil
 }
 
-func addPackageBinaries(baseDir string) error {
-	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
-	if err != nil {
-		return err
-	}
-
+func (m *packageYaml) addPackageBinaries(baseDir string) error {
 	if err := os.MkdirAll(snapBinariesDir, 0755); err != nil {
 		return err
 	}
@@ -622,11 +599,7 @@
 	return nil
 }
 
-func removePackageBinaries(baseDir string) error {
-	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
-	if err != nil {
-		return err
-	}
+func (m *packageYaml) removePackageBinaries(baseDir string) error {
 	for _, binary := range m.Binaries {
 		os.Remove(generateBinaryName(m, binary))
 	}
@@ -634,7 +607,7 @@
 	return nil
 }
 
-func addOneSecurityPolicy(m *packageYaml, name string, sd SecurityDefinitions, baseDir string) error {
+func (m *packageYaml) addOneSecurityPolicy(name string, sd SecurityDefinitions, baseDir string) error {
 	profileName, err := getSecurityProfile(m, filepath.Base(name), baseDir)
 	if err != nil {
 		return err
@@ -658,13 +631,13 @@
 	//       it all here
 
 	for _, svc := range m.ServiceYamls {
-		if err := addOneSecurityPolicy(m, svc.Name, svc.SecurityDefinitions, baseDir); err != nil {
+		if err := m.addOneSecurityPolicy(svc.Name, svc.SecurityDefinitions, baseDir); err != nil {
 			return err
 		}
 	}
 
 	for _, bin := range m.Binaries {
-		if err := addOneSecurityPolicy(m, bin.Name, bin.SecurityDefinitions, baseDir); err != nil {
+		if err := m.addOneSecurityPolicy(bin.Name, bin.SecurityDefinitions, baseDir); err != nil {
 			return err
 		}
 	}
@@ -672,7 +645,7 @@
 	return nil
 }
 
-func removeOneSecurityPolicy(m *packageYaml, name, baseDir string) error {
+func (m *packageYaml) removeOneSecurityPolicy(name, baseDir string) error {
 	profileName, err := getSecurityProfile(m, filepath.Base(name), baseDir)
 	if err != nil {
 		return err
@@ -688,13 +661,13 @@
 func (m *packageYaml) removeSecurityPolicy(baseDir string) error {
 	// TODO: move apparmor policy removal here
 	for _, service := range m.ServiceYamls {
-		if err := removeOneSecurityPolicy(m, service.Name, baseDir); err != nil {
+		if err := m.removeOneSecurityPolicy(service.Name, baseDir); err != nil {
 			return err
 		}
 	}
 
 	for _, binary := range m.Binaries {
-		if err := removeOneSecurityPolicy(m, binary.Name, baseDir); err != nil {
+		if err := m.removeOneSecurityPolicy(binary.Name, baseDir); err != nil {
 			return err
 		}
 	}
@@ -724,6 +697,10 @@
 		cm.Name = fmt.Sprintf("%s.%s", cm.Name, origin)
 	}
 
+	if origin == sideloadedOrigin {
+		cm.Version = filepath.Base(filepath.Join(clickMetaDir, "..", ".."))
+	}
+
 	outStr, err := json.MarshalIndent(cm, "", "  ")
 	if err != nil {
 		return err

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-07-29 00:58:34 +0000
+++ snappy/click_test.go	2015-08-21 12:14:29 +0000
@@ -1134,8 +1134,10 @@
 
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, "")
 	c.Assert(err, IsNil)
+	m, err := parsePackageYamlFile(yamlFile)
+	c.Assert(err, IsNil)
 	baseDir := filepath.Dir(filepath.Dir(yamlFile))
-	err = addPackageServices(baseDir, false, nil)
+	err = m.addPackageServices(baseDir, false, nil)
 	c.Assert(err, IsNil)
 
 	content, err := ioutil.ReadFile(filepath.Join(s.tempdir, "/etc/systemd/system/hello-app_svc1_1.10.service"))
@@ -1161,8 +1163,10 @@
 `
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, yaml)
 	c.Assert(err, IsNil)
+	m, err := parsePackageYamlFile(yamlFile)
+	c.Assert(err, IsNil)
 	baseDir := filepath.Dir(filepath.Dir(yamlFile))
-	err = addPackageServices(baseDir, false, nil)
+	err = m.addPackageServices(baseDir, false, nil)
 	c.Assert(err, IsNil)
 
 	content, err := ioutil.ReadFile(filepath.Join(s.tempdir, "/etc/dbus-1/system.d/foo_bar_1.conf"))
@@ -1181,8 +1185,10 @@
 `
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, yaml)
 	c.Assert(err, IsNil)
+	m, err := parsePackageYamlFile(yamlFile)
+	c.Assert(err, IsNil)
 	baseDir := filepath.Dir(filepath.Dir(yamlFile))
-	err = addPackageServices(baseDir, false, nil)
+	err = m.addPackageServices(baseDir, false, nil)
 	c.Assert(err, IsNil)
 
 	_, err = ioutil.ReadFile(filepath.Join(s.tempdir, "/etc/dbus-1/system.d/foo_bar_1.conf"))
@@ -1197,8 +1203,10 @@
 
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, "")
 	c.Assert(err, IsNil)
+	m, err := parsePackageYamlFile(yamlFile)
+	c.Assert(err, IsNil)
 	baseDir := filepath.Dir(filepath.Dir(yamlFile))
-	err = addPackageBinaries(baseDir)
+	err = m.addPackageBinaries(baseDir)
 	c.Assert(err, IsNil)
 
 	content, err := ioutil.ReadFile(filepath.Join(s.tempdir, "/apps/bin/hello-app.hello"))
@@ -1523,8 +1531,10 @@
    stop-timeout: 25
 `)
 	c.Assert(err, IsNil)
+	m, err := parsePackageYamlFile(yamlFile)
+	c.Assert(err, IsNil)
 	inter := &MockProgressMeter{}
-	c.Check(removePackageServices(filepath.Dir(filepath.Dir(yamlFile)), inter), IsNil)
+	c.Check(m.removePackageServices(filepath.Dir(filepath.Dir(yamlFile)), inter), IsNil)
 	c.Assert(len(inter.notified) > 0, Equals, true)
 	c.Check(inter.notified[len(inter.notified)-1], Equals, "wat_wat_42.service refused to stop, killing.")
 	c.Assert(len(sysdLog) >= 3, Equals, true)

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-07-23 11:05:37 +0000
+++ snappy/snapp.go	2015-08-21 12:14:29 +0000
@@ -571,6 +571,11 @@
 	if m.Type == pkg.TypeOem {
 		targetDir = snapOemDir
 	}
+
+	if origin == sideloadedOrigin {
+		m.Version = helpers.NewSideloadVersion()
+	}
+
 	fullName := m.qualifiedName(origin)
 	instDir := filepath.Join(targetDir, fullName, m.Version)
 
@@ -594,6 +599,10 @@
 		m:       m,
 	}
 
+	if origin == sideloadedOrigin {
+		m.Version = filepath.Base(part.basedir)
+	}
+
 	// check if the part is active
 	allVersionsDir := filepath.Dir(part.basedir)
 	p, err := filepath.EvalSymlinks(filepath.Join(allVersionsDir, "current"))
@@ -658,6 +667,10 @@
 
 // Version returns the version
 func (s *SnapPart) Version() string {
+	if s.basedir != "" {
+		return filepath.Base(s.basedir)
+	}
+
 	return s.m.Version
 }
 
@@ -988,11 +1001,11 @@
 	}
 
 	// add the "binaries:" from the package.yaml
-	if err := addPackageBinaries(s.basedir); err != nil {
+	if err := s.m.addPackageBinaries(s.basedir); err != nil {
 		return err
 	}
 	// add the "services:" from the package.yaml
-	if err := addPackageServices(s.basedir, inhibitHooks, inter); err != nil {
+	if err := s.m.addPackageServices(s.basedir, inhibitHooks, inter); err != nil {
 		return err
 	}
 
@@ -1020,11 +1033,11 @@
 	}
 
 	// remove generated services, binaries, clickHooks, security policy
-	if err := removePackageBinaries(s.basedir); err != nil {
+	if err := s.m.removePackageBinaries(s.basedir); err != nil {
 		return err
 	}
 
-	if err := removePackageServices(s.basedir, inter); err != nil {
+	if err := s.m.removePackageServices(s.basedir, inter); err != nil {
 		return err
 	}
 

=== modified file 'snappy/sort_test.go'
--- snappy/sort_test.go	2015-06-02 20:46:07 +0000
+++ snappy/sort_test.go	2015-08-21 12:14:29 +0000
@@ -22,6 +22,8 @@
 import (
 	"sort"
 
+	"launchpad.net/snappy/helpers"
+
 	. "gopkg.in/check.v1"
 )
 
@@ -88,3 +90,14 @@
 	c.Assert(snaps[0].Version(), Equals, "1.0")
 	c.Assert(snaps[1].Version(), Equals, "2.0")
 }
+
+func (s *SortTestSuite) TestSideloadVersion(c *C) {
+	n := 1000
+	vs := make(ByVersion, n)
+
+	for i := 0; i < n; i++ {
+		vs[i] = helpers.NewSideloadVersion()
+	}
+
+	c.Check(sort.IsSorted(vs), Equals, true)
+}