From 88501f739f27a49a775d9e628a34b29e3bc15832 Mon Sep 17 00:00:00 2001 From: badra001 Date: Fri, 19 Aug 2022 13:59:31 -0400 Subject: [PATCH] fix --- main.tf | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 24ad2eb..4934ff0 100644 --- a/main.tf +++ b/main.tf @@ -55,13 +55,23 @@ locals { account_ecr_registry = format("%v.dkr.ecr.%v.amazonaws.com", local.account_id, local.region) account_ecr = format("%v/%v", local.account_ecr_registry, local.repo_parent_name) + ## images = { for i in var.image_config : format("%v#%v", i.name, i.tag) => + ## merge(i, tomap({ + ## key = format("%v#%v", i.name, i.tag), + ## source_full_path = format("%v/%v:%v", i.source_registry, i.source_image, element(compact(concat([lookup(i, "source_tag", null)], [i.tag])), 0)), + ## dest_registry = local.account_ecr_registry, + ## dest_full_path = i.repo_path != null ? format("%v/%v/%v/%v:%v", local.account_ecr_registry, local.repo_parent_name, i.repo_path, i.name, i.tag) : format("%v/%v/%v:%v", local.account_ecr_registry, local.repo_parent_name, i.name, i.tag), + ## dest_repository = i.repo_path != null ? format("%v/%v/%v", local.repo_parent_name, i.repo_path, i.name) : format("%v/%v", local.repo_parent_name, i.name), + ## })) } + + images = { for i in var.image_config : format("%v#%v", i.name, i.tag) => merge(i, tomap({ key = format("%v#%v", i.name, i.tag), source_full_path = format("%v/%v:%v", i.source_registry, i.source_image, element(compact(concat([lookup(i, "source_tag", null)], [i.tag])), 0)), dest_registry = local.account_ecr_registry, - dest_full_path = i.repo_path != null ? format("%v/%v/%v/%v:%v", local.account_ecr_registry, local.repo_parent_name, i.repo_path, i.name, i.tag) : format("%v/%v/%v:%v", local.account_ecr_registry, local.repo_parent_name, i.name, i.tag), - dest_repository = i.repo_path != null ? format("%v/%v/%v", local.repo_parent_name, i.repo_path, i.name) : format("%v/%v", local.repo_parent_name, i.name), + dest_full_path = format("%v/%v/%v:%v", local.account_ecr_registry, local.repo_parent_name, i.name, i.tag), + dest_repository = format("%v/%v", local.repo_parent_name, i.name), })) } image_repos = { for k, v in local.images : k => format("%v/%v", local.account_ecr, v.name) }