From 10d7b282e8a3a9ae89e3fc41b5eba6d6c53ef777 Mon Sep 17 00:00:00 2001 From: Nish Krishnan Date: Wed, 10 Feb 2021 16:48:35 -0800 Subject: [PATCH] Fix e2e test fixtures for tf0.14. (#1396) --- .../modules-yaml/exp-output-apply-production.txt | 2 +- .../test-repos/modules-yaml/exp-output-apply-staging.txt | 2 +- .../test-repos/modules-yaml/exp-output-autoplan.txt | 6 ++++++ .../test-repos/modules-yaml/modules/null/main.tf | 4 ++-- .../test-repos/modules-yaml/production/main.tf | 2 +- .../testfixtures/test-repos/modules-yaml/staging/main.tf | 2 +- .../test-repos/modules/exp-output-apply-production.txt | 2 +- .../test-repos/modules/exp-output-apply-staging.txt | 2 +- .../modules/exp-output-autoplan-only-staging.txt | 3 +++ .../test-repos/modules/exp-output-plan-production.txt | 3 +++ .../test-repos/modules/exp-output-plan-staging.txt | 3 +++ .../testfixtures/test-repos/modules/modules/null/main.tf | 4 ++-- server/testfixtures/test-repos/modules/production/main.tf | 2 +- server/testfixtures/test-repos/modules/staging/main.tf | 2 +- .../exp-output-apply-default-workspace.txt | 2 +- .../exp-output-apply-staging-workspace.txt | 2 +- .../test-repos/server-side-cfg/exp-output-autoplan.txt | 6 ++++++ server/testfixtures/test-repos/server-side-cfg/main.tf | 2 +- .../test-repos/simple-yaml/exp-output-apply-all.txt | 8 ++++---- .../test-repos/simple-yaml/exp-output-apply-default.txt | 4 ++-- .../test-repos/simple-yaml/exp-output-apply-staging.txt | 4 ++-- .../test-repos/simple-yaml/exp-output-autoplan.txt | 8 ++++++++ server/testfixtures/test-repos/simple-yaml/main.tf | 4 ++-- .../test-repos/simple/exp-output-apply-var-all.txt | 8 ++++---- .../simple/exp-output-apply-var-default-workspace.txt | 4 ++-- .../simple/exp-output-apply-var-new-workspace.txt | 4 ++-- .../test-repos/simple/exp-output-apply-var.txt | 4 ++-- .../testfixtures/test-repos/simple/exp-output-apply.txt | 4 ++-- .../simple/exp-output-atlantis-plan-new-workspace.txt | 4 ++++ .../simple/exp-output-atlantis-plan-var-overridden.txt | 4 ++++ .../test-repos/simple/exp-output-atlantis-plan.txt | 4 ++++ .../test-repos/simple/exp-output-autoplan.txt | 4 ++++ server/testfixtures/test-repos/simple/main.tf | 4 ++-- .../tfvars-yaml-no-autoplan/exp-output-apply-default.txt | 4 ++-- .../tfvars-yaml-no-autoplan/exp-output-apply-staging.txt | 4 ++-- .../tfvars-yaml-no-autoplan/exp-output-plan-default.txt | 4 ++++ .../tfvars-yaml-no-autoplan/exp-output-plan-staging.txt | 4 ++++ .../test-repos/tfvars-yaml-no-autoplan/main.tf | 4 ++-- .../test-repos/tfvars-yaml/exp-output-apply-default.txt | 4 ++-- .../test-repos/tfvars-yaml/exp-output-apply-staging.txt | 4 ++-- .../test-repos/tfvars-yaml/exp-output-autoplan.txt | 8 ++++++++ server/testfixtures/test-repos/tfvars-yaml/main.tf | 4 ++-- .../exp-output-apply-all-production.txt | 2 +- .../exp-output-apply-all-staging.txt | 2 +- .../exp-output-autoplan-production.txt | 3 +++ .../exp-output-autoplan-staging.txt | 3 +++ .../test-repos/workspace-parallel-yaml/production/main.tf | 2 +- .../test-repos/workspace-parallel-yaml/staging/main.tf | 2 +- 48 files changed, 122 insertions(+), 55 deletions(-) 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 74ef084b01..6c58d734c9 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 @@ -17,7 +17,7 @@ State path: terraform.tfstate Outputs: -var = production +var = "production" ``` diff --git a/server/testfixtures/test-repos/modules-yaml/exp-output-apply-staging.txt b/server/testfixtures/test-repos/modules-yaml/exp-output-apply-staging.txt index da1897d5a6..f6423bf83b 100644 --- a/server/testfixtures/test-repos/modules-yaml/exp-output-apply-staging.txt +++ b/server/testfixtures/test-repos/modules-yaml/exp-output-apply-staging.txt @@ -17,7 +17,7 @@ State path: terraform.tfstate Outputs: -var = staging +var = "staging" ``` diff --git a/server/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt b/server/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt index d6bf0de5b2..9b53b55d9c 100644 --- a/server/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt +++ b/server/testfixtures/test-repos/modules-yaml/exp-output-autoplan.txt @@ -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: @@ -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: diff --git a/server/testfixtures/test-repos/modules-yaml/modules/null/main.tf b/server/testfixtures/test-repos/modules-yaml/modules/null/main.tf index 14f6a189c1..1a52b6d221 100644 --- a/server/testfixtures/test-repos/modules-yaml/modules/null/main.tf +++ b/server/testfixtures/test-repos/modules-yaml/modules/null/main.tf @@ -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 } diff --git a/server/testfixtures/test-repos/modules-yaml/production/main.tf b/server/testfixtures/test-repos/modules-yaml/production/main.tf index 94a103ffba..e8c380ec41 100644 --- a/server/testfixtures/test-repos/modules-yaml/production/main.tf +++ b/server/testfixtures/test-repos/modules-yaml/production/main.tf @@ -3,5 +3,5 @@ module "null" { var = "production" } output "var" { - value = "${module.null.var}" + value = module.null.var } \ No newline at end of file diff --git a/server/testfixtures/test-repos/modules-yaml/staging/main.tf b/server/testfixtures/test-repos/modules-yaml/staging/main.tf index 15fa81303a..be20bbab3d 100644 --- a/server/testfixtures/test-repos/modules-yaml/staging/main.tf +++ b/server/testfixtures/test-repos/modules-yaml/staging/main.tf @@ -3,5 +3,5 @@ module "null" { var = "staging" } output "var" { - value = "${module.null.var}" + value = module.null.var } \ No newline at end of file diff --git a/server/testfixtures/test-repos/modules/exp-output-apply-production.txt b/server/testfixtures/test-repos/modules/exp-output-apply-production.txt index 74ef084b01..6c58d734c9 100644 --- a/server/testfixtures/test-repos/modules/exp-output-apply-production.txt +++ b/server/testfixtures/test-repos/modules/exp-output-apply-production.txt @@ -17,7 +17,7 @@ State path: terraform.tfstate Outputs: -var = production +var = "production" ``` diff --git a/server/testfixtures/test-repos/modules/exp-output-apply-staging.txt b/server/testfixtures/test-repos/modules/exp-output-apply-staging.txt index da1897d5a6..f6423bf83b 100644 --- a/server/testfixtures/test-repos/modules/exp-output-apply-staging.txt +++ b/server/testfixtures/test-repos/modules/exp-output-apply-staging.txt @@ -17,7 +17,7 @@ State path: terraform.tfstate Outputs: -var = staging +var = "staging" ``` diff --git a/server/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt b/server/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt index ff6dc802d4..a1b516ccab 100644 --- a/server/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt +++ b/server/testfixtures/test-repos/modules/exp-output-autoplan-only-staging.txt @@ -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: diff --git a/server/testfixtures/test-repos/modules/exp-output-plan-production.txt b/server/testfixtures/test-repos/modules/exp-output-plan-production.txt index 0b6a2c522a..c7ab213ebe 100644 --- a/server/testfixtures/test-repos/modules/exp-output-plan-production.txt +++ b/server/testfixtures/test-repos/modules/exp-output-plan-production.txt @@ -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: diff --git a/server/testfixtures/test-repos/modules/exp-output-plan-staging.txt b/server/testfixtures/test-repos/modules/exp-output-plan-staging.txt index ff6dc802d4..a1b516ccab 100644 --- a/server/testfixtures/test-repos/modules/exp-output-plan-staging.txt +++ b/server/testfixtures/test-repos/modules/exp-output-plan-staging.txt @@ -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: diff --git a/server/testfixtures/test-repos/modules/modules/null/main.tf b/server/testfixtures/test-repos/modules/modules/null/main.tf index 14f6a189c1..1a52b6d221 100644 --- a/server/testfixtures/test-repos/modules/modules/null/main.tf +++ b/server/testfixtures/test-repos/modules/modules/null/main.tf @@ -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 } diff --git a/server/testfixtures/test-repos/modules/production/main.tf b/server/testfixtures/test-repos/modules/production/main.tf index 94a103ffba..e8c380ec41 100644 --- a/server/testfixtures/test-repos/modules/production/main.tf +++ b/server/testfixtures/test-repos/modules/production/main.tf @@ -3,5 +3,5 @@ module "null" { var = "production" } output "var" { - value = "${module.null.var}" + value = module.null.var } \ No newline at end of file diff --git a/server/testfixtures/test-repos/modules/staging/main.tf b/server/testfixtures/test-repos/modules/staging/main.tf index 15fa81303a..be20bbab3d 100644 --- a/server/testfixtures/test-repos/modules/staging/main.tf +++ b/server/testfixtures/test-repos/modules/staging/main.tf @@ -3,5 +3,5 @@ module "null" { var = "staging" } output "var" { - value = "${module.null.var}" + value = module.null.var } \ No newline at end of file diff --git a/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-default-workspace.txt b/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-default-workspace.txt index dc6833899e..e6e44deb94 100644 --- a/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-default-workspace.txt +++ b/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-default-workspace.txt @@ -17,7 +17,7 @@ State path: terraform.tfstate Outputs: -workspace = default +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-staging-workspace.txt b/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-staging-workspace.txt index 4df252bfcb..5907ea6230 100644 --- a/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-staging-workspace.txt +++ b/server/testfixtures/test-repos/server-side-cfg/exp-output-apply-staging-workspace.txt @@ -17,7 +17,7 @@ State path: terraform.tfstate Outputs: -workspace = staging +workspace = "staging" ``` diff --git a/server/testfixtures/test-repos/server-side-cfg/exp-output-autoplan.txt b/server/testfixtures/test-repos/server-side-cfg/exp-output-autoplan.txt index dcf03dcc1d..97048307e8 100644 --- a/server/testfixtures/test-repos/server-side-cfg/exp-output-autoplan.txt +++ b/server/testfixtures/test-repos/server-side-cfg/exp-output-autoplan.txt @@ -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 ``` @@ -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: diff --git a/server/testfixtures/test-repos/server-side-cfg/main.tf b/server/testfixtures/test-repos/server-side-cfg/main.tf index d126e71bb8..582f9ea01d 100644 --- a/server/testfixtures/test-repos/server-side-cfg/main.tf +++ b/server/testfixtures/test-repos/server-side-cfg/main.tf @@ -3,5 +3,5 @@ resource "null_resource" "simple" { } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace } diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt index 04650e8e2d..8ce7870f18 100644 --- a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt +++ b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt @@ -21,8 +21,8 @@ State path: terraform.tfstate Outputs: -var = fromconfig -workspace = default +var = "fromconfig" +workspace = "default" ``` @@ -48,8 +48,8 @@ State path: terraform.tfstate Outputs: -var = fromfile -workspace = staging +var = "fromfile" +workspace = "staging" postapply diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt index b1cf7d000b..eb8fdb9d59 100644 --- a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt +++ b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt @@ -17,8 +17,8 @@ State path: terraform.tfstate Outputs: -var = fromconfig -workspace = default +var = "fromconfig" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt index e95937a713..88939e2731 100644 --- a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt +++ b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt @@ -19,8 +19,8 @@ State path: terraform.tfstate Outputs: -var = fromfile -workspace = staging +var = "fromfile" +workspace = "staging" postapply diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-autoplan.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-autoplan.txt index 2f4c57e87d..d424ef8f9b 100644 --- a/server/testfixtures/test-repos/simple-yaml/exp-output-autoplan.txt +++ b/server/testfixtures/test-repos/simple-yaml/exp-output-autoplan.txt @@ -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 ``` @@ -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: diff --git a/server/testfixtures/test-repos/simple-yaml/main.tf b/server/testfixtures/test-repos/simple-yaml/main.tf index 39f891a7b0..5244684b7f 100644 --- a/server/testfixtures/test-repos/simple-yaml/main.tf +++ b/server/testfixtures/test-repos/simple-yaml/main.tf @@ -7,9 +7,9 @@ variable "var" { } output "var" { - value = "${var.var}" + value = var.var } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace } \ No newline at end of file diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt index 3f7608772d..ac8362b9a3 100644 --- a/server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt +++ b/server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt @@ -25,8 +25,8 @@ State path: terraform.tfstate Outputs: -var = default_workspace -workspace = default +var = "default_workspace" +workspace = "default" ``` @@ -54,8 +54,8 @@ State path: terraform.tfstate Outputs: -var = new_workspace -workspace = new_workspace +var = "new_workspace" +workspace = "new_workspace" ``` diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt index a6e2b9cc49..eb508fdec5 100644 --- a/server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt +++ b/server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt @@ -21,8 +21,8 @@ State path: terraform.tfstate Outputs: -var = default_workspace -workspace = default +var = "default_workspace" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt index 131f651bc2..87f877a9c9 100644 --- a/server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt +++ b/server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt @@ -21,8 +21,8 @@ State path: terraform.tfstate Outputs: -var = new_workspace -workspace = new_workspace +var = "new_workspace" +workspace = "new_workspace" ``` diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var.txt index 1d62accca9..01ebc3a6ad 100644 --- a/server/testfixtures/test-repos/simple/exp-output-apply-var.txt +++ b/server/testfixtures/test-repos/simple/exp-output-apply-var.txt @@ -21,8 +21,8 @@ State path: terraform.tfstate Outputs: -var = overridden -workspace = default +var = "overridden" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/simple/exp-output-apply.txt b/server/testfixtures/test-repos/simple/exp-output-apply.txt index 88c40e056d..c0f6d13d2a 100644 --- a/server/testfixtures/test-repos/simple/exp-output-apply.txt +++ b/server/testfixtures/test-repos/simple/exp-output-apply.txt @@ -21,8 +21,8 @@ State path: terraform.tfstate Outputs: -var = default -workspace = default +var = "default" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt b/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt index f65d52ded4..4cdcc1680f 100644 --- a/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt +++ b/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt @@ -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: diff --git a/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt b/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt index 35edc4838b..c9a1a6b735 100644 --- a/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt +++ b/server/testfixtures/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt @@ -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: diff --git a/server/testfixtures/test-repos/simple/exp-output-atlantis-plan.txt b/server/testfixtures/test-repos/simple/exp-output-atlantis-plan.txt index 4d25f04581..b27975c0b2 100644 --- a/server/testfixtures/test-repos/simple/exp-output-atlantis-plan.txt +++ b/server/testfixtures/test-repos/simple/exp-output-atlantis-plan.txt @@ -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: diff --git a/server/testfixtures/test-repos/simple/exp-output-autoplan.txt b/server/testfixtures/test-repos/simple/exp-output-autoplan.txt index 88124493d5..dc2543cc16 100644 --- a/server/testfixtures/test-repos/simple/exp-output-autoplan.txt +++ b/server/testfixtures/test-repos/simple/exp-output-autoplan.txt @@ -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: diff --git a/server/testfixtures/test-repos/simple/main.tf b/server/testfixtures/test-repos/simple/main.tf index 77056e2be5..2394ee4a7a 100644 --- a/server/testfixtures/test-repos/simple/main.tf +++ b/server/testfixtures/test-repos/simple/main.tf @@ -10,9 +10,9 @@ variable "var" { } output "var" { - value = "${var.var}" + value = var.var } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace } diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt index d6a7f5e258..0cb3d92860 100644 --- a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt +++ b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt @@ -17,8 +17,8 @@ State path: default.tfstate Outputs: -var = default -workspace = default +var = "default" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt index 77dfb0b020..4bb2890595 100644 --- a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt +++ b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt @@ -17,8 +17,8 @@ State path: staging.tfstate Outputs: -var = staging -workspace = default +var = "staging" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt index 07fb3d7fa7..c580909e04 100644 --- a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt +++ b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt @@ -17,6 +17,10 @@ Terraform will perform the following actions: Plan: 1 to add, 0 to change, 0 to destroy. +Changes to Outputs: ++ var = "default" ++ workspace = "default" + ``` * :arrow_forward: To **apply** this plan, comment: diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt index ced8df0b88..2422cd3c33 100644 --- a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt +++ b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt @@ -17,6 +17,10 @@ Terraform will perform the following actions: Plan: 1 to add, 0 to change, 0 to destroy. +Changes to Outputs: ++ var = "staging" ++ workspace = "default" + ``` * :arrow_forward: To **apply** this plan, comment: diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/main.tf b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/main.tf index d4d77ff4e7..72fbd2bec1 100644 --- a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/main.tf +++ b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/main.tf @@ -11,9 +11,9 @@ variable "var" { } output "var" { - value = "${var.var}" + value = var.var } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace } \ No newline at end of file diff --git a/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt b/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt index d6a7f5e258..0cb3d92860 100644 --- a/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt +++ b/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt @@ -17,8 +17,8 @@ State path: default.tfstate Outputs: -var = default -workspace = default +var = "default" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt b/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt index 77dfb0b020..4bb2890595 100644 --- a/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt +++ b/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt @@ -17,8 +17,8 @@ State path: staging.tfstate Outputs: -var = staging -workspace = default +var = "staging" +workspace = "default" ``` diff --git a/server/testfixtures/test-repos/tfvars-yaml/exp-output-autoplan.txt b/server/testfixtures/test-repos/tfvars-yaml/exp-output-autoplan.txt index ba1a86b235..66b428be32 100644 --- a/server/testfixtures/test-repos/tfvars-yaml/exp-output-autoplan.txt +++ b/server/testfixtures/test-repos/tfvars-yaml/exp-output-autoplan.txt @@ -21,6 +21,10 @@ Terraform will perform the following actions: Plan: 1 to add, 0 to change, 0 to destroy. +Changes to Outputs: ++ var = "default" ++ workspace = "default" + workspace=default ``` @@ -51,6 +55,10 @@ Terraform will perform the following actions: Plan: 1 to add, 0 to change, 0 to destroy. +Changes to Outputs: ++ var = "staging" ++ workspace = "default" + ``` * :arrow_forward: To **apply** this plan, comment: diff --git a/server/testfixtures/test-repos/tfvars-yaml/main.tf b/server/testfixtures/test-repos/tfvars-yaml/main.tf index d4d77ff4e7..72fbd2bec1 100644 --- a/server/testfixtures/test-repos/tfvars-yaml/main.tf +++ b/server/testfixtures/test-repos/tfvars-yaml/main.tf @@ -11,9 +11,9 @@ variable "var" { } output "var" { - value = "${var.var}" + value = var.var } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace } \ No newline at end of file diff --git a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-production.txt b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-production.txt index e7baee5eec..8db99dcebb 100644 --- a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-production.txt +++ b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-production.txt @@ -15,7 +15,7 @@ State path: terraform.tfstate Outputs: -workspace = production +workspace = "production" ``` diff --git a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-staging.txt b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-staging.txt index 1694d3741b..09914e65d5 100644 --- a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-staging.txt +++ b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-staging.txt @@ -15,7 +15,7 @@ State path: terraform.tfstate Outputs: -workspace = staging +workspace = "staging" ``` diff --git a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt index 136c895af7..a3b2973c5d 100644 --- a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt +++ b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt @@ -15,6 +15,9 @@ Terraform will perform the following actions: Plan: 1 to add, 0 to change, 0 to destroy. +Changes to Outputs: ++ workspace = "production" + ``` * :arrow_forward: To **apply** this plan, comment: diff --git a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt index 8ba8f0312d..5f172a9613 100644 --- a/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt +++ b/server/testfixtures/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt @@ -15,6 +15,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: diff --git a/server/testfixtures/test-repos/workspace-parallel-yaml/production/main.tf b/server/testfixtures/test-repos/workspace-parallel-yaml/production/main.tf index f69db6a260..62f1e77964 100644 --- a/server/testfixtures/test-repos/workspace-parallel-yaml/production/main.tf +++ b/server/testfixtures/test-repos/workspace-parallel-yaml/production/main.tf @@ -1,5 +1,5 @@ resource "null_resource" "this" { } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace } diff --git a/server/testfixtures/test-repos/workspace-parallel-yaml/staging/main.tf b/server/testfixtures/test-repos/workspace-parallel-yaml/staging/main.tf index f69db6a260..62f1e77964 100644 --- a/server/testfixtures/test-repos/workspace-parallel-yaml/staging/main.tf +++ b/server/testfixtures/test-repos/workspace-parallel-yaml/staging/main.tf @@ -1,5 +1,5 @@ resource "null_resource" "this" { } output "workspace" { - value = "${terraform.workspace}" + value = terraform.workspace }