Dropping null_resource (#80)

cloudposse · Aug 14, 2019 · d6d24b8 · d6d24b8
1 parent 2c5509e
commit d6d24b8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -664,8 +664,8 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
 
 ### Contributors
 
-|  [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]<br/>[Andriy Knysh][aknysh_homepage] | [![Igor Rodionov][goruha_avatar]][goruha_homepage]<br/>[Igor Rodionov][goruha_homepage] | [![Sergey Vasilyev][s2504s_avatar]][s2504s_homepage]<br/>[Sergey Vasilyev][s2504s_homepage] | [![Michael Pereira][MichaelPereira_avatar]][MichaelPereira_homepage]<br/>[Michael Pereira][MichaelPereira_homepage] | [![Jamie Nelson][Jamie-BitFlight_avatar]][Jamie-BitFlight_homepage]<br/>[Jamie Nelson][Jamie-BitFlight_homepage] | [![Vladimir][SweetOps_avatar]][SweetOps_homepage]<br/>[Vladimir][SweetOps_homepage] | [![Daren Desjardins][darend_avatar]][darend_homepage]<br/>[Daren Desjardins][darend_homepage] |
-|---|---|---|---|---|---|---|---|
+|  [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]<br/>[Andriy Knysh][aknysh_homepage] | [![Igor Rodionov][goruha_avatar]][goruha_homepage]<br/>[Igor Rodionov][goruha_homepage] | [![Sergey Vasilyev][s2504s_avatar]][s2504s_homepage]<br/>[Sergey Vasilyev][s2504s_homepage] | [![Michael Pereira][MichaelPereira_avatar]][MichaelPereira_homepage]<br/>[Michael Pereira][MichaelPereira_homepage] | [![Jamie Nelson][Jamie-BitFlight_avatar]][Jamie-BitFlight_homepage]<br/>[Jamie Nelson][Jamie-BitFlight_homepage] | [![Vladimir][SweetOps_avatar]][SweetOps_homepage]<br/>[Vladimir][SweetOps_homepage] | [![Daren Desjardins][darend_avatar]][darend_homepage]<br/>[Daren Desjardins][darend_homepage] | [![Maarten van der Hoef][maartenvanderhoef_avatar]][maartenvanderhoef_homepage]<br/>[Maarten van der Hoef][maartenvanderhoef_homepage] |
+|---|---|---|---|---|---|---|---|---|
 
   [osterman_homepage]: https://github.com/osterman
   [osterman_avatar]: https://github.com/osterman.png?size=150
@@ -683,6 +683,8 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
   [SweetOps_avatar]: https://github.com/SweetOps.png?size=150
   [darend_homepage]: https://github.com/darend
   [darend_avatar]: https://github.com/darend.png?size=150
+  [maartenvanderhoef_homepage]: https://github.com/maartenvanderhoef
+  [maartenvanderhoef_avatar]: https://github.com/maartenvanderhoef.png?size=150
 
 
 

diff --git a/README.yaml b/README.yaml
@@ -509,3 +509,5 @@ contributors:
     github: "SweetOps"
   - name: "Daren Desjardins"
     github: "darend"
+  - name: "Maarten van der Hoef"
+    github: "maartenvanderhoef"
diff --git a/examples/complete/label2.tf b/examples/complete/label2.tf
@@ -6,6 +6,12 @@ module "label2" {
   delimiter           = "+"
   regex_replace_chars = "/[^a-zA-Z0-9-+]/"
 
+  additional_tag_map = {
+    propagate_at_launch = "true"
+    additional_tag      = "yes"
+  }
+
+
   tags = {
     "City"        = "London"
     "Environment" = "Public"
@@ -27,9 +33,10 @@ output "label2_tags" {
   value = module.label2.tags
 }
 
+output "label2_tags_as_list_of_maps" {
+  value = module.label2.tags_as_list_of_maps
+}
+
 output "label2_context" {
   value = module.label2.context
 }
-
-
-
diff --git a/main.tf b/main.tf
@@ -25,8 +25,18 @@ locals {
   # Merge attributes
   attributes = compact(distinct(concat(var.attributes, var.context.attributes, local.defaults.attributes)))
 
-  tags                 = merge(var.context.tags, local.generated_tags, var.tags)
-  tags_as_list_of_maps = data.null_data_source.tags_as_list_of_maps.*.outputs
+  tags = merge(var.context.tags, local.generated_tags, var.tags)
+
+  tags_as_list_of_maps_unmerged_additional_tag_map = flatten([
+    for key in keys(local.tags) : {
+      key   = key
+      value = local.tags[key]
+  }])
+
+  tags_as_list_of_maps = [
+    for tag_set in local.tags_as_list_of_maps_unmerged_additional_tag_map :
+    merge(tag_set, var.additional_tag_map)
+  ]
 
   tags_context = {
     # For AWS we need `Name` to be disambiguated sine it has a special meaning
@@ -67,15 +77,3 @@ locals {
   }
 
 }
-
-data "null_data_source" "tags_as_list_of_maps" {
-  count = local.enabled ? length(keys(local.tags)) : 0
-
-  inputs = merge(
-    {
-      "key"   = keys(local.tags)[count.index]
-      "value" = values(local.tags)[count.index]
-    },
-    var.additional_tag_map
-  )
-}