From 2fa644e7a5613da867c2121b2cc182f8d9f28096 Mon Sep 17 00:00:00 2001
From: edisonhuang-google
 <128007594+edisonhuang-google@users.noreply.github.com>
Date: Thu, 16 Mar 2023 08:32:07 -0700
Subject: [PATCH] fix zone issue (#816)

---
 cai2hcl/compute_instance.go         | 5 +++--
 testdata/full_compute_instance.json | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cai2hcl/compute_instance.go b/cai2hcl/compute_instance.go
index 48dcd7544..845fe0d82 100644
--- a/cai2hcl/compute_instance.go
+++ b/cai2hcl/compute_instance.go
@@ -116,9 +116,10 @@ func (c *ComputeInstanceConverter) convertResourceData(asset *caiasset.Asset) (*
 	hclData["metadata"] = convertMetadata(instance.Metadata)
 
 	if instance.Zone == "" {
-		instance.Zone = parseFieldValue(asset.Name, "zones")
+		hclData["zone"] = parseFieldValue(asset.Name, "zones")
+	} else {
+		hclData["zone"] = parseFieldValue(instance.Zone, "zones")
 	}
-	hclData["zone"] = instance.Zone
 
 	ctyVal, err := mapToCtyValWithSchema(hclData, c.schema)
 	if err != nil {
diff --git a/testdata/full_compute_instance.json b/testdata/full_compute_instance.json
index 5f490b581..22ade1953 100644
--- a/testdata/full_compute_instance.json
+++ b/testdata/full_compute_instance.json
@@ -135,7 +135,8 @@
             "bar",
             "foo"
           ]
-        }
+        },
+        "zone": "projects/test-project/zones/us-central1-a"
       }
     }
   },