terraform config

podaac · Oct 23, 2023 · ac11e35 · ac11e35
1 parent 31b3df4
commit ac11e35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -226,4 +226,4 @@ jobs:
           echo ${{ github.repository }}
           echo ${{env.PYPROJECT_NAME}}
           echo ${{ steps.meta.outputs.tags }}
-          ./bin/deploy.sh --app-version ${{ env.THE_VERSION }} --tf-venue ${{ env.THE_ENV }} --lambda_container_image_uri ${{ steps.meta.outputs.tags }}
+          ./bin/deploy.sh --app-version ${{ env.THE_VERSION }} --tf-venue ${{ env.THE_ENV }} --lambda_container_image_uri ${{ steps.meta.outputs.tags }}:${{ env.software_version }}
diff --git a/terraform/hydrocron-main.tf b/terraform/hydrocron-main.tf
@@ -36,8 +36,10 @@ resource "aws_api_gateway_deployment" "hydrocron-api-gateway-deployment-test" {
 data "aws_ecr_authorization_token" "token" {}
 
 locals {
-  ecr_image_name                   = "podaac-cloud/podaac-hydrocron"
-  ecr_image_tag                    = "sit"
+  lambda_container_image_uri_split = split("/", var.lambda_container_image_uri)
+  ecr_image_name_and_tag           = split(":", element(local.lambda_container_image_uri_split, length(local.lambda_container_image_uri_split) - 1))
+  ecr_image_name                   = "${local.environment}-${element(local.ecr_image_name_and_tag, 0)}"
+  ecr_image_tag                    = element(local.ecr_image_name_and_tag, 1)
 }
 
 resource aws_ecr_repository "lambda-image-repo" {