Merge pull request eksctl-io#1226 from weaveworks/1219-set-cwd-in-git…

…-commands

 Fix CloneRepoInPath() for relative directories

pkg/ctl/gitops/apply.go

@@ -151,7 +151,6 @@ func doApplyGitops(cmd *cmdutils.Cmd, opts options) error {
 	gitClient := git.NewGitClient(context.Background(), git.ClientParams{
 		PrivateSSHKeyPath: opts.gitPrivateSSHKeyPath,
 		Timeout:           git.DefaultGitTimeout,
-		Dir:               usersRepoDir,
 	})
 
 	gitOps := gitops.Applier{

pkg/git/git.go

@@ -36,7 +36,6 @@ type Client struct {
 type ClientParams struct {
 	Timeout           time.Duration
 	PrivateSSHKeyPath string
-	Dir               string
 }
 
 // Options holds options for cloning a git repository
@@ -81,12 +80,17 @@ func (git *Client) CloneRepo(cloneDirPrefix string, branch string, gitURL string
 
 // CloneRepoInPath clones a repo to the specified directory
 func (git *Client) CloneRepoInPath(clonePath string, branch string, gitURL string) error {
-	git.dir = clonePath
-	if err := os.MkdirAll(git.dir, 0700); err != nil {
+	if err := os.MkdirAll(clonePath, 0700); err != nil {
 		return errors.Wrapf(err, "unable to create directory for cloning")
 	}
-	args := []string{"clone", "-b", branch, gitURL, git.dir}
-	return git.runGitCmd(args...)
+	args := []string{"clone", "-b", branch, gitURL, clonePath}
+	if err := git.runGitCmd(args...); err != nil {
+		return err
+	}
+	// Set the working directory only after the clone so that
+	// it doesn't create an undesirable nested directory
+	git.dir = clonePath
+	return nil
 }
 
 // Add performs can perform a `git add` operation on the given file paths

pkg/git/git_test.go

@@ -37,7 +37,7 @@ var _ = Describe("GitClient", func() {
 
 		// It called clone
 		Expect(err).To(Not(HaveOccurred()))
-		Expect(fakeExecutor.Dir).To(Equal(tempCloneDir))
+		Expect(fakeExecutor.Dir).To(Equal(""))
 		Expect(fakeExecutor.Args).To(
 			Equal([]string{"clone", "-b", "my-branch", "git@example.com:test/example-repo.git", tempCloneDir}))