fix(GROW-2931): GCP default label should be attributes (#1636)

Signed-off-by: Lei Jin <lei.jin@lacework.net>
lacework · Jun 5, 2024 · e575eac · e575eac
1 parent 6d76586
commit e575eac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/lwgenerate/gcp/gcp.go b/lwgenerate/gcp/gcp.go
@@ -589,20 +589,12 @@ func createGcpProvider(
 			attrs["region"] = region
 		}
 
-		modifiers := []lwgenerate.HclProviderModifier{
-			lwgenerate.HclProviderWithAttributes(attrs),
+		if len(providerDefaultLabels) != 0 {
+			attrs["default_labels"] = providerDefaultLabels
 		}
 
-		if len(providerDefaultLabels) != 0 {
-			defaultLabelsBlock, err := lwgenerate.HclCreateGenericBlock(
-				"default_labels",
-				nil,
-				providerDefaultLabels,
-			)
-			if err != nil {
-				return nil, err
-			}
-			modifiers = append(modifiers, lwgenerate.HclProviderWithGenericBlocks(defaultLabelsBlock))
+		modifiers := []lwgenerate.HclProviderModifier{
+			lwgenerate.HclProviderWithAttributes(attrs),
 		}
 
 		provider, err := lwgenerate.NewProvider(

diff --git a/lwgenerate/gcp/gcp_test.go b/lwgenerate/gcp/gcp_test.go
@@ -921,13 +921,12 @@ var gcpProviderWithExtraArguments = `provider "google" {
 var gcpProviderWithDefaultLabels = `provider "google" {
   alias       = "us-east1"
   credentials = "/path/to/credentials"
-  project     = "project1"
-  region      = "us-east1"
-
-  default_labels {
+  default_labels = {
     LABEL_TEST  = "foo"
     LABEL_TEST1 = "bar"
   }
+  project = "project1"
+  region  = "us-east1"
 }
 `