Fix tools dir when using build number.

Tools dir should ignore build number.
orbital-transfer-survey · Dec 20, 2019 · c852091 · c852091
1 parent b403277
commit c852091
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 98 deletions.
diff --git a/agent/tools/tools_test.go b/agent/tools/tools_test.go
@@ -208,53 +208,90 @@ func (t *ToolsSuite) TestReadGUIArchiveSuccess(c *gc.C) {
 }
 
 func (t *ToolsSuite) TestChangeAgentTools(c *gc.C) {
-	files := []*testing.TarFile{
-		testing.NewTarFile("jujuc", agenttools.DirPerm, "juju executable"),
-		testing.NewTarFile("jujud", agenttools.DirPerm, "jujuc executable"),
-	}
-	data, checksum := testing.TarGz(files...)
-	testTools := &coretest.Tools{
-		URL:     "http://foo/bar1",
-		Version: version.MustParseBinary("1.2.3-quantal-amd64"),
-		Size:    int64(len(data)),
-		SHA256:  checksum,
+	tests := []struct {
+		version1 version.Binary
+		version2 version.Binary
+		dir1     string
+		dir2     string
+	}{
+		{
+			version.MustParseBinary("1.2.3-quantal-amd64"),
+			version.MustParseBinary("1.2.4-quantal-amd64"),
+			"1.2.3-quantal-amd64", "1.2.4-quantal-amd64",
+		},
+		{
+			version.MustParseBinary("1.2-beta1.3-quantal-amd64"),
+			version.MustParseBinary("1.2.4-quantal-amd64"),
+			"1.2-beta1-quantal-amd64", "1.2.4-quantal-amd64",
+		},
+		{
+			version.MustParseBinary("1.2-beta1.3-quantal-amd64"),
+			version.MustParseBinary("1.2-beta2.4-quantal-amd64"),
+			"1.2-beta1-quantal-amd64", "1.2-beta2-quantal-amd64",
+		},
 	}
-	err := agenttools.UnpackTools(t.dataDir, testTools, bytes.NewReader(data))
-	c.Assert(err, jc.ErrorIsNil)
+	for k, v := range tests {
+		if k != 0 {
+			t.dataDir = c.MkDir()
+		}
+		files := []*testing.TarFile{
+			testing.NewTarFile("jujuc", agenttools.DirPerm, "juju executable"),
+			testing.NewTarFile("jujud", agenttools.DirPerm, "jujuc executable"),
+		}
+		data, checksum := testing.TarGz(files...)
+		testTools := &coretest.Tools{
+			URL:     "http://foo/bar1",
+			Version: v.version1,
+			Size:    int64(len(data)),
+			SHA256:  checksum,
+		}
+		err := agenttools.UnpackTools(t.dataDir, testTools, bytes.NewReader(data))
+		c.Assert(err, jc.ErrorIsNil)
 
-	gotTools, err := agenttools.ChangeAgentTools(t.dataDir, "testagent", testTools.Version)
-	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(*gotTools, gc.Equals, *testTools)
+		gotTools, err := agenttools.ChangeAgentTools(t.dataDir, "testagent", testTools.Version)
+		c.Assert(err, jc.ErrorIsNil)
+		c.Assert(*gotTools, gc.Equals, *testTools)
 
-	assertDirNames(c, t.toolsDir(), []string{"1.2.3-quantal-amd64", "testagent"})
-	assertDirNames(c, agenttools.ToolsDir(t.dataDir, "testagent"), []string{"jujuc", "jujud", agenttools.ToolsFile})
+		assertDirNames(c, t.toolsDir(), []string{v.dir1, "testagent"})
+		assertDirNames(c, agenttools.ToolsDir(t.dataDir, "testagent"), []string{"jujuc", "jujud", agenttools.ToolsFile})
 
-	// Upgrade again to check that the link replacement logic works ok.
-	files2 := []*testing.TarFile{
-		testing.NewTarFile("quantal", agenttools.DirPerm, "foo content"),
-		testing.NewTarFile("amd64", agenttools.DirPerm, "bar content"),
-	}
-	data2, checksum2 := testing.TarGz(files2...)
-	tools2 := &coretest.Tools{
-		URL:     "http://foo/bar2",
-		Version: version.MustParseBinary("1.2.4-quantal-amd64"),
-		Size:    int64(len(data2)),
-		SHA256:  checksum2,
-	}
-	err = agenttools.UnpackTools(t.dataDir, tools2, bytes.NewReader(data2))
-	c.Assert(err, jc.ErrorIsNil)
+		// Upgrade again to check that the link replacement logic works ok.
+		files2 := []*testing.TarFile{
+			testing.NewTarFile("quantal", agenttools.DirPerm, "foo content"),
+			testing.NewTarFile("amd64", agenttools.DirPerm, "bar content"),
+		}
+		data2, checksum2 := testing.TarGz(files2...)
+		tools2 := &coretest.Tools{
+			URL:     "http://foo/bar2",
+			Version: v.version2,
+			Size:    int64(len(data2)),
+			SHA256:  checksum2,
+		}
+		err = agenttools.UnpackTools(t.dataDir, tools2, bytes.NewReader(data2))
+		c.Assert(err, jc.ErrorIsNil)
 
-	gotTools, err = agenttools.ChangeAgentTools(t.dataDir, "testagent", tools2.Version)
-	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(*gotTools, gc.Equals, *tools2)
+		gotTools, err = agenttools.ChangeAgentTools(t.dataDir, "testagent", tools2.Version)
+		c.Assert(err, jc.ErrorIsNil)
+		c.Assert(*gotTools, gc.Equals, *tools2)
 
-	assertDirNames(c, t.toolsDir(), []string{"1.2.3-quantal-amd64", "1.2.4-quantal-amd64", "testagent"})
-	assertDirNames(c, agenttools.ToolsDir(t.dataDir, "testagent"), []string{"quantal", "amd64", agenttools.ToolsFile})
+		assertDirNames(c, t.toolsDir(), []string{v.dir1, v.dir2, "testagent"})
+		assertDirNames(c, agenttools.ToolsDir(t.dataDir, "testagent"), []string{"quantal", "amd64", agenttools.ToolsFile})
+	}
 }
 
 func (t *ToolsSuite) TestSharedToolsDir(c *gc.C) {
-	dir := agenttools.SharedToolsDir("/var/lib/juju", version.MustParseBinary("1.2.3-precise-amd64"))
-	c.Assert(dir, gc.Equals, "/var/lib/juju/tools/1.2.3-precise-amd64")
+	tests := []struct {
+		dataDir string
+		version version.Binary
+		out     string
+	}{
+		{"/var/lib/juju", version.MustParseBinary("1.2.3-precise-amd64"), "/var/lib/juju/tools/1.2.3-precise-amd64"},
+		{"/var/lib/juju", version.MustParseBinary("1.2-beta1.3-precise-amd64"), "/var/lib/juju/tools/1.2-beta1-precise-amd64"},
+	}
+	for _, v := range tests {
+		dir := agenttools.SharedToolsDir(v.dataDir, v.version)
+		c.Assert(dir, gc.Equals, v.out)
+	}
 }
 
 func (t *ToolsSuite) TestSharedGUIDir(c *gc.C) {

diff --git a/agent/tools/toolsdir.go b/agent/tools/toolsdir.go
@@ -33,6 +33,7 @@ const (
 // store binaries for the given version of the juju tools
 // within the dataDir directory.
 func SharedToolsDir(dataDir string, vers version.Binary) string {
+	vers.Number = vers.Number.ToPatch()
 	return path.Join(dataDir, "tools", vers.String())
 }
 
@@ -203,7 +204,7 @@ func ChangeAgentTools(dataDir string, agentName string, vers version.Binary) (*c
 	// build absolute path to toolsDir. Windows implementation of symlink
 	// will check for the existence of the source file and error if it does
 	// not exists. This is a limitation of junction points (symlinks) on NTFS
-	toolPath := ToolsDir(dataDir, tools.Version.String())
+	toolPath := SharedToolsDir(dataDir, tools.Version)
 	toolsDir := ToolsDir(dataDir, agentName)
 
 	err = symlink.Replace(toolsDir, toolPath)

diff --git a/cloudconfig/userdatacfg.go b/cloudconfig/userdatacfg.go
@@ -189,11 +189,13 @@ func (c *baseConfigure) toolsSymlinkCommand(toolsDir string) string {
 			c.icfg.AgentVersion(),
 		)
 	default:
+		ver := c.icfg.AgentVersion()
+		ver.Number = ver.ToPatch()
 		// TODO(dfc) ln -nfs, so it doesn't fail if for some reason that
 		// the target already exists.
 		return fmt.Sprintf(
 			"ln -s %v %s",
-			c.icfg.AgentVersion(),
+			ver.String(),
 			shquote(toolsDir),
 		)
 	}