Merge pull request #339 from runatlantis/remove-refreshing

Remove "Refreshing..." output from top of plan.

server/events/markdown_renderer.go

@@ -116,7 +116,7 @@ func (m *MarkdownRenderer) renderProjectResults(results []ProjectResult, common
 				Failure: result.Failure,
 			})
 		} else if result.PlanSuccess != nil {
-			result.PlanSuccess.TerraformOutput = m.fmtDiff(result.PlanSuccess.TerraformOutput)
+			result.PlanSuccess.TerraformOutput = m.fmtPlan(result.PlanSuccess.TerraformOutput)
 			if m.shouldUseWrappedTmpl(vcsHost, result.PlanSuccess.TerraformOutput) {
 				resultData.Rendered = m.renderTemplate(planSuccessWrappedTmpl, *result.PlanSuccess)
 			} else {
@@ -166,12 +166,21 @@ func (m *MarkdownRenderer) shouldUseWrappedTmpl(vcsHost models.VCSHostType, outp
 	return strings.Count(output, "\n") > maxUnwrappedLines
 }
 
-// fmtDiff uses regex's to remove any leading whitespace in front of the
+// fmtPlan uses regex's to remove any leading whitespace in front of the
 // terraform output so that the diff syntax highlighting works. Example:
 // "  - aws_security_group_rule.allow_all" =>
 // "- aws_security_group_rule.allow_all"
 // We do it for +, ~ and -.
-func (m *MarkdownRenderer) fmtDiff(tfOutput string) string {
+// It also removes the "Refreshing..." preamble.
+func (m *MarkdownRenderer) fmtPlan(tfOutput string) string {
+	// Plan output contains a lot of "Refreshing..." lines followed by a
+	// separator. We want to remove everything before that separator.
+	refreshSeparator := "------------------------------------------------------------------------\n"
+	sepIdx := strings.Index(tfOutput, refreshSeparator)
+	if sepIdx > -1 {
+		tfOutput = tfOutput[sepIdx+len(refreshSeparator):]
+	}
+
 	tfOutput = plusDiffRegex.ReplaceAllString(tfOutput, "+")
 	tfOutput = tildeDiffRegex.ReplaceAllString(tfOutput, "~")
 	return minusDiffRegex.ReplaceAllString(tfOutput, "-")

server/events/markdown_renderer_test.go

@@ -541,12 +541,6 @@ Terraform will perform the following actions:
 <details><summary>Show Output</summary>
 
 $$$diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:

server/events_controller_e2e_test.go

@@ -486,6 +486,12 @@ func assertCommentEquals(t *testing.T, expFile string, act string, repoDir strin
 	idRegex := regexp.MustCompile(`Creation complete after [0-9]+s \(ID: [0-9]+\)`)
 	act = idRegex.ReplaceAllString(act, "Creation complete after *s (ID: ******************)")
 
+	// Replace all null_resource.simple{n} with null_resource.simple because with
+	// multiple resources they might be created at different times and so the
+	// output is unordered.
+	resourceRegex := regexp.MustCompile(`null_resource\.simple\d:`)
+	act = resourceRegex.ReplaceAllString(act, "null_resource.simple:")
+
 	if string(exp) != act {
 		// If in CI, we write the diff to the console. Otherwise we write the diff
 		// to file so we can use our local diff viewer.

server/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt

@@ -3,15 +3,7 @@ Ran Plan for 2 projects:
 1. workspace: `default` dir: `production`
 
 ### 1. workspace: `default` dir: `staging`
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -30,19 +22,10 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -d staging`
-</details>
 
 ---
 ### 2. workspace: `default` dir: `production`
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -61,7 +44,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -d production`
-</details>
 
 ---
 * :fast_forward: To **apply** all unapplied plans from this pull request, comment:

server/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt

@@ -1,14 +1,6 @@
 Ran Plan in dir: `staging` workspace: `default`
 
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -27,7 +19,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -d staging`
-</details>
 
 ---
 * :fast_forward: To **apply** all unapplied plans from this pull request, comment:

server/testfixtures/test-repos/modules/exp-output-plan-production.txt

@@ -1,14 +1,6 @@
 Ran Plan in dir: `production` workspace: `default`
 
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -27,7 +19,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -d production`
-</details>
 
 ---
 * :fast_forward: To **apply** all unapplied plans from this pull request, comment:

server/testfixtures/test-repos/modules/exp-output-plan-staging.txt

@@ -1,14 +1,6 @@
 Ran Plan in dir: `staging` workspace: `default`
 
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -27,7 +19,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -d staging`
-</details>
 
 ---
 * :fast_forward: To **apply** all unapplied plans from this pull request, comment:

server/testfixtures/test-repos/simple-yaml/exp-output-autoplan.txt

@@ -3,15 +3,7 @@ Ran Plan for 2 projects:
 1. workspace: `staging` dir: `.`
 
 ### 1. workspace: `default` dir: `.`
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -30,19 +22,10 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -d .`
-</details>
 
 ---
 ### 2. workspace: `staging` dir: `.`
-<details><summary>Show Output</summary>
-
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -61,7 +44,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
 * :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
 * :repeat: To **plan** this project again, comment:
     * `atlantis plan -w staging`
-</details>
 
 ---
 * :fast_forward: To **apply** all unapplied plans from this pull request, comment:

server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt

@@ -3,33 +3,47 @@ Ran Apply for 2 projects:
 1. workspace: `new_workspace` dir: `.`
 
 ### 1. workspace: `default` dir: `.`
+<details><summary>Show Output</summary>
+
 ```diff
 null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple: Creation complete after *s (ID: ******************)
 null_resource.simple: Creation complete after *s (ID: ******************)
 
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
 Outputs:
 
 var = default_workspace
 workspace = default
 
 ```
+</details>
 
 ---
 ### 2. workspace: `new_workspace` dir: `.`
+<details><summary>Show Output</summary>
+
 ```diff
 null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple: Creation complete after *s (ID: ******************)
 null_resource.simple: Creation complete after *s (ID: ******************)
 
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
 Outputs:
 
 var = new_workspace
 workspace = new_workspace
 
 ```
+</details>
 
 ---
 

server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt

@@ -1,15 +1,22 @@
 Ran Apply in dir: `.` workspace: `default`
 
+<details><summary>Show Output</summary>
+
 ```diff
 null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple: Creation complete after *s (ID: ******************)
 null_resource.simple: Creation complete after *s (ID: ******************)
 
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
 Outputs:
 
 var = default_workspace
 workspace = default
 
 ```
+</details>
 

server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt

@@ -1,15 +1,22 @@
 Ran Apply in dir: `.` workspace: `new_workspace`
 
+<details><summary>Show Output</summary>
+
 ```diff
 null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple: Creation complete after *s (ID: ******************)
 null_resource.simple: Creation complete after *s (ID: ******************)
 
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
 Outputs:
 
 var = new_workspace
 workspace = new_workspace
 
 ```
+</details>
 

server/testfixtures/test-repos/simple/exp-output-apply-var.txt

@@ -1,15 +1,22 @@
 Ran Apply in dir: `.` workspace: `default`
 
+<details><summary>Show Output</summary>
+
 ```diff
 null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple: Creation complete after *s (ID: ******************)
 null_resource.simple: Creation complete after *s (ID: ******************)
 
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
 Outputs:
 
 var = overridden
 workspace = default
 
 ```
+</details>
 

server/testfixtures/test-repos/simple/exp-output-apply.txt

@@ -1,15 +1,22 @@
 Ran Apply in dir: `.` workspace: `default`
 
+<details><summary>Show Output</summary>
+
 ```diff
 null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creating...
+null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple: Creation complete after *s (ID: ******************)
 null_resource.simple: Creation complete after *s (ID: ******************)
 
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
 Outputs:
 
 var = default
 workspace = default
 
 ```
+</details>
 

server/testfixtures/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt

@@ -3,12 +3,6 @@ Ran Plan in dir: `.` workspace: `new_workspace`
 <details><summary>Show Output</summary>
 
 ```diff
-Refreshing Terraform state in-memory prior to plan...
-The refreshed state will be used to calculate this plan, but will not be
-persisted to local or remote state storage.
-
-
-------------------------------------------------------------------------
 
 An execution plan has been generated and is shown below.
 Resource actions are indicated with the following symbols:
@@ -18,7 +12,13 @@ Terraform will perform the following actions:
 
 + null_resource.simple
       id: <computed>
-Plan: 1 to add, 0 to change, 0 to destroy.
+
++ null_resource.simple2
+      id: <computed>
+
++ null_resource.simple3
+      id: <computed>
+Plan: 3 to add, 0 to change, 0 to destroy.
 
 ```