diff --git a/server/events/atlantis_workspace.go b/server/events/atlantis_workspace.go
index 190b87790..67112b1ce 100644
--- a/server/events/atlantis_workspace.go
+++ b/server/events/atlantis_workspace.go
@@ -18,6 +18,7 @@ import (
"os/exec"
"path/filepath"
"strconv"
+ "strings"
"github.com/pkg/errors"
"github.com/runatlantis/atlantis/server/events/models"
@@ -48,7 +49,9 @@ type FileWorkspace struct {
}
// Clone git clones headRepo, checks out the branch and then returns the absolute
-// path to the root of the cloned repo.
+// path to the root of the cloned repo. If the repo already exists and is at
+// the right commit it does nothing. This is to support running commands in
+// multiple dirs of the same repo without deleting existing plans.
func (w *FileWorkspace) Clone(
log *logging.SimpleLogger,
baseRepo models.Repo,
@@ -57,11 +60,27 @@ func (w *FileWorkspace) Clone(
workspace string) (string, error) {
cloneDir := w.cloneDir(baseRepo, p, workspace)
- // This is safe to do because we lock runs on repo/pull/workspace so no one else
- // is using this workspace.
- log.Info("cleaning clone directory %q", cloneDir)
- if err := os.RemoveAll(cloneDir); err != nil {
- return "", errors.Wrap(err, "deleting old workspace")
+ // If the directory already exists, check if it's at the right commit.
+ // If so, then we do nothing.
+ if _, err := os.Stat(cloneDir); err == nil {
+ revParseCmd := exec.Command("git", "rev-parse", "HEAD") // #nosec
+ revParseCmd.Dir = cloneDir
+ output, err := revParseCmd.CombinedOutput()
+ if err != nil {
+ return "", errors.Wrapf(err, "running git rev-parse HEAD: %s", string(output))
+ }
+ currCommit := strings.Trim(string(output), "\n")
+ if string(currCommit) == p.HeadCommit {
+ log.Debug("repo is at correct commit %q so will not re-clone", p.HeadCommit)
+ return cloneDir, nil
+ }
+ log.Debug("repo was already cloned but is not at correct commit, wanted %q got %q", p.HeadCommit, string(currCommit))
+
+ // It's okay to delete all plans now since they're out of date.
+ log.Info("cleaning clone directory %q", cloneDir)
+ if err := os.RemoveAll(cloneDir); err != nil {
+ return "", errors.Wrap(err, "deleting old workspace")
+ }
}
// Create the directory and parents if necessary.
diff --git a/server/events/command_handler.go b/server/events/command_handler.go
index 601d3be09..bfd25dd93 100644
--- a/server/events/command_handler.go
+++ b/server/events/command_handler.go
@@ -195,7 +195,7 @@ func (c *CommandHandler) updatePull(ctx *CommandContext, res CommandResponse) {
if err := c.CommitStatusUpdater.UpdateProjectResult(ctx, res); err != nil {
ctx.Log.Warn("unable to update commit status: %s", err)
}
- comment := c.MarkdownRenderer.Render(res, ctx.Command.Name, ctx.Log.History.String(), ctx.Command.Verbose)
+ comment := c.MarkdownRenderer.Render(res, ctx.Command.Name, ctx.Log.History.String(), ctx.Command.Verbose, ctx.Command.Autoplan)
c.VCSClient.CreateComment(ctx.BaseRepo, ctx.Pull.Num, comment) // nolint: errcheck
}
diff --git a/server/events/markdown_renderer.go b/server/events/markdown_renderer.go
index 4094c3861..0f623f04a 100644
--- a/server/events/markdown_renderer.go
+++ b/server/events/markdown_renderer.go
@@ -58,7 +58,7 @@ type ProjectResultTmplData struct {
// Render formats the data into a markdown string.
// nolint: interfacer
-func (m *MarkdownRenderer) Render(res CommandResponse, cmdName CommandName, log string, verbose bool) string {
+func (m *MarkdownRenderer) Render(res CommandResponse, cmdName CommandName, log string, verbose bool, autoplan bool) string {
commandStr := strings.Title(cmdName.String())
common := CommonData{commandStr, verbose, log}
if res.Error != nil {
@@ -67,6 +67,9 @@ func (m *MarkdownRenderer) Render(res CommandResponse, cmdName CommandName, log
if res.Failure != "" {
return m.renderTemplate(failureWithLogTmpl, FailureData{res.Failure, common})
}
+ if len(res.ProjectResults) == 0 && autoplan {
+ return m.renderTemplate(autoplanNoProjectsWithLogTmpl, common)
+ }
return m.renderProjectResults(res.ProjectResults, common)
}
@@ -145,9 +148,12 @@ var errTmplText = "**{{.Command}} Error**\n" +
"```\n" +
"{{.Error}}\n" +
"```\n"
+var autoplanNoProjectsTmplText = "Ran `plan` in 0 projects because Atlantis detected no Terraform changes or could not determine where to run `plan`.\n"
var errTmpl = template.Must(template.New("").Parse(errTmplText))
var errWithLogTmpl = template.Must(template.New("").Parse(errTmplText + logTmpl))
var failureTmplText = "**{{.Command}} Failed**: {{.Failure}}\n"
var failureTmpl = template.Must(template.New("").Parse(failureTmplText))
var failureWithLogTmpl = template.Must(template.New("").Parse(failureTmplText + logTmpl))
+var autoplanNoProjectsTmpl = template.Must(template.New("").Parse(autoplanNoProjectsTmplText))
+var autoplanNoProjectsWithLogTmpl = template.Must(template.New("").Parse(autoplanNoProjectsTmplText + logTmpl))
var logTmpl = "{{if .Verbose}}\nLog
\n \n\n```\n{{.Log}}```\n