Skip to content

Commit

Permalink
Fix e2e test fixtures for tf0.14. (#1396)
Browse files Browse the repository at this point in the history
  • Loading branch information
nishkrishnan committed Feb 11, 2021
1 parent fe528c0 commit 10d7b28
Show file tree
Hide file tree
Showing 48 changed files with 122 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ State path: terraform.tfstate

Outputs:

var = production
var = "production"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ State path: terraform.tfstate

Outputs:

var = staging
var = "staging"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "staging"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down Expand Up @@ -49,6 +52,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "production"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ variable "var" {}
resource "null_resource" "this" {
}
output "var" {
value = "${var.var}"
value = var.var
}

output "workspace" {
value = "${terraform.workspace}"
value = terraform.workspace
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module "null" {
var = "production"
}
output "var" {
value = "${module.null.var}"
value = module.null.var
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module "null" {
var = "staging"
}
output "var" {
value = "${module.null.var}"
value = module.null.var
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ State path: terraform.tfstate

Outputs:

var = production
var = "production"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ State path: terraform.tfstate

Outputs:

var = staging
var = "staging"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "staging"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "production"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "staging"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
4 changes: 2 additions & 2 deletions server/testfixtures/test-repos/modules/modules/null/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ variable "var" {}
resource "null_resource" "this" {
}
output "var" {
value = "${var.var}"
value = var.var
}

output "workspace" {
value = "${terraform.workspace}"
value = terraform.workspace
}
2 changes: 1 addition & 1 deletion server/testfixtures/test-repos/modules/production/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module "null" {
var = "production"
}
output "var" {
value = "${module.null.var}"
value = module.null.var
}
2 changes: 1 addition & 1 deletion server/testfixtures/test-repos/modules/staging/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module "null" {
var = "staging"
}
output "var" {
value = "${module.null.var}"
value = module.null.var
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ State path: terraform.tfstate

Outputs:

workspace = default
workspace = "default"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ State path: terraform.tfstate

Outputs:

workspace = staging
workspace = "staging"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ workspace = "default"

postplan custom

```
Expand Down Expand Up @@ -55,6 +58,9 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ workspace = "staging"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
2 changes: 1 addition & 1 deletion server/testfixtures/test-repos/server-side-cfg/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ resource "null_resource" "simple" {
}

output "workspace" {
value = "${terraform.workspace}"
value = terraform.workspace
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ State path: terraform.tfstate

Outputs:

var = fromconfig
workspace = default
var = "fromconfig"
workspace = "default"

```
</details>
Expand All @@ -48,8 +48,8 @@ State path: terraform.tfstate

Outputs:

var = fromfile
workspace = staging
var = "fromfile"
workspace = "staging"

postapply

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ State path: terraform.tfstate

Outputs:

var = fromconfig
workspace = default
var = "fromconfig"
workspace = "default"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ State path: terraform.tfstate

Outputs:

var = fromfile
workspace = staging
var = "fromfile"
workspace = "staging"

postapply

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "fromconfig"
+ workspace = "default"

postplan

```
Expand Down Expand Up @@ -53,6 +57,10 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "fromfile"
+ workspace = "staging"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
4 changes: 2 additions & 2 deletions server/testfixtures/test-repos/simple-yaml/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ variable "var" {
}

output "var" {
value = "${var.var}"
value = var.var
}

output "workspace" {
value = "${terraform.workspace}"
value = terraform.workspace
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ State path: terraform.tfstate

Outputs:

var = default_workspace
workspace = default
var = "default_workspace"
workspace = "default"

```
</details>
Expand Down Expand Up @@ -54,8 +54,8 @@ State path: terraform.tfstate

Outputs:

var = new_workspace
workspace = new_workspace
var = "new_workspace"
workspace = "new_workspace"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ State path: terraform.tfstate

Outputs:

var = default_workspace
workspace = default
var = "default_workspace"
workspace = "default"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ State path: terraform.tfstate

Outputs:

var = new_workspace
workspace = new_workspace
var = "new_workspace"
workspace = "new_workspace"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ State path: terraform.tfstate

Outputs:

var = overridden
workspace = default
var = "overridden"
workspace = "default"

```
</details>
Expand Down
4 changes: 2 additions & 2 deletions server/testfixtures/test-repos/simple/exp-output-apply.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ State path: terraform.tfstate

Outputs:

var = default
workspace = default
var = "default"
workspace = "default"

```
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "new_workspace"
+ workspace = "new_workspace"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "overridden"
+ workspace = "default"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "default_workspace"
+ workspace = "default"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
4 changes: 4 additions & 0 deletions server/testfixtures/test-repos/simple/exp-output-autoplan.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Terraform will perform the following actions:

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

Changes to Outputs:
+ var = "default"
+ workspace = "default"

```

* :arrow_forward: To **apply** this plan, comment:
Expand Down
4 changes: 2 additions & 2 deletions server/testfixtures/test-repos/simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ variable "var" {
}

output "var" {
value = "${var.var}"
value = var.var
}

output "workspace" {
value = "${terraform.workspace}"
value = terraform.workspace
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ State path: default.tfstate

Outputs:

var = default
workspace = default
var = "default"
workspace = "default"

```
</details>
Expand Down
Loading

0 comments on commit 10d7b28

Please sign in to comment.