Merge pull request #38 from env0/fix-dont-treat-k8s-labels

Fix: avoid k8s labels handling
env0 · Jul 21, 2020 · 93e4e92 · 93e4e92
2 parents b4c97d0 + 02892ba
commit 93e4e92
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 37 deletions.
diff --git a/tagging/gcp.go b/tagging/gcp.go
@@ -1,30 +1,9 @@
 package tagging
 
-func tagNodeConfigBlocks(args TagBlockArgs) []string {
-	var swappedTagsStrings []string
-
-	for _, block := range args.Block.Body().Blocks() {
-		blockArgs := args
-		blockArgs.Block = block
-
-		if block.Type() == "node_config" {
-			swappedTagsStrings = append(swappedTagsStrings, TagBlock(blockArgs))
-		} else {
-			swappedTagsStrings = append(swappedTagsStrings, tagNodeConfigBlocks(blockArgs)...)
-		}
-	}
-
-	return swappedTagsStrings
-}
-
 func tagContainerCluster(args TagBlockArgs) Result {
 	rootBlockArgs := args
 	rootBlockArgs.TagId = "resource_labels"
 	rootBlockSwappedTagsStrings := []string{TagBlock(rootBlockArgs)}
 
-	return Result{SwappedTagsStrings: append(rootBlockSwappedTagsStrings, tagNodeConfigBlocks(args)...)}
-}
-
-func tagContainerNodePool(args TagBlockArgs) Result {
-	return Result{SwappedTagsStrings: tagNodeConfigBlocks(args)}
+	return Result{SwappedTagsStrings: rootBlockSwappedTagsStrings}
 }
diff --git a/tagging/tagging.go b/tagging/tagging.go
@@ -53,9 +53,8 @@ func TagResource(args TagBlockArgs) Result {
 }
 
 var resourceTypeToFnMap = map[string]TagResourceFn{
-	"aws_autoscaling_group":      tagAutoscalingGroup,
-	"google_container_cluster":   tagContainerCluster,
-	"google_container_node_pool": tagContainerNodePool,
+	"aws_autoscaling_group":    tagAutoscalingGroup,
+	"google_container_cluster": tagContainerCluster,
 }
 
 type TagBlockArgs struct {

diff --git a/test/fixture/terraform_11/google_container_cluster/expected/main.terratag.tf b/test/fixture/terraform_11/google_container_cluster/expected/main.terratag.tf
@@ -4,13 +4,11 @@ resource "google_container_cluster" "no-labels-cluster" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = "${local.terratag_added_main}"
   }
 
   node_pool {
     node_config {
       machine_type = "n1-standard-1"
-      labels       = "${local.terratag_added_main}"
     }
   }
   resource_labels = "${local.terratag_added_main}"
@@ -21,7 +19,6 @@ resource "google_container_node_pool" "no-labels-pool" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = "${local.terratag_added_main}"
   }
 }
 
@@ -33,13 +30,17 @@ resource "google_container_cluster" "existing-labels-cluster" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = "${merge( map("foo" , "bar"), local.terratag_added_main)}"
+    labels = {
+      foo = "bar"
+    }
   }
 
   node_pool {
     node_config {
       machine_type = "n1-standard-1"
-      labels       = "${merge( map("foo" , "bar"), local.terratag_added_main)}"
+      labels = {
+        foo = "bar"
+      }
     }
   }
 }
@@ -49,7 +50,9 @@ resource "google_container_node_pool" "existing-labels-pool" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = "${merge( map("foo" , "bar"), local.terratag_added_main)}"
+    labels = {
+      foo = "bar"
+    }
   }
 }
 locals {

diff --git a/test/fixture/terraform_12/google_container_cluster/expected/main.terratag.tf b/test/fixture/terraform_12/google_container_cluster/expected/main.terratag.tf
@@ -4,13 +4,11 @@ resource "google_container_cluster" "no-labels-cluster" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = local.terratag_added_main
   }
 
   node_pool {
     node_config {
       machine_type = "n1-standard-1"
-      labels       = local.terratag_added_main
     }
   }
   resource_labels = local.terratag_added_main
@@ -21,7 +19,6 @@ resource "google_container_node_pool" "no-labels-pool" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = local.terratag_added_main
   }
 }
 
@@ -33,13 +30,17 @@ resource "google_container_cluster" "existing-labels-cluster" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = merge( map("foo" , "bar"), local.terratag_added_main)
+    labels = {
+      foo = "bar"
+    }
   }
 
   node_pool {
     node_config {
       machine_type = "n1-standard-1"
-      labels       = merge( map("foo" , "bar"), local.terratag_added_main)
+      labels = {
+        foo = "bar"
+      }
     }
   }
 }
@@ -49,7 +50,9 @@ resource "google_container_node_pool" "existing-labels-pool" {
 
   node_config {
     machine_type = "n1-standard-1"
-    labels       = merge( map("foo" , "bar"), local.terratag_added_main)
+    labels = {
+      foo = "bar"
+    }
   }
 }
 locals {