From f44e9120727366dcca31b6163e9b173b8943e723 Mon Sep 17 00:00:00 2001
From: Adrien Delorme <azr@users.noreply.github.com>
Date: Wed, 11 Nov 2020 20:54:22 +0100
Subject: [PATCH] Update hcl2upgrade command to update env calls + tests
 (#10244)

---
 command/hcl2_upgrade.go                                   | 2 +-
 command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl | 5 +++++
 command/test-fixtures/hcl2_upgrade_basic/input.json       | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go
index 13148c430..bcb6936b2 100644
--- a/command/hcl2_upgrade.go
+++ b/command/hcl2_upgrade.go
@@ -322,7 +322,7 @@ func transposeTemplatingCalls(s []byte) []byte {
 			return fmt.Sprintf("${var.%s}", in)
 		},
 		"env": func(in string) string {
-			return fmt.Sprintf("${var.%s}", in)
+			return fmt.Sprintf("${env(%q)}", in)
 		},
 		"build": func(a string) string {
 			return fmt.Sprintf("${build.%s}", a)
diff --git a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl
index 97b18111f..31091a90a 100644
--- a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl
+++ b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl
@@ -30,6 +30,11 @@ variable "aws_region" {
   type = string
 }
 
+variable "aws_secondary_region" {
+  type    = string
+  default = "${env("AWS_DEFAULT_REGION")}"
+}
+
 variable "aws_secret_key" {
   type      = string
   default   = ""
diff --git a/command/test-fixtures/hcl2_upgrade_basic/input.json b/command/test-fixtures/hcl2_upgrade_basic/input.json
index b6f9a9302..a7fca659b 100644
--- a/command/test-fixtures/hcl2_upgrade_basic/input.json
+++ b/command/test-fixtures/hcl2_upgrade_basic/input.json
@@ -3,6 +3,7 @@
     "variables": {
         "secret_account": "🤷",
         "aws_region": null,
+        "aws_secondary_region": "{{ env `AWS_DEFAULT_REGION` }}",
         "aws_secret_key": "",
         "aws_access_key": ""
     },