fix: Allow instance Name tag to be overwritten (#1538)

aidan-mundy · web-flow · commit cb0e67736415 · 2021-08-26T10:16:23.000+02:00
diff --git a/modules/node_groups/launch_template.tf b/modules/node_groups/launch_template.tf
@@ -81,11 +81,11 @@ resource "aws_launch_template" "workers" {
 
     tags = merge(
       var.tags,
-      lookup(var.node_groups_defaults, "additional_tags", {}),
-      lookup(var.node_groups[each.key], "additional_tags", {}),
       {
         Name = local.node_groups_names[each.key]
-      }
+      },
+      lookup(var.node_groups_defaults, "additional_tags", {}),
+      lookup(var.node_groups[each.key], "additional_tags", {})
     )
   }
 
@@ -95,11 +95,11 @@ resource "aws_launch_template" "workers" {
 
     tags = merge(
       var.tags,
-      lookup(var.node_groups_defaults, "additional_tags", {}),
-      lookup(var.node_groups[each.key], "additional_tags", {}),
       {
         Name = local.node_groups_names[each.key]
-      }
+      },
+      lookup(var.node_groups_defaults, "additional_tags", {}),
+      lookup(var.node_groups[each.key], "additional_tags", {})
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ resource "aws_launch_template" "workers" {`
`81`	`81`
`82`	`82`	`tags = merge(`
`83`	`83`	`var.tags,`
`84`		`- lookup(var.node_groups_defaults, "additional_tags", {}),`
`85`		`- lookup(var.node_groups[each.key], "additional_tags", {}),`
`86`	`84`	`{`
`87`	`85`	`Name = local.node_groups_names[each.key]`
`88`		`- }`
	`86`	`+ },`
	`87`	`+ lookup(var.node_groups_defaults, "additional_tags", {}),`
	`88`	`+ lookup(var.node_groups[each.key], "additional_tags", {})`
`89`	`89`	`)`
`90`	`90`	`}`
`91`	`91`
`@@ -95,11 +95,11 @@ resource "aws_launch_template" "workers" {`
`95`	`95`
`96`	`96`	`tags = merge(`
`97`	`97`	`var.tags,`
`98`		`- lookup(var.node_groups_defaults, "additional_tags", {}),`
`99`		`- lookup(var.node_groups[each.key], "additional_tags", {}),`
`100`	`98`	`{`
`101`	`99`	`Name = local.node_groups_names[each.key]`
`102`		`- }`
	`100`	`+ },`
	`101`	`+ lookup(var.node_groups_defaults, "additional_tags", {}),`
	`102`	`+ lookup(var.node_groups[each.key], "additional_tags", {})`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`