Skip to content

Commit

Permalink
fix: trim space markdown renderer (runatlantis#2947)
Browse files Browse the repository at this point in the history
* chore: trim space rendered templates

* regen e2e results

* revert parallel output substring check test case

* follow master branch

* follow main branch

* Update approve_policies_command_runner_test.go

Co-authored-by: nitrocode <[email protected]>
  • Loading branch information
krrrr38 and nitrocode authored Jan 11, 2023
1 parent 35151e6 commit 6f28b6a
Show file tree
Hide file tree
Showing 106 changed files with 313 additions and 498 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@ null_resource.automerge[0]: Creating...
null_resource.automerge[0]: Creation complete after *s [id=*******************]

Apply complete! Resources: 1 added, 0 changed, 0 destroyed.


```

```
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@ null_resource.automerge[0]: Creating...
null_resource.automerge[0]: Creation complete after *s [id=*******************]

Apply complete! Resources: 1 added, 0 changed, 0 destroyed.


```

```
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ Ran Plan for 2 projects:
1. dir: `dir2` workspace: `default`

### 1. dir: `dir1` workspace: `default`
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -20,24 +17,17 @@ Terraform will perform the following actions:
}

Plan: 1 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
* `atlantis apply -d dir1`
* :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
* :repeat: To **plan** this project again, comment:
* `atlantis plan -d dir1`
</details>
Plan: 1 to add, 0 to change, 0 to destroy.

---
### 2. dir: `dir2` workspace: `default`
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -50,20 +40,16 @@ Terraform will perform the following actions:
}

Plan: 1 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
* `atlantis apply -d dir2`
* :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
* :repeat: To **plan** this project again, comment:
* `atlantis plan -d dir2`
</details>
Plan: 1 to add, 0 to change, 0 to destroy.

---
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Ran Plan for 2 projects:
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -26,8 +25,6 @@ Terraform will perform the following actions:
}

Plan: 1 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -43,7 +40,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -62,8 +58,6 @@ Terraform will perform the following actions:
}

Plan: 1 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -78,4 +72,4 @@ Plan: 1 to add, 0 to change, 0 to destroy.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ Import successful!

The resources that were imported are shown above. These resources are now in
your Terraform state and will henceforth be managed by Terraform.


```

* :repeat: To **plan** this project again, comment:
* `atlantis plan -d dir1`


* `atlantis plan -d dir1`
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ No changes. Your infrastructure matches the configuration.

Terraform has compared your real infrastructure against your configuration
and found no differences, so no changes are needed.

```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -25,7 +24,6 @@ and found no differences, so no changes are needed.
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -44,8 +42,6 @@ Terraform will perform the following actions:
}

Plan: 1 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -60,4 +56,4 @@ Plan: 1 to add, 0 to change, 0 to destroy.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Ran Plan for dir: `.` workspace: `default`
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand Down Expand Up @@ -33,8 +32,6 @@ Terraform will perform the following actions:
}

Plan: 2 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -49,4 +46,4 @@ Plan: 2 to add, 0 to change, 0 to destroy.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ Import successful!

The resources that were imported are shown above. These resources are now in
your Terraform state and will henceforth be managed by Terraform.


```

* :repeat: To **plan** this project again, comment:
* `atlantis plan -d .`


* `atlantis plan -d .`
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ Import successful!

The resources that were imported are shown above. These resources are now in
your Terraform state and will henceforth be managed by Terraform.


```

* :repeat: To **plan** this project again, comment:
* `atlantis plan -d .`


* `atlantis plan -d .`
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
Ran Plan for dir: `.` workspace: `default`

```diff

No changes. Your infrastructure matches the configuration.

Terraform has compared your real infrastructure against your configuration
and found no differences, so no changes are needed.

```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -19,4 +17,4 @@ and found no differences, so no changes are needed.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
Ran Apply for 0 projects:



Ran Apply for 0 projects:
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Ran Plan for dir: `.` workspace: `default`
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand Down Expand Up @@ -33,8 +32,6 @@ Terraform will perform the following actions:
}

Plan: 2 to add, 0 to change, 0 to destroy.


```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -49,4 +46,4 @@ Plan: 2 to add, 0 to change, 0 to destroy.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ Import successful!

The resources that were imported are shown above. These resources are now in
your Terraform state and will henceforth be managed by Terraform.


```

* :repeat: To **plan** this project again, comment:
* `atlantis plan -d .`


* `atlantis plan -d .`
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ Import successful!

The resources that were imported are shown above. These resources are now in
your Terraform state and will henceforth be managed by Terraform.


```

* :repeat: To **plan** this project again, comment:
* `atlantis plan -d .`


* `atlantis plan -d .`
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
Ran Plan for dir: `.` workspace: `default`

```diff

No changes. Your infrastructure matches the configuration.

Terraform has compared your real infrastructure against your configuration
and found no differences, so no changes are needed.

```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -19,4 +17,4 @@ and found no differences, so no changes are needed.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
Outputs:

var = "production"

```

```
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
Outputs:

var = "staging"

```

```
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Ran Plan for 2 projects:
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -23,7 +22,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.

Changes to Outputs:
+ var = "staging"

```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -39,7 +37,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.
<details><summary>Show Output</summary>

```diff

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
Expand All @@ -55,7 +52,6 @@ Plan: 1 to add, 0 to change, 0 to destroy.

Changes to Outputs:
+ var = "production"

```

* :arrow_forward: To **apply** this plan, comment:
Expand All @@ -70,4 +66,4 @@ Plan: 1 to add, 0 to change, 0 to destroy.
* :fast_forward: To **apply** all unapplied plans from this pull request, comment:
* `atlantis apply`
* :put_litter_in_its_place: To delete all plans and locks for the PR, comment:
* `atlantis unlock`
* `atlantis unlock`
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
Outputs:

var = "production"

```

```
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
Outputs:

var = "staging"

```

```
Loading

0 comments on commit 6f28b6a

Please sign in to comment.