update tags

Author: sliu008

terraform/tig_ecr.tf

@@ -1,20 +1,23 @@
 data "aws_ecr_authorization_token" "token" {}
 
 locals {
-  # This regex splits the URI into: [0] registry/path, [1] name, [2] separator (: or @), and [3] tag or sha
-  # Example: 123.dkr.ecr.url/my-image@sha256:12345...
-  uri_parts = regex("^(.*)/(.*)([:@])(.*)$", var.lambda_container_image_uri)
-  
-  raw_image_name = local.uri_parts[1]
-  separator      = local.uri_parts[2]
-  image_version  = local.uri_parts[3]
+  # 1. Get the very last part of the URI (e.g., "dyen-cumulus-tig:0.13.0@sha256:abcd...")
+  uri_parts         = split("/", var.lambda_container_image_uri)
+  image_and_version = element(local.uri_parts, length(local.uri_parts) - 1)
 
+  # 2. Extract strictly the repository name by stopping at the first ":" or "@"
+  raw_image_name = split("@", split(":", local.image_and_version)[0])[0]
+
+  # 3. Form the valid ECR repository name (No colons or @ symbols!)
   ecr_image_name = "${local.environment}-${local.raw_image_name}"
-  
-  # For ECR, we usually want to push as a tag even if the source was a SHA.
-  # If the source was a SHA, we'll strip 'sha256:' to use a clean string as a tag.
-  safe_tag = replace(local.image_version, "sha256:", "")
-  ecr_image_tag = replace(local.image_version, "sha256:", "")
+
+  # 4. Extract the raw version string by removing the repo name
+  raw_version = replace(local.image_and_version, local.raw_image_name, "")
+
+  # 5. Sanitize the version into a perfectly valid ECR tag
+  # Turns ":0.13.0@sha256:abcd" into a clean "0.13.0-abcd"
+  # Turns "@sha256:abcd" into "abcd"
+  ecr_image_tag = trim(replace(replace(local.raw_version, "sha256", ""), "/[:@]+/", "-"), "-")
 }
 
 resource "aws_ecr_repository" "lambda-image-repo" {
@@ -38,8 +41,8 @@ resource "null_resource" "upload_ecr_image" {
       docker pull --platform=linux/arm64 ${var.lambda_container_image_uri}
       
       # Tag and Push to the new repo
-      docker tag ${var.lambda_container_image_uri} ${aws_ecr_repository.lambda-image-repo.repository_url}:${local.safe_tag}
-      docker push ${aws_ecr_repository.lambda-image-repo.repository_url}:${local.safe_tag}
+      docker tag ${var.lambda_container_image_uri} ${aws_ecr_repository.lambda-image-repo.repository_url}:${local.ecr_image_tag}
+      docker push ${aws_ecr_repository.lambda-image-repo.repository_url}:${local.ecr_image_tag}
     EOF
   }
 }