many: rename dirs.SnapSnapsDir to SnapMountDir

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
canonical · Aug 24, 2016 · f538621 · f538621
1 parent 4ce828f
commit f538621
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/cmd/snap-exec/main_test.go b/cmd/snap-exec/main_test.go
@@ -145,7 +145,7 @@ func (s *snapExecSuite) TestSnapExecAppIntegration(c *C) {
 	// launch and verify its run the right way
 	err := snapExecApp("snapname.app", "42", "stop", []string{"arg1", "arg2"})
 	c.Assert(err, IsNil)
-	c.Check(execArgv0, Equals, fmt.Sprintf("%s/snapname/42/stop-app", dirs.SnapSnapsDir))
+	c.Check(execArgv0, Equals, fmt.Sprintf("%s/snapname/42/stop-app", dirs.SnapMountDir))
 	c.Check(execArgs, DeepEquals, []string{execArgv0, "arg1", "arg2"})
 	c.Check(execEnv, testutil.Contains, "LD_LIBRARY_PATH=/some/path\n")
 }
@@ -167,7 +167,7 @@ func (s *snapExecSuite) TestSnapExecHookIntegration(c *C) {
 	// launch and verify it ran correctly
 	err := snapExecHook("snapname", "42", "apply-config")
 	c.Assert(err, IsNil)
-	c.Check(execArgv0, Equals, fmt.Sprintf("%s/snapname/42/meta/hooks/apply-config", dirs.SnapSnapsDir))
+	c.Check(execArgv0, Equals, fmt.Sprintf("%s/snapname/42/meta/hooks/apply-config", dirs.SnapMountDir))
 	c.Check(execArgs, DeepEquals, []string{execArgv0})
 }
 

diff --git a/cmd/snap/cmd_run_test.go b/cmd/snap/cmd_run_test.go
@@ -76,7 +76,7 @@ func (s *SnapSuite) TestSnapRunSnapExecEnv(c *check.C) {
 	sort.Strings(env)
 	c.Check(env, check.DeepEquals, []string{
 		"PATH=${PATH}:/usr/lib/snapd",
-		fmt.Sprintf("SNAP=%s/snapname/42", dirs.SnapSnapsDir),
+		fmt.Sprintf("SNAP=%s/snapname/42", dirs.SnapMountDir),
 		fmt.Sprintf("SNAP_ARCH=%s", arch.UbuntuArchitecture()),
 		"SNAP_COMMON=/var/snap/snapname/common",
 		"SNAP_DATA=/var/snap/snapname/42",

diff --git a/daemon/api.go b/daemon/api.go
@@ -1132,7 +1132,7 @@ func iconGet(st *state.State, name string) Response {
 	}
 
 	path := filepath.Clean(snapIcon(info))
-	if !strings.HasPrefix(path, dirs.SnapSnapsDir) {
+	if !strings.HasPrefix(path, dirs.SnapMountDir) {
 		// XXX: how could this happen?
 		return BadRequest("requested icon is not in snap path")
 	}

diff --git a/daemon/api_test.go b/daemon/api_test.go
@@ -144,7 +144,7 @@ func (s *apiSuite) SetUpTest(c *check.C) {
 	dirs.SetRootDir(c.MkDir())
 	err := os.MkdirAll(filepath.Dir(dirs.SnapStateFile), 0755)
 	c.Assert(err, check.IsNil)
-	c.Assert(os.MkdirAll(dirs.SnapSnapsDir, 0755), check.IsNil)
+	c.Assert(os.MkdirAll(dirs.SnapMountDir, 0755), check.IsNil)
 
 	s.rsnaps = nil
 	s.suggestedCurrency = ""
@@ -246,7 +246,7 @@ type: gadget
 gadget: {store: {id: %q}}
 `, store)
 	snaptest.MockSnap(c, yamlText, &snap.SideInfo{Revision: snap.R(1)})
-	c.Assert(os.Symlink("1", filepath.Join(dirs.SnapSnapsDir, "test", "current")), check.IsNil)
+	c.Assert(os.Symlink("1", filepath.Join(dirs.SnapMountDir, "test", "current")), check.IsNil)
 }
 
 func (s *apiSuite) TestSnapInfoOneIntegration(c *check.C) {

diff --git a/dirs/dirs.go b/dirs/dirs.go
@@ -28,7 +28,7 @@ import (
 var (
 	GlobalRootDir string
 
-	SnapSnapsDir              string
+	SnapMountDir              string
 	SnapBlobDir               string
 	SnapDataDir               string
 	SnapDataHomeGlob          string
@@ -81,7 +81,7 @@ func SetRootDir(rootdir string) {
 	}
 	GlobalRootDir = rootdir
 
-	SnapSnapsDir = filepath.Join(rootdir, "/snap")
+	SnapMountDir = filepath.Join(rootdir, "/snap")
 	SnapDataDir = filepath.Join(rootdir, "/var/snap")
 	SnapDataHomeGlob = filepath.Join(rootdir, "/home/*/snap/")
 	SnapAppArmorDir = filepath.Join(rootdir, snappyDir, "apparmor", "profiles")
@@ -106,7 +106,7 @@ func SetRootDir(rootdir string) {
 	// snapd.firstboot.service to match
 	SnapFirstBootStamp = filepath.Join(rootdir, snappyDir, "firstboot", "stamp")
 
-	SnapBinariesDir = filepath.Join(SnapSnapsDir, "bin")
+	SnapBinariesDir = filepath.Join(SnapMountDir, "bin")
 	SnapServicesDir = filepath.Join(rootdir, "/etc/systemd/system")
 	SnapBusPolicyDir = filepath.Join(rootdir, "/etc/dbus-1/system.d")
 

diff --git a/integration-tests/testutils/refresh/refresh.go b/integration-tests/testutils/refresh/refresh.go
@@ -96,12 +96,12 @@ func copySnap(c *check.C, snap, targetDir string) {
 	// check for sideloaded snaps
 	// XXX: simplify this down to consider only the name (and not origin)
 	// in the directory once everything is moved to that
-	baseDir := filepath.Join(dirs.SnapSnapsDir, snap)
+	baseDir := filepath.Join(dirs.SnapMountDir, snap)
 	if _, err := os.Stat(baseDir); os.IsNotExist(err) {
 		snapName := strings.Split(snap, ".")[0]
-		baseDir = filepath.Join(dirs.SnapSnapsDir, snapName)
+		baseDir = filepath.Join(dirs.SnapMountDir, snapName)
 		if _, err := os.Stat(baseDir); os.IsNotExist(err) {
-			baseDir = filepath.Join(dirs.SnapSnapsDir, snapName+".sideload")
+			baseDir = filepath.Join(dirs.SnapMountDir, snapName+".sideload")
 			_, err = os.Stat(baseDir)
 			c.Assert(err, check.IsNil,
 				check.Commentf("%s not found from it's original source not sideloaded", snap))

diff --git a/overlord/boot/firstboot_test.go b/overlord/boot/firstboot_test.go
@@ -114,7 +114,7 @@ snaps:
 	c.Assert(err, IsNil)
 
 	// and check the snap got correctly installed
-	c.Check(osutil.FileExists(filepath.Join(dirs.SnapSnapsDir, "foo", "128", "meta", "snap.yaml")), Equals, true)
+	c.Check(osutil.FileExists(filepath.Join(dirs.SnapMountDir, "foo", "128", "meta", "snap.yaml")), Equals, true)
 
 	// verify
 	r, err := os.Open(dirs.SnapStateFile)

diff --git a/snap/info.go b/snap/info.go
@@ -65,7 +65,7 @@ func MinimalPlaceInfo(name string, revision Revision) PlaceInfo {
 
 // MountDir returns the base directory where it gets mounted of the snap with the given name and revision.
 func MountDir(name string, revision Revision) string {
-	return filepath.Join(dirs.SnapSnapsDir, name, revision.String())
+	return filepath.Join(dirs.SnapMountDir, name, revision.String())
 }
 
 // SecurityTag returns the snap-specific security tag.

diff --git a/snap/info_test.go b/snap/info_test.go
@@ -107,9 +107,9 @@ apps:
 	info.Revision = snap.R(42)
 
 	c.Check(info.Apps["bar"].LauncherCommand(), Equals,
-		fmt.Sprintf("/usr/bin/ubuntu-core-launcher snap.foo.bar snap.foo.bar %s/foo/42/bar-bin -x", dirs.SnapSnapsDir))
+		fmt.Sprintf("/usr/bin/ubuntu-core-launcher snap.foo.bar snap.foo.bar %s/foo/42/bar-bin -x", dirs.SnapMountDir))
 	c.Check(info.Apps["foo"].LauncherCommand(), Equals,
-		fmt.Sprintf("/usr/bin/ubuntu-core-launcher snap.foo.foo snap.foo.foo %s/foo/42/foo-bin", dirs.SnapSnapsDir))
+		fmt.Sprintf("/usr/bin/ubuntu-core-launcher snap.foo.foo snap.foo.foo %s/foo/42/foo-bin", dirs.SnapMountDir))
 }
 
 const sampleYaml = `
@@ -471,9 +471,9 @@ func verifyExplicitHook(c *C, info *snap.Info, hookName string, plugNames []stri
 func (s *infoSuite) TestDirAndFileMethods(c *C) {
 	dirs.SetRootDir("")
 	info := &snap.Info{SuggestedName: "name", SideInfo: snap.SideInfo{Revision: snap.R(1)}}
-	c.Check(info.MountDir(), Equals, fmt.Sprintf("%s/name/1", dirs.SnapSnapsDir))
+	c.Check(info.MountDir(), Equals, fmt.Sprintf("%s/name/1", dirs.SnapMountDir))
 	c.Check(info.MountFile(), Equals, "/var/lib/snapd/snaps/name_1.snap")
-	c.Check(info.HooksDir(), Equals, fmt.Sprintf("%s/name/1/meta/hooks", dirs.SnapSnapsDir))
+	c.Check(info.HooksDir(), Equals, fmt.Sprintf("%s/name/1/meta/hooks", dirs.SnapMountDir))
 	c.Check(info.DataDir(), Equals, "/var/snap/name/1")
 	c.Check(info.UserDataDir("/home/bob"), Equals, "/home/bob/snap/name/1")
 	c.Check(info.UserCommonDataDir("/home/bob"), Equals, "/home/bob/snap/name/common")

diff --git a/snap/snapenv/snapenv_test.go b/snap/snapenv/snapenv_test.go
@@ -50,7 +50,7 @@ func (ts *HTestSuite) TestBasic(c *C) {
 	sort.Strings(env)
 
 	c.Assert(env, DeepEquals, []string{
-		fmt.Sprintf("SNAP=%s/foo/17", dirs.SnapSnapsDir),
+		fmt.Sprintf("SNAP=%s/foo/17", dirs.SnapMountDir),
 		fmt.Sprintf("SNAP_ARCH=%s", arch.UbuntuArchitecture()),
 		"SNAP_COMMON=/var/snap/foo/common",
 		"SNAP_DATA=/var/snap/foo/17",

diff --git a/snap/snaptest/snaptest_test.go b/snap/snaptest/snaptest_test.go
@@ -63,7 +63,7 @@ func (s *snapTestSuite) TestMockSnap(c *C) {
 	// Data from SideInfo is used
 	c.Check(snapInfo.Revision, Equals, snap.R(42))
 	// The YAML is placed on disk
-	cont, err := ioutil.ReadFile(filepath.Join(dirs.SnapSnapsDir, "sample", "42", "meta", "snap.yaml"))
+	cont, err := ioutil.ReadFile(filepath.Join(dirs.SnapMountDir, "sample", "42", "meta", "snap.yaml"))
 	c.Assert(err, IsNil)
 
 	c.Check(string(cont), Equals, sampleYaml)

diff --git a/store/store_test.go b/store/store_test.go
@@ -138,7 +138,7 @@ func (t *remoteRepoTestSuite) SetUpTest(c *C) {
 	t.store = New(nil, "", nil)
 	t.origDownloadFunc = download
 	dirs.SetRootDir(c.MkDir())
-	c.Assert(os.MkdirAll(dirs.SnapSnapsDir, 0755), IsNil)
+	c.Assert(os.MkdirAll(dirs.SnapMountDir, 0755), IsNil)
 
 	t.logbuf = bytes.NewBuffer(nil)
 	l, err := logger.NewConsoleLog(t.logbuf, logger.DefaultFlags)

diff --git a/tests/lib/fakestore/refresh/refresh.go b/tests/lib/fakestore/refresh/refresh.go
@@ -139,7 +139,7 @@ type info struct {
 }
 
 func copySnap(snapName, targetDir string) (*info, error) {
-	baseDir := filepath.Join(dirs.SnapSnapsDir, snapName)
+	baseDir := filepath.Join(dirs.SnapMountDir, snapName)
 	if _, err := os.Stat(baseDir); err != nil {
 		return nil, err
 	}

diff --git a/wrappers/binaries_gen_test.go b/wrappers/binaries_gen_test.go
@@ -71,7 +71,7 @@ func (s *binariesWrapperGenSuite) TestSnappyGenerateSnapBinaryWrapper(c *C) {
 		Command: "bin/pastebinit",
 	}
 
-	expected := fmt.Sprintf(expectedWrapper, arch.UbuntuArchitecture(), dirs.SnapSnapsDir)
+	expected := fmt.Sprintf(expectedWrapper, arch.UbuntuArchitecture(), dirs.SnapMountDir)
 
 	generatedWrapper, err := wrappers.GenerateSnapBinaryWrapper(binary)
 	c.Assert(err, IsNil)

diff --git a/wrappers/binaries_test.go b/wrappers/binaries_test.go
@@ -71,14 +71,14 @@ func (s *binariesTestSuite) TestAddSnapBinariesAndRemove(c *C) {
 	err := wrappers.AddSnapBinaries(info)
 	c.Assert(err, IsNil)
 
-	wrapper := fmt.Sprintf("%s/bin/hello-snap.hello", dirs.SnapSnapsDir)
+	wrapper := fmt.Sprintf("%s/bin/hello-snap.hello", dirs.SnapMountDir)
 
 	content, err := ioutil.ReadFile(wrapper)
 	c.Assert(err, IsNil)
 
 	needle := fmt.Sprintf(`
 exec /usr/bin/ubuntu-core-launcher snap.hello-snap.hello snap.hello-snap.hello %s/hello-snap/11/bin/hello "$@"
-`, dirs.SnapSnapsDir)
+`, dirs.SnapMountDir)
 
 	c.Assert(string(content), Matches, "(?ms).*"+regexp.QuoteMeta(needle)+".*")
 

diff --git a/wrappers/desktop_test.go b/wrappers/desktop_test.go
@@ -125,7 +125,7 @@ Icon=${SNAP}/meep
 Name=foo
 Icon=%s/foo/12/meep
 
-# the empty line above is fine`, dirs.SnapSnapsDir))
+# the empty line above is fine`, dirs.SnapMountDir))
 }
 
 func (s *sanitizeDesktopFileSuite) TestSanitizeFiltersExec(c *C) {
@@ -183,7 +183,7 @@ Exec=snap.app %U
 	e := wrappers.SanitizeDesktopFile(snap, "foo.desktop", desktopContent)
 	c.Assert(string(e), Equals, fmt.Sprintf(`[Desktop Entry]
 Name=foo
-Exec=env BAMF_DESKTOP_FILE_HINT=foo.desktop %s/bin/snap.app %%U`, dirs.SnapSnapsDir))
+Exec=env BAMF_DESKTOP_FILE_HINT=foo.desktop %s/bin/snap.app %%U`, dirs.SnapMountDir))
 }
 
 // we do not support TryExec (even if its a valid line), this test ensures
@@ -254,7 +254,7 @@ apps:
 
 	newl, err := wrappers.RewriteExecLine(snap, "foo.desktop", "Exec=snap.app")
 	c.Assert(err, IsNil)
-	c.Assert(newl, Equals, fmt.Sprintf("Exec=env BAMF_DESKTOP_FILE_HINT=foo.desktop %s/bin/snap.app", dirs.SnapSnapsDir))
+	c.Assert(newl, Equals, fmt.Sprintf("Exec=env BAMF_DESKTOP_FILE_HINT=foo.desktop %s/bin/snap.app", dirs.SnapMountDir))
 }
 
 func (s *sanitizeDesktopFileSuite) TestTrimLang(c *C) {

diff --git a/wrappers/services_gen_test.go b/wrappers/services_gen_test.go
@@ -57,8 +57,8 @@ WantedBy=multi-user.target
 `
 
 var (
-	expectedAppService  = fmt.Sprintf(expectedServiceFmt, "After=snapd.frameworks.target\nRequires=snapd.frameworks.target", "Type=simple\n", arch.UbuntuArchitecture(), dirs.SnapSnapsDir)
-	expectedDbusService = fmt.Sprintf(expectedServiceFmt, "After=snapd.frameworks.target\nRequires=snapd.frameworks.target", "Type=dbus\nBusName=foo.bar.baz", arch.UbuntuArchitecture(), dirs.SnapSnapsDir)
+	expectedAppService  = fmt.Sprintf(expectedServiceFmt, "After=snapd.frameworks.target\nRequires=snapd.frameworks.target", "Type=simple\n", arch.UbuntuArchitecture(), dirs.SnapMountDir)
+	expectedDbusService = fmt.Sprintf(expectedServiceFmt, "After=snapd.frameworks.target\nRequires=snapd.frameworks.target", "Type=dbus\nBusName=foo.bar.baz", arch.UbuntuArchitecture(), dirs.SnapMountDir)
 )
 
 var (
@@ -81,8 +81,8 @@ TimeoutStopSec=30
 [Install]
 WantedBy=multi-user.target
 `
-	expectedSocketUsingWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=snapd.frameworks.target snap.xkcd-webserver.xkcd-webserver.socket\nRequires=snapd.frameworks.target snap.xkcd-webserver.xkcd-webserver.socket", "Type=simple\n", arch.UbuntuArchitecture(), dirs.SnapSnapsDir)
-	expectedTypeForkingWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=snapd.frameworks.target\nRequires=snapd.frameworks.target", "Type=forking\n", arch.UbuntuArchitecture(), dirs.SnapSnapsDir)
+	expectedSocketUsingWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=snapd.frameworks.target snap.xkcd-webserver.xkcd-webserver.socket\nRequires=snapd.frameworks.target snap.xkcd-webserver.xkcd-webserver.socket", "Type=simple\n", arch.UbuntuArchitecture(), dirs.SnapMountDir)
+	expectedTypeForkingWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=snapd.frameworks.target\nRequires=snapd.frameworks.target", "Type=forking\n", arch.UbuntuArchitecture(), dirs.SnapMountDir)
 )
 
 func (s *servicesWrapperGenSuite) TestGenerateSnapServiceFile(c *C) {