From cbe57028b1a250c711f3d586acbe590a07d5c440 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Tue, 30 Jul 2024 14:28:37 -0400 Subject: [PATCH 1/3] Use temporary lambda layers --- terraform/lambdas.tf | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/terraform/lambdas.tf b/terraform/lambdas.tf index f19cfc8..569ba38 100644 --- a/terraform/lambdas.tf +++ b/terraform/lambdas.tf @@ -11,10 +11,10 @@ resource "aws_lambda_function" "raster_analysis" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn, ] tracing_config { @@ -46,10 +46,10 @@ resource "aws_lambda_function" "tiled_raster_analysis" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn + data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn ] tracing_config { @@ -82,7 +82,7 @@ resource "aws_lambda_function" "raster_analysis_fanout" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, ] tracing_config { @@ -111,10 +111,10 @@ resource "aws_lambda_function" "preprocessing" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_geopandas_0144_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn + data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_geopandas_no_numpy_no_pandas_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn ] tracing_config { @@ -143,10 +143,10 @@ resource "aws_lambda_function" "list_tiled_raster_analysis" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn + data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn ] tracing_config { @@ -179,10 +179,10 @@ resource "aws_lambda_function" "aggregation" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn, ] tracing_config { From 4895fb14c7fc807c173b86470d87527f7563daa8 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Tue, 30 Jul 2024 15:01:09 -0400 Subject: [PATCH 2/3] Add missing numpy layer to raster_analysis_fanout --- terraform/lambdas.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/lambdas.tf b/terraform/lambdas.tf index 569ba38..da7b976 100644 --- a/terraform/lambdas.tf +++ b/terraform/lambdas.tf @@ -82,6 +82,7 @@ resource "aws_lambda_function" "raster_analysis_fanout" { tags = local.tags layers = [ module.lambda_layers.raster_analysis_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, ] From 97f5fae71a8127583c962f7957a06372a71aecf4 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Tue, 30 Jul 2024 17:40:26 -0400 Subject: [PATCH 3/3] Fix typo --- terraform/lambdas.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/lambdas.tf b/terraform/lambdas.tf index da7b976..e2a090b 100644 --- a/terraform/lambdas.tf +++ b/terraform/lambdas.tf @@ -12,7 +12,7 @@ resource "aws_lambda_function" "raster_analysis" { layers = [ module.lambda_layers.raster_analysis_arn, data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn, - data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn_arn, + data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn, data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn, data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn, ]