diff --git a/runatlantis.io/docs/using-atlantis.md b/runatlantis.io/docs/using-atlantis.md index 8009440a14..15a0b5a681 100644 --- a/runatlantis.io/docs/using-atlantis.md +++ b/runatlantis.io/docs/using-atlantis.md @@ -103,8 +103,10 @@ Runs `terraform apply` for the plan that matches the directory/project/workspace ::: tip If no directory/project/workspace is specified, ex. `atlantis apply`, this command will apply **all unapplied plans from this pull request**. This includes all projects that have been planned manually with `atlantis plan` `-p`/`-d`/`-w` since the last autoplan or `atlantis plan` command. +For Atlantis commands to work, Atlantis needs to know the location where the plan file is. For that, you can use $PLANFILE which will contain the path of the plan file to be used in your custom steps. i.e `terraform plan -out $PLANFILE` ::: + ### Examples ```bash # Runs apply for all unapplied plans from this pull request. diff --git a/server/controllers/templates/web_templates.go b/server/controllers/templates/web_templates.go index f5295fcd45..177a6428b4 100644 --- a/server/controllers/templates/web_templates.go +++ b/server/controllers/templates/web_templates.go @@ -17,6 +17,8 @@ import ( "html/template" "io" "time" + + "github.com/runatlantis/atlantis/server/jobs" ) //go:generate pegomock generate --package mocks -o mocks/mock_template_writer.go TemplateWriter @@ -50,7 +52,9 @@ type ApplyLockData struct { // IndexData holds the data for rendering the index page type IndexData struct { - Locks []LockIndexData + Locks []LockIndexData + PullToJobMapping []jobs.PullInfoWithJobIDs + ApplyLock ApplyLockData AtlantisVersion string // CleanedBasePath is the path Atlantis is accessible at externally. If @@ -113,8 +117,8 @@ var IndexTemplate = template.Must(template.New("index.html.tmpl").Parse(`

Locks

- {{ if .Locks }} {{ $basePath := .CleanedBasePath }} + {{ if .Locks }}
Repository @@ -151,6 +155,36 @@ var IndexTemplate = template.Must(template.New("index.html.tmpl").Parse(`

No locks found.

{{ end }}
+
+
+
+
+

Jobs

+ {{ if .PullToJobMapping }} +
+
+ Repository + Project + Workspace + Jobs +
+ {{ range .PullToJobMapping }} +
+ {{.Pull.RepoFullName}} #{{.Pull.PullNum}} + {{.Pull.Path}} + {{.Pull.Workspace}} + + {{ range .JobIDInfos }} +
{{ .TimeFormatted }}
+ {{ end }} +
+
+ {{ end }} +
+ {{ else }} +

No jobs found.

+ {{ end }} +