Merge lp:~mvo/snappy/snappy-lp1460152-workaround-15.04 into lp:~snappy-dev/snappy/15.04-deprecated

[Michael Vogt]

This is a cherry pick of the workaround for LP: #1460152 for the 15.04
branch.

This is a cherry pick of the workaround for LP: #1460152 for the 15.04
branch.

Unmerged revisions

451. By Michael Vogt on 2015-06-04

cherry pick r486 from lp:~mvo/snappy/snappy-lp1460152-workaround

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-06-04 15:00:44 +0000
+++ helpers/helpers.go	2015-06-04 20:52:35 +0000
@@ -471,3 +471,19 @@
 		"SNAPP_APP_USER_DATA_PATH={{.Home}}{{.AppPath}}",
 	})
 }
+
+// CleanDir cleans all regular files in the given directory
+func CleanDir(dir string) error {
+	dents, err := ioutil.ReadDir(dir)
+	if err != nil {
+		return err
+	}
+	for _, dent := range dents {
+		if dent.Mode().IsRegular() {
+			if err := os.Remove(filepath.Join(dir, dent.Name())); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
 
=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-06-04 15:00:44 +0000
+++ helpers/helpers_test.go	2015-06-04 20:52:35 +0000
@@ -382,3 +382,14 @@
 	c.Check(err, NotNil)
 	c.Check(err, ErrorMatches, ".*permission denied.*")
 }
+
+func (ts *HTestSuite) TestCleanDir(c *C) {
+	d := c.MkDir()
+	canary := filepath.Join(d, "foo")
+	err := ioutil.WriteFile(canary, []byte(nil), 0644)
+	c.Assert(err, IsNil)
+
+	err = CleanDir(d)
+	c.Assert(err, IsNil)
+	c.Assert(FileExists(canary), Equals, false)
+}
 
=== modified file 'snappy/dirs.go'
--- snappy/dirs.go	2015-04-20 16:51:29 +0000
+++ snappy/dirs.go	2015-06-04 20:52:35 +0000
@@ -31,6 +31,8 @@
 	snapSeccompDir   string
 	snapUdevRulesDir string
 
+	systemApparmorProfileCacheDir string
+
 	snapBinariesDir  string
 	snapServicesDir  string
 	snapBusPolicyDir string
@@ -60,4 +62,6 @@
 	cloudMetaDataFile = filepath.Join(rootdir, "/var/lib/cloud/seed/nocloud-net/meta-data")
 
 	snapUdevRulesDir = filepath.Join(rootdir, "/etc/udev/rules.d")
+
+	systemApparmorProfileCacheDir = filepath.Join(rootdir, "/etc/apparmor.d/cache")
 }
 
=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-05-29 11:52:39 +0000
+++ snappy/systemimage.go	2015-06-04 20:52:35 +0000
@@ -227,12 +227,25 @@
 	if pb != nil {
 		pb.Notify("Updating boot files")
 	}
+
+	// this needs to go once we have a clean fix for #1460152
+	if err := s.postUpgradeHacks(); err != nil {
+		return "", err
+	}
+
 	if err = s.partition.ToggleNextBoot(); err != nil {
 		return "", err
 	}
 	return systemImagePartName, nil
 }
 
+// this makes me cry
+func (s *SystemImagePart) postUpgradeHacks() error {
+	// Apply HACK to deal with bug #1460152 where the apparmor
+	// cache is confused after the upgrade
+	return helpers.CleanDir(systemApparmorProfileCacheDir)
+}
+
 // Ensure the expected version update was applied to the expected partition.
 func (s *SystemImagePart) verifyUpgradeWasApplied() error {
 	// The upgrade has now been applied, so check that the expected
 
=== modified file 'snappy/systemimage_test.go'
--- snappy/systemimage_test.go	2015-04-22 10:35:09 +0000
+++ snappy/systemimage_test.go	2015-06-04 20:52:35 +0000
@@ -56,6 +56,13 @@
 	// setup fake /other partition
 	makeFakeSystemImageChannelConfig(c, filepath.Join(tempdir, "other", systemImageChannelConfig), "2")
 
+	// fake the apparmor.d/cache
+	systemApparmorProfileCacheDir = filepath.Join(systemImageRoot, "etc", "apparmor.d", "cache")
+	err := os.MkdirAll(systemApparmorProfileCacheDir, 0755)
+	c.Assert(err, IsNil)
+	err = ioutil.WriteFile(filepath.Join(systemApparmorProfileCacheDir, "some-cache"), []byte(nil), 0644)
+	c.Assert(err, IsNil)
+
 	// run test webserver instead of talking to the real one
 	//
 	// The mock webserver versions  "1" and "2"
@@ -189,6 +196,29 @@
 	c.Assert(pb.progress, DeepEquals, []float64{20.0, 40.0, 60.0, 80.0, 100.0})
 }
 
+func (s *SITestSuite) TestSystemImagePartInstalAppliesHackLp1460152(c *C) {
+	// add a update
+	mockSystemImageIndexJSON = fmt.Sprintf(mockSystemImageIndexJSONTemplate, "2")
+	parts, err := s.systemImage.Updates()
+
+	sp := parts[0].(*SystemImagePart)
+	mockPartition := MockPartition{}
+	sp.partition = &mockPartition
+
+	dents, err := ioutil.ReadDir(systemApparmorProfileCacheDir)
+	c.Assert(err, IsNil)
+	c.Assert(dents, HasLen, 1)
+
+	pb := &MockProgressMeter{}
+	// do the install
+	_, err = sp.Install(pb, 0)
+	c.Assert(err, IsNil)
+
+	dents, err = ioutil.ReadDir(systemApparmorProfileCacheDir)
+	c.Assert(err, IsNil)
+	c.Assert(dents, HasLen, 0)
+}
+
 func (s *SITestSuite) TestSystemImagePartInstallUpdatesBroken(c *C) {
 	// fake a broken upgrade
 	scriptContent := `#!/bin/sh