From e24fc5cfed916df20c5d9341a5797d3fe936ddf6 Mon Sep 17 00:00:00 2001 From: badra001 Date: Wed, 3 Jul 2024 10:52:02 -0400 Subject: [PATCH] fix --- ecr-lifecycle.tf | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ecr-lifecycle.tf b/ecr-lifecycle.tf index c430b1f..777fdae 100644 --- a/ecr-lifecycle.tf +++ b/ecr-lifecycle.tf @@ -3,8 +3,8 @@ locals { lifecycle_policy_specific_repos = compact(distinct(concat( try(var.lifecycle_policy_default.values, []), - try(var.lifecycle_policy_prefixes.values, []), - try(var.lifecycle_policy_patterns.values, []), + try(var.lifecycle_policy_prefix.values, []), + try(var.lifecycle_policy_pattern.values, []), try(var.lifecycle_policy_explicit.values, []), ))) } @@ -36,27 +36,27 @@ data "aws_ecr_lifecycle_policy_document" "default" { } data "aws_ecr_lifecycle_policy_document" "prefixes" { - count = length(var.lifecycle_policy_prefixes.values) > 0 ? 1 : 0 + count = length(var.lifecycle_policy_prefix.values) > 0 ? 1 : 0 rule { priority = 1 - description = format("keep %v images %v", try(var.lifecycle_policy_prefixes.count, local.default_count), "untagged") + description = format("keep %v images %v", try(var.lifecycle_policy_prefix.count, local.default_count), "untagged") selection { tag_status = "untagged" count_type = "imageCountMoreThan" - count_number = try(var.lifecycle_policy_prefixes.count, local.default_count) + count_number = try(var.lifecycle_policy_prefix.count, local.default_count) } } dynamic "rule" { - for_each = toset(try(var.lifecycle_policy_prefixes.values, [])) + for_each = toset(try(var.lifecycle_policy_prefix.values, [])) iterator = i content { - priority = 2 + index(try(var.lifecycle_policy_prefixes.values, []), i.key) - description = format("keep %v images %v", try(var.lifecycle_policy_prefixes.count, local.default_count), i.key) + priority = 2 + index(try(var.lifecycle_policy_prefix.values, []), i.key) + description = format("keep %v images %v", try(var.lifecycle_policy_prefix.count, local.default_count), i.key) selection { tag_status = "tagged" tag_prefix_list = [i.key] count_type = "imageCountMoreThan" - count_number = try(var.lifecycle_policy_prefixes.count, local.default_count) + count_number = try(var.lifecycle_policy_prefix.count, local.default_count) } } } @@ -66,24 +66,24 @@ data "aws_ecr_lifecycle_policy_document" "patterns" { count = length(var.lifecycle_policy_patterns.values) > 0 ? 1 : 0 rule { priority = 1 - description = format("keep %v images %v", try(var.lifecycle_policy_patterns.count, local.default_count), "untagged") + description = format("keep %v images %v", try(var.lifecycle_policy_pattern.count, local.default_count), "untagged") selection { tag_status = "untagged" count_type = "imageCountMoreThan" - count_number = try(var.lifecycle_policy_patterns.count, local.default_count) + count_number = try(var.lifecycle_policy_patternscount, local.default_count) } } dynamic "rule" { - for_each = toset(local.lifecycle_policies["patterns"].values) + for_each = toset(try(var.lifecycle_policy_pattern.values, [])) iterator = i content { - priority = 2 + index(try(var.lifecycle_policy_patterns.values, []), i.key) - description = format("keep %v images %v", try(var.lifecycle_policy_patterns.count, local.default_count), i.key) + priority = 2 + index(try(var.lifecycle_policy_pattern.values, []), i.key) + description = format("keep %v images %v", try(var.lifecycle_policy_pattern.count, local.default_count), i.key) selection { - tag_status = "tagged" - tag_prefix_list = [i.key] - count_type = "imageCountMoreThan" - count_number = try(var.lifecycle_policy_patterns.count, local.default_count) + tag_status = "tagged" + tag_pattern_list = [i.key] + count_type = "imageCountMoreThan" + count_number = try(var.lifecycle_policy_pattern.count, local.default_count) } } } @@ -104,13 +104,13 @@ resource "aws_ecr_lifecycle_policy" "default" { } resource "aws_ecr_lifecycle_policy" "prefixes" { - for_each = toset(try(var.lifecycle_policy_prefixes.repos, [])) + for_each = toset(try(var.lifecycle_policy_prefix.repos, [])) repository = aws_ecr_repository.apps_repos[each.key].name policy = try(data.aws_ecr_lifecycle_policy_document.prefixes[0].json, null) } resource "aws_ecr_lifecycle_policy" "patterns" { - for_each = toset(try(var.lifecycle_policy_patterns.repos, [])) + for_each = toset(try(var.lifecycle_policy_pattern.repos, [])) repository = aws_ecr_repository.apps_repos[each.key].name policy = try(data.aws_ecr_lifecycle_policy_document.patterns[0].json, null) }