Skip to content

Commit

Permalink
Removed unnecessary step for tags_as_list_of_maps (#86)
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenvanderhoef authored and aknysh committed Oct 28, 2019
1 parent d6d24b8 commit f25b7cb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 23 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -668,23 +668,23 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
|---|---|---|---|---|---|---|---|---|

[osterman_homepage]: https://github.com/osterman
[osterman_avatar]: https://github.com/osterman.png?size=150
[osterman_avatar]: https://img.cloudposse.com/150x150/https://github.com/osterman.png
[aknysh_homepage]: https://github.com/aknysh
[aknysh_avatar]: https://github.com/aknysh.png?size=150
[aknysh_avatar]: https://img.cloudposse.com/150x150/https://github.com/aknysh.png
[goruha_homepage]: https://github.com/goruha
[goruha_avatar]: https://github.com/goruha.png?size=150
[goruha_avatar]: https://img.cloudposse.com/150x150/https://github.com/goruha.png
[s2504s_homepage]: https://github.com/s2504s
[s2504s_avatar]: https://github.com/s2504s.png?size=150
[s2504s_avatar]: https://img.cloudposse.com/150x150/https://github.com/s2504s.png
[MichaelPereira_homepage]: https://github.com/MichaelPereira
[MichaelPereira_avatar]: https://github.com/MichaelPereira.png?size=150
[MichaelPereira_avatar]: https://img.cloudposse.com/150x150/https://github.com/MichaelPereira.png
[Jamie-BitFlight_homepage]: https://github.com/Jamie-BitFlight
[Jamie-BitFlight_avatar]: https://github.com/Jamie-BitFlight.png?size=150
[Jamie-BitFlight_avatar]: https://img.cloudposse.com/150x150/https://github.com/Jamie-BitFlight.png
[SweetOps_homepage]: https://github.com/SweetOps
[SweetOps_avatar]: https://github.com/SweetOps.png?size=150
[SweetOps_avatar]: https://img.cloudposse.com/150x150/https://github.com/SweetOps.png
[darend_homepage]: https://github.com/darend
[darend_avatar]: https://github.com/darend.png?size=150
[darend_avatar]: https://img.cloudposse.com/150x150/https://github.com/darend.png
[maartenvanderhoef_homepage]: https://github.com/maartenvanderhoef
[maartenvanderhoef_avatar]: https://github.com/maartenvanderhoef.png?size=150
[maartenvanderhoef_avatar]: https://img.cloudposse.com/150x150/https://github.com/maartenvanderhoef.png



Expand Down
17 changes: 7 additions & 10 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,13 @@ locals {

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_as_list_of_maps = flatten([
for key in keys(local.tags) : merge(
{
key = key
value = local.tags[key]
}, var.additional_tag_map)
])

tags_context = {
# For AWS we need `Name` to be disambiguated sine it has a special meaning
Expand Down
4 changes: 0 additions & 4 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
terraform {
required_version = "~> 0.12.0"

required_providers {
null = "~> 2.0"
}
}

0 comments on commit f25b7cb

Please sign in to comment.