will setup plugin home directory during configuration

- Added integration test for missing plugin directory during
  `install-plugin`.

[finishes #146411359]

Signed-off-by: Sebastian Vidrio <[email protected]>

Author: Alex Zhao

command/common/install_plugin_command.go

@@ -76,10 +76,6 @@ func (cmd *InstallPluginCommand) Setup(config command.Config, ui command.UI) err
 
 func (cmd InstallPluginCommand) Execute([]string) error {
 	log.WithField("PluginHome", cmd.Config.PluginHome()).Info("making plugin dir")
-	err := os.MkdirAll(cmd.Config.PluginHome(), 0700)
-	if err != nil {
-		return err
-	}
 
 	tempPluginDir, err := ioutil.TempDir(cmd.Config.PluginHome(), "temp")
 	log.WithField("tempPluginDir", tempPluginDir).Debug("making tempPluginDir dir")

command/common/install_plugin_from_repo_command_test.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"math/rand"
 	"os"
 	"runtime"
-	"strconv"
 
 	"code.cloudfoundry.org/cli/actor/actionerror"
 	"code.cloudfoundry.org/cli/actor/pluginaction"
@@ -55,8 +55,9 @@ var _ = Describe("install-plugin command", func() {
 			ProgressBar: fakeProgressBar,
 		}
 
-		tmpDirectorySeed := strconv.Itoa(int(rand.Int63()))
-		pluginHome = fmt.Sprintf("some-pluginhome-%s", tmpDirectorySeed)
+		var err error
+		pluginHome, err = ioutil.TempDir("", "some-pluginhome")
+		Expect(err).ToNot(HaveOccurred())
 		fakeConfig.PluginHomeReturns(pluginHome)
 		binaryName = helpers.PrefixedRandomName("bin")
 		fakeConfig.BinaryNameReturns(binaryName)

integration/plugin/install_plugin_command_test.go

@@ -77,6 +77,45 @@ var _ = Describe("install-plugin command", func() {
 		})
 	})
 
+	Context("when the plugin dir does not exist", func() {
+		var (
+			newPluginHome string
+
+			cfPluginHome string
+		)
+
+		BeforeEach(func() {
+			cfPluginHome = os.Getenv("CF_PLUGIN_HOME")
+
+			var err error
+			newPluginHome, err = ioutil.TempDir("", "plugin-temp-dir")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(os.RemoveAll(newPluginHome))
+
+			Expect(os.Setenv("CF_PLUGIN_HOME", newPluginHome)).ToNot(HaveOccurred())
+
+			pluginPath = helpers.BuildConfigurablePlugin("configurable_plugin", "some-plugin", "1.0.0",
+				[]helpers.PluginCommand{
+					{Name: "some-command", Help: "some-command-help"},
+				},
+			)
+		})
+
+		AfterEach(func() {
+			Expect(os.RemoveAll(newPluginHome)).ToNot(HaveOccurred())
+			Expect(os.Setenv("CF_PLUGIN_HOME", cfPluginHome)).ToNot(HaveOccurred())
+		})
+
+		It("creates the new directory, and continues as normal", func() {
+			session := helpers.CF("install-plugin", pluginPath, "-f")
+			Eventually(session).Should(Exit(0))
+
+			log.Println(newPluginHome)
+			_, err := os.Stat(newPluginHome)
+			Expect(os.IsNotExist(err)).To(Equal(false))
+		})
+	})
+
 	Describe("installing a plugin from a local file", func() {
 		Context("when the file is compiled for a different os and architecture", func() {
 			BeforeEach(func() {

main.go

@@ -169,6 +169,11 @@ func executionWrapper(cmd flags.Commander, args []string) error {
 		return err
 	}
 
+	err = cfConfig.CreatePluginHome()
+	if err != nil {
+		return err
+	}
+
 	// TODO: when the line in the old code under `cf` which calls
 	// configv3.LoadConfig() is finally removed, then we should replace the code
 	// path above with the following:

util/configv3/plugins_config.go

@@ -88,6 +88,10 @@ func (config *Config) AddPlugin(plugin Plugin) {
 	config.pluginsConfig.Plugins[plugin.Name] = plugin
 }
 
+func (config *Config) CreatePluginHome() error {
+	return os.MkdirAll(config.PluginHome(), 0700)
+}
+
 // GetPlugin returns the requested plugin and true if it exists.
 func (config *Config) GetPlugin(pluginName string) (Plugin, bool) {
 	plugin, exists := config.pluginsConfig.Plugins[pluginName]

util/configv3/plugins_config_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"syscall"
 
 	. "code.cloudfoundry.org/cli/util/configv3"
 	. "github.com/onsi/ginkgo"
@@ -382,6 +383,67 @@ var _ = Describe("PluginsConfig", func() {
 				})
 			})
 		})
+
+		Describe("CreatePluginHome", func() {
+			var (
+				config *Config
+
+				pluginHome string
+
+				executeErr error
+			)
+
+			BeforeEach(func() {
+				config = new(Config)
+
+				var err error
+				pluginHome, err = ioutil.TempDir("", "my-plugin-home")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(os.RemoveAll(pluginHome)).ToNot(HaveOccurred())
+			})
+
+			AfterEach(func() {
+				Expect(os.RemoveAll(pluginHome)).ToNot(HaveOccurred())
+			})
+
+			JustBeforeEach(func() {
+				executeErr = config.CreatePluginHome()
+			})
+
+			Context("when it correctly writes a directory", func() {
+				BeforeEach(func() {
+					config.ENV.CFPluginHome = pluginHome
+				})
+
+				It("returns no error", func() {
+					Expect(executeErr).ToNot(HaveOccurred())
+
+					_, statErr := os.Stat(pluginHome)
+					Expect(os.IsNotExist(statErr)).To(BeFalse())
+				})
+			})
+
+			Context("when it fails to write a directory", func() {
+				var tempFile string
+
+				BeforeEach(func() {
+					f, err := ioutil.TempFile("", "fail-plugin-home")
+					Expect(err).ToNot(HaveOccurred())
+					Expect(f.Close()).ToNot(HaveOccurred())
+					tempFile = f.Name()
+
+					config.ENV.CFPluginHome = tempFile + "/some-path"
+				})
+
+				AfterEach(func() {
+					Expect(os.RemoveAll(tempFile)).ToNot(HaveOccurred())
+				})
+
+				It("returns an error", func() {
+					Expect(executeErr).To(MatchError(&os.PathError{Op: "mkdir", Path: tempFile, Err: syscall.ENOTDIR}))
+				})
+			})
+		})
 	})
 
 	Describe("Plugin", func() {