diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6c924033..ded274e9d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
jobs:
test:
docker:
- - image: runatlantis/testing-env:20296f9638a4eca04733f60b39e1d3025b9d708a
+ - image: runatlantis/testing-env:805e94e7f648eddb0484e539a7b51410d39529bc
steps:
- checkout
- run: make test-all
diff --git a/server/events_controller_e2e_test.go b/server/events_controller_e2e_test.go
index 3b1780baa..197b8e7fe 100644
--- a/server/events_controller_e2e_test.go
+++ b/server/events_controller_e2e_test.go
@@ -1037,44 +1037,61 @@ func assertCommentEquals(t *testing.T, expReplies []string, act string, repoDir
resourceRegex := regexp.MustCompile(`null_resource\.simple(\[\d])?\d?:.*`)
act = resourceRegex.ReplaceAllString(act, "null_resource.simple:")
- // For parallel plans and applies, do a substring match since output may be out of order
- var replyMatchesExpected func(string, string) bool
+ // For parallel plans and applies, we go through all expected replies and
+ // look for any 1 match. They can be out of order
if parallel {
- replyMatchesExpected = func(act string, expStr string) bool {
- return strings.Contains(act, expStr)
- }
- } else {
- replyMatchesExpected = func(act string, expStr string) bool {
- return expStr == act
- }
- }
-
- for _, expFile := range expReplies {
- exp, err := ioutil.ReadFile(filepath.Join(absRepoPath(t, repoDir), expFile))
- Ok(t, err)
- expStr := string(exp)
- // My editor adds a newline to all the files, so if the actual comment
- // doesn't end with a newline then strip the last newline from the file's
- // contents.
- if !strings.HasSuffix(act, "\n") {
- expStr = strings.TrimSuffix(expStr, "\n")
+ anyMatch := false
+ for _, expFile := range expReplies {
+ exp, err := ioutil.ReadFile(filepath.Join(absRepoPath(t, repoDir), expFile))
+ Ok(t, err)
+ expStr := string(exp)
+ // My editor adds a newline to all the files, so if the actual comment
+ // doesn't end with a newline then strip the last newline from the file's
+ // contents.
+ if !strings.HasSuffix(act, "\n") {
+ expStr = strings.TrimSuffix(expStr, "\n")
+ }
+ anyMatch = expStr == act
}
- if !replyMatchesExpected(act, expStr) {
+ if !anyMatch {
// 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.
if os.Getenv("CI") == "true" {
- t.Logf("exp: %s, got: %s", expStr, act)
+ t.Logf("got: %s, \nnone of the expected fixtures matches", act)
t.FailNow()
} else {
- actFile := filepath.Join(absRepoPath(t, repoDir), expFile+".act")
- err := ioutil.WriteFile(actFile, []byte(act), 0600)
- Ok(t, err)
- cwd, err := os.Getwd()
- Ok(t, err)
- rel, err := filepath.Rel(cwd, actFile)
- Ok(t, err)
- t.Errorf("%q was different, wrote actual comment to %q", expFile, rel)
+ t.Errorf("got: %s, \nnone of the expected fixtures matches", act)
+ }
+ }
+ } else {
+ for _, expFile := range expReplies {
+ exp, err := ioutil.ReadFile(filepath.Join(absRepoPath(t, repoDir), expFile))
+ Ok(t, err)
+ expStr := string(exp)
+ // My editor adds a newline to all the files, so if the actual comment
+ // doesn't end with a newline then strip the last newline from the file's
+ // contents.
+ if !strings.HasSuffix(act, "\n") {
+ expStr = strings.TrimSuffix(expStr, "\n")
+ }
+
+ if expStr != 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.
+ if os.Getenv("CI") == "true" {
+ t.Logf("exp: %s, got: %s", expStr, act)
+ t.FailNow()
+ } else {
+ actFile := filepath.Join(absRepoPath(t, repoDir), expFile+".act")
+ err := ioutil.WriteFile(actFile, []byte(act), 0600)
+ Ok(t, err)
+ cwd, err := os.Getwd()
+ Ok(t, err)
+ rel, err := filepath.Rel(cwd, actFile)
+ Ok(t, err)
+ t.Errorf("%q was different, wrote actual comment to %q", expFile, rel)
+ }
}
}
}
diff --git a/server/testfixtures/test-repos/automerge/exp-output-apply-dir1.txt b/server/testfixtures/test-repos/automerge/exp-output-apply-dir1.txt
index bae9bd1d0..19bf762f1 100644
--- a/server/testfixtures/test-repos/automerge/exp-output-apply-dir1.txt
+++ b/server/testfixtures/test-repos/automerge/exp-output-apply-dir1.txt
@@ -6,12 +6,5 @@ null_resource.automerge[0]: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
```
diff --git a/server/testfixtures/test-repos/automerge/exp-output-apply-dir2.txt b/server/testfixtures/test-repos/automerge/exp-output-apply-dir2.txt
index d6039490d..f48696615 100644
--- a/server/testfixtures/test-repos/automerge/exp-output-apply-dir2.txt
+++ b/server/testfixtures/test-repos/automerge/exp-output-apply-dir2.txt
@@ -6,12 +6,5 @@ null_resource.automerge[0]: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
```
diff --git a/server/testfixtures/test-repos/automerge/exp-output-autoplan.txt b/server/testfixtures/test-repos/automerge/exp-output-autoplan.txt
index 5bf30f999..8aa62370f 100644
--- a/server/testfixtures/test-repos/automerge/exp-output-autoplan.txt
+++ b/server/testfixtures/test-repos/automerge/exp-output-autoplan.txt
@@ -8,8 +8,8 @@ Ran Plan for 2 projects:
```diff
-An execution plan has been generated and is shown below.
-Resource actions are indicated with the following symbols:
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+ create
Terraform will perform the following actions:
@@ -37,8 +37,8 @@ Plan: 1 to add, 0 to change, 0 to destroy.
```diff
-An execution plan has been generated and is shown below.
-Resource actions are indicated with the following symbols:
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+ create
Terraform will perform the following actions:
diff --git a/server/testfixtures/test-repos/modules-yaml/exp-output-apply-production.txt b/server/testfixtures/test-repos/modules-yaml/exp-output-apply-production.txt
index 6c58d734c..4885579d1 100644
--- a/server/testfixtures/test-repos/modules-yaml/exp-output-apply-production.txt
+++ b/server/testfixtures/test-repos/modules-yaml/exp-output-apply-production.txt
@@ -1,24 +1,14 @@
Ran Apply for dir: `production` workspace: `default`
-Show Output
-
```diff
module.null.null_resource.this: Creating...
module.null.null_resource.this: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
var = "production"
```
-Show Output
-
```diff
module.null.null_resource.this: Creating...
module.null.null_resource.this: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
var = "staging"
```
-Show Output
-
```diff
module.null.null_resource.this: Creating...
module.null.null_resource.this: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
var = "production"
```
-Show Output
-
```diff
module.null.null_resource.this: Creating...
module.null.null_resource.this: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
var = "staging"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
workspace = "staging"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
var = "fromconfig"
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: terraform.tfstate
-
Outputs:
var = "fromconfig"
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: default.tfstate
-
Outputs:
var = "default"
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: staging.tfstate
-
Outputs:
var = "staging"
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: default.tfstate
-
Outputs:
var = "default"
workspace = "default"
```
-Show Output
-
```diff
null_resource.simple:
null_resource.simple:
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
-
-State path: staging.tfstate
-
Outputs:
var = "staging"
workspace = "default"
```
-Show Output
+Ran Apply for 2 projects:
+1. dir: `staging` workspace: `staging`
+1. dir: `production` workspace: `production`
+
+### 1. dir: `staging` workspace: `staging`
```diff
null_resource.this: Creating...
null_resource.this: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
+Outputs:
-State path: terraform.tfstate
+workspace = "staging"
+
+```
+
+---
+### 2. dir: `production` workspace: `production`
+```diff
+null_resource.this: Creating...
+null_resource.this: Creation complete after *s [id=*******************]
+
+Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
Outputs:
workspace = "production"
```
-Show Output
+Ran Apply for 2 projects:
+1. dir: `production` workspace: `production`
+1. dir: `staging` workspace: `staging`
+
+### 1. dir: `production` workspace: `production`
```diff
null_resource.this: Creating...
null_resource.this: Creation complete after *s [id=*******************]
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
-The state of your infrastructure has been saved to the path
-below. This state is required to modify and destroy your
-infrastructure, so keep it safe. To inspect the complete state
-use the `terraform show` command.
+Outputs:
-State path: terraform.tfstate
+workspace = "production"
+
+```
+
+---
+### 2. dir: `staging` workspace: `staging`
+```diff
+null_resource.this: Creating...
+null_resource.this: Creation complete after *s [id=*******************]
+
+Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
Outputs:
workspace = "staging"
```
-Show Output
```diff
-An execution plan has been generated and is shown below.
-Resource actions are indicated with the following symbols:
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+ create
Terraform will perform the following actions:
@@ -26,3 +32,42 @@ Changes to Outputs:
* :repeat: To **plan** this project again, comment:
* `atlantis plan -d production -w production`
Show Output
+
+```diff
+
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
++ create
+
+Terraform will perform the following actions:
+
+ # null_resource.this will be created
++ resource "null_resource" "this" {
+ + id = (known after apply)
+ }
+
+Plan: 1 to add, 0 to change, 0 to destroy.
+
+Changes to Outputs:
++ workspace = "staging"
+
+```
+
+* :arrow_forward: To **apply** this plan, comment:
+ * `atlantis apply -d staging -w staging`
+* :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
+* :repeat: To **plan** this project again, comment:
+ * `atlantis plan -d staging -w staging`
+Show Output
```diff
-An execution plan has been generated and is shown below.
-Resource actions are indicated with the following symbols:
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
++ create
+
+Terraform will perform the following actions:
+
+ # null_resource.this will be created
++ resource "null_resource" "this" {
+ + id = (known after apply)
+ }
+
+Plan: 1 to add, 0 to change, 0 to destroy.
+
+Changes to Outputs:
++ workspace = "production"
+
+```
+
+* :arrow_forward: To **apply** this plan, comment:
+ * `atlantis apply -d production -w production`
+* :put_litter_in_its_place: To **delete** this plan click [here](lock-url)
+* :repeat: To **plan** this project again, comment:
+ * `atlantis plan -d production -w production`
+Show Output
+
+```diff
+
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+ create
Terraform will perform the following actions:
@@ -26,3 +64,10 @@ Changes to Outputs:
* :repeat: To **plan** this project again, comment:
* `atlantis plan -d staging -w staging`