diff --git a/.github/workflows/cicd-pipeline.yml b/.github/workflows/cicd-pipeline.yml index e384835..5ec9e8d 100644 --- a/.github/workflows/cicd-pipeline.yml +++ b/.github/workflows/cicd-pipeline.yml @@ -29,7 +29,7 @@ on: env: POETRY_VERSION: "1.8.2" PYTHON_VERSION: "3.10" - TERRAFORM_VERSION: "1.3.7" + TERRAFORM_VERSION: "1.5.7" REGISTRY: ghcr.io jobs: build: diff --git a/terraform/lambda_functions.tf b/terraform/lambda_functions.tf index 159bc02..de800b1 100644 --- a/terraform/lambda_functions.tf +++ b/terraform/lambda_functions.tf @@ -48,14 +48,13 @@ resource null_resource upload_ecr_image { # This doesn't work in terraform 0.13.x because it tries to resolve the image during the plan phase instead of the # apply phase. Once IA updates to a newer terraform version, this can be used instead of having every lambda # function depend on the null_resource.upload_ecr_image resource. -#data aws_ecr_image lambda_image { -# depends_on = [ -# null_resource.upload_ecr_image -# ] -# repository_name = aws_ecr_repository.lambda-image-repo.name -# image_tag = local.ecr_image_tag -# -#} +data "aws_ecr_image" "lambda_image" { + depends_on = [ + null_resource.upload_ecr_image + ] + repository_name = aws_ecr_repository.lambda-image-repo.name + image_tag = local.ecr_image_tag +} resource "aws_lambda_function" "get_dataset_configuration" { depends_on = [ diff --git a/terraform/state_machine_definition.tpl b/terraform/state_machine_definition.tpl index e12438e..5b707f4 100644 --- a/terraform/state_machine_definition.tpl +++ b/terraform/state_machine_definition.tpl @@ -320,7 +320,7 @@ { "Variable":"$.payload.harmony_job_status", "StringMatches":"successful", - "Next":"Copy Harmony Results to S3", + "Next":"Copy Harmony Output to S3", "Comment":"Job successful" }, { @@ -344,7 +344,7 @@ ], "Default":"Wait 20 Seconds" }, - "Copy Harmony Results to S3":{ + "Copy Harmony Output to S3":{ "Type":"Task", "Resource":"${CopyHarmonyOutputToS3Lambda}", "Parameters":{