github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-01-16 16:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Use coalesce when desired default value is not null (#2696)

Browse Source 
Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
This commit is contained in:
Roberto Devesa
2023-07-27 13:58:01 +02:00
committed by GitHub
parent 0a17f655fb
commit c86f8d4db3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.tf
View File

@@ -386,7 +386,7 @@ resource "aws_eks_addon" "this" {
cluster_name = aws_eks_cluster.this[0].name cluster_name = aws_eks_cluster.this[0].name
addon_name = try(each.value.name, each.key) addon_name = try(each.value.name, each.key)
addon_version = try(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version) addon_version = coalesce(try(each.value.addon_version, null), data.aws_eks_addon_version.this[each.key].version)
configuration_values = try(each.value.configuration_values, null) configuration_values = try(each.value.configuration_values, null)
preserve = try(each.value.preserve, null) preserve = try(each.value.preserve, null)
resolve_conflicts = try(each.value.resolve_conflicts, "OVERWRITE") resolve_conflicts = try(each.value.resolve_conflicts, "OVERWRITE")
@@ -414,7 +414,7 @@ resource "aws_eks_addon" "before_compute" {
cluster_name = aws_eks_cluster.this[0].name cluster_name = aws_eks_cluster.this[0].name
addon_name = try(each.value.name, each.key) addon_name = try(each.value.name, each.key)
addon_version = try(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version) addon_version = coalesce(try(each.value.addon_version, null), data.aws_eks_addon_version.this[each.key].version)
configuration_values = try(each.value.configuration_values, null) configuration_values = try(each.value.configuration_values, null)
preserve = try(each.value.preserve, null) preserve = try(each.value.preserve, null)
resolve_conflicts = try(each.value.resolve_conflicts, "OVERWRITE") resolve_conflicts = try(each.value.resolve_conflicts, "OVERWRITE")