From 3c1cc72d51e43166b74c70034bf8061491e03310 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Thu, 1 Jul 2021 08:15:52 -0400 Subject: [PATCH] Include GCP Project in terraform HCL2 output This has been included in the JSON output but was missing from HCL2 --- tests/integration/update_cluster/ha_gce/kubernetes.tf | 3 ++- tests/integration/update_cluster/minimal_gce/kubernetes.tf | 3 ++- upup/pkg/fi/cloudup/terraform/target_hcl2.go | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf index f248b72d87..19dcdb316c 100644 --- a/tests/integration/update_cluster/ha_gce/kubernetes.tf +++ b/tests/integration/update_cluster/ha_gce/kubernetes.tf @@ -17,7 +17,8 @@ output "region" { } provider "google" { - region = "us-test1" + project = "us-test1" + region = "us-test1" } resource "google_compute_disk" "d1-etcd-events-ha-gce-example-com" { diff --git a/tests/integration/update_cluster/minimal_gce/kubernetes.tf b/tests/integration/update_cluster/minimal_gce/kubernetes.tf index 6701cf54d0..420b40a144 100644 --- a/tests/integration/update_cluster/minimal_gce/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce/kubernetes.tf @@ -17,7 +17,8 @@ output "region" { } provider "google" { - region = "us-test1" + project = "us-test1" + region = "us-test1" } resource "google_compute_disk" "d1-etcd-events-minimal-gce-example-com" { diff --git a/upup/pkg/fi/cloudup/terraform/target_hcl2.go b/upup/pkg/fi/cloudup/terraform/target_hcl2.go index d49f7f830f..d8ba3f3b96 100644 --- a/upup/pkg/fi/cloudup/terraform/target_hcl2.go +++ b/upup/pkg/fi/cloudup/terraform/target_hcl2.go @@ -42,6 +42,9 @@ func (t *TerraformTarget) finishHCL2(taskMap map[string]fi.Task) error { } providerBlock := rootBody.AppendNewBlock("provider", []string{providerName}) providerBody := providerBlock.Body() + if t.Cloud.ProviderID() == kops.CloudProviderGCE { + providerBody.SetAttributeValue("project", cty.StringVal(t.Project)) + } providerBody.SetAttributeValue("region", cty.StringVal(t.Cloud.Region())) for k, v := range tfGetProviderExtraConfig(t.clusterSpecTarget) { providerBody.SetAttributeValue(k, cty.StringVal(v))