Merge branch 'main' into develop

# Conflicts: # CHANGELOG.md # pyproject.toml # terraform/lambda_functions.tf
podaac · Nov 26, 2024 · 26cb2b8 · 26cb2b8
2 parents 195fe06 + 1465b11
commit 26cb2b8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,31 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+### Changed
+- [issues/15](https://github.com/podaac/bignbit/issues/15): Change 'convertToPNG' choice to a generic send to harmony choice
+- [issues/16](https://github.com/podaac/bignbit/issues/16): Change apply opera treatment choice and lambda to be specific to HLS
 ### Deprecated 
 ### Removed
 - [issues/7](https://github.com/podaac/bignbit/issues/15): Remove the wait for GITC response
 ### Fixed
 - [issues/36](https://github.com/podaac/bignbit/issues/36): Support datetimes without microseconds
 ### Security
 
-### Added
-
 
+## [0.1.2]
+### Added
 ### Changed
-- [issues/15](https://github.com/podaac/bignbit/issues/15): Change 'convertToPNG' choice to a generic send to harmony choice
-- [issues/16](https://github.com/podaac/bignbit/issues/16): Change apply opera treatment choice and lambda to be specific to HLS
+- BIG terraform failing in SWOT venues due to long function(lambda) names
+### Deprecated
+### Removed
+### Fixed
+### Security
 
-## [0.1.1]
 
+## [0.1.1]
 ### Added 
 - [issues/2](https://github.com/podaac/bignbit/issues/2): Create github action pipeline to build artifacts
 - [issues/3](https://github.com/podaac/bignbit/issues/3): Update terraform mock deployment of cumulus module to services accounts
 - Initial port from JPL GHE to public GitHub.com
-
 ### Changed
 - [issues/10](https://github.com/podaac/bignbit/issues/10): Move combined big and pobit state machine into terraform module
 - [issues/6](https://github.com/podaac/bignbit/issues/6): BIG terraform failing in SWOT venues due to long lambda name
-
-
-[Unreleased]: https://github.com/podaac/bignbit/compare/0.1.1...HEAD
-[0.1.1]: https://github.com/podaac/bignbit/releases/tag/0.1.1
+### Deprecated
+### Removed
+### Fixed
+### Security
diff --git a/bignbit/copy_harmony_results_to_s3.py → bignbit/copy_harmony_output_to_s3.py b/bignbit/copy_harmony_results_to_s3.py → bignbit/copy_harmony_output_to_s3.py
diff --git a/examples/README.md b/examples/README.md
@@ -1,8 +1,8 @@
 # BIGnBIT Module In Cumulus Deployment (cumulus-tf)
 - BIGnBIT Module used in `cumulus-deploy-tf/cumulus-tf`
   - Module Name: `big_and_bit_module`
-    - Source ZIP: `https://github.com/podaac/bignbit/releases/download/0.1.1/bignbit-0.1.1-cumulus-tf.zip`
-    - lambda_container_image_uri: `ghcr.io/podaac/bignbit/bignbit:0.1.1`
+    - Source ZIP: `https://github.com/podaac/bignbit/releases/download/0.1.2/bignbit-0.1.2-cumulus-tf.zip`
+    - lambda_container_image_uri: `ghcr.io/podaac/bignbit/bignbit:0.1.2`
 
 ## Terraform ZIP
 

diff --git a/terraform/lambda_functions.tf b/terraform/lambda_functions.tf
@@ -5,9 +5,9 @@ locals {
   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)
-  build_image_sets_function_name = "${local.lambda_resources_name}-build_image_sets-lambda"
-  send_to_gitc_function_name = "${local.lambda_resources_name}-send_to_gitc-lambda"
-  handle_gitc_response_function_name = "${local.lambda_resources_name}-handle_gitc_response-lambda"
+  build_image_sets_function_name = "${local.lambda_resources_name}-build_image_sets"
+  send_to_gitc_function_name = "${local.lambda_resources_name}-send_to_gitc"
+  handle_gitc_response_function_name = "${local.lambda_resources_name}-handle_gitc_response"
 }
 
 resource aws_ecr_repository "lambda-image-repo" {
@@ -67,7 +67,7 @@ resource "aws_lambda_function" "get_dataset_configuration" {
   image_config {
     command = ["bignbit.get_dataset_configuration.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-get_dataset_configuration-lambda"
+  function_name = "${local.lambda_resources_name}-get_dataset_configuration"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -98,7 +98,7 @@ resource "aws_lambda_function" "get_granule_umm_json" {
   image_config {
     command = ["bignbit.get_granule_umm_json.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-get_granule_umm_json-lambda"
+  function_name = "${local.lambda_resources_name}-get_granule_umm_json"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -131,7 +131,7 @@ resource "aws_lambda_function" "get_collection_concept_id" {
   image_config {
     command = ["bignbit.get_collection_concept_id.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-get_collection_concept_id-lambda"
+  function_name = "${local.lambda_resources_name}-get_collection_concept_id"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -164,7 +164,7 @@ resource "aws_lambda_function" "identify_image_file" {
   image_config {
     command = ["bignbit.identify_image_file.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-identify_image_file-lambda"
+  function_name = "${local.lambda_resources_name}-identify_image_file"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -195,7 +195,7 @@ resource "aws_lambda_function" "submit_harmony_job" {
   image_config {
     command = ["bignbit.submit_harmony_job.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-submit_harmony_job-lambda"
+  function_name = "${local.lambda_resources_name}-submit_harmony_job"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -228,7 +228,7 @@ resource "aws_lambda_function" "generate_image_metadata" {
   image_config {
     command = ["bignbit.generate_image_metadata.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-generate_image_metadata-lambda"
+  function_name = "${local.lambda_resources_name}-generate_image_metadata"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -259,7 +259,7 @@ resource "aws_lambda_function" "get_harmony_job_status" {
   image_config {
     command = ["bignbit.get_harmony_job_status.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-get_harmony_job_status-lambda"
+  function_name = "${local.lambda_resources_name}-get_harmony_job_status"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -292,7 +292,7 @@ resource "aws_lambda_function" "copy_harmony_output_to_s3" {
   image_config {
     command = ["bignbit.copy_harmony_output_to_s3.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-copy_harmony_output_to_s3-lambda"
+  function_name = "${local.lambda_resources_name}-copy_harmony_output_to_s3"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 256
@@ -325,7 +325,7 @@ resource "aws_lambda_function" "apply_opera_hls_treatment" {
   image_config {
     command = ["bignbit.apply_opera_hls_treatment.lambda_handler"]
   }
-  function_name = "${local.lambda_resources_name}-apply_opera_hls_treatment-lambda"
+  function_name = "${local.lambda_resources_name}-apply_opera_hls_treatment"
   role          = var.lambda_role.arn
   timeout       = 30
   memory_size   = 512
@@ -394,7 +394,7 @@ resource "aws_lambda_function" "send_to_gitc" {
   image_config {
     command = ["bignbit.send_to_gitc.lambda_handler"]
   }
-  function_name    = "${local.lambda_resources_name}-send_to_gitc-lambda"
+  function_name    = "${local.lambda_resources_name}-send_to_gitc"
   role             = var.lambda_role.arn
   timeout          = 15
   memory_size      = 128
@@ -428,7 +428,7 @@ resource "aws_lambda_function" "handle_gitc_response" {
   image_config {
     command = ["bignbit.handle_gitc_response.handler"]
   }
-  function_name    = "${local.lambda_resources_name}-handle_gitc_response-lambda"
+  function_name    = "${local.lambda_resources_name}-handle_gitc_response"
   role             = var.lambda_role.arn
   timeout          = 15
   memory_size      = 128
@@ -464,7 +464,7 @@ resource "aws_lambda_function" "save_cnm_message" {
   image_config {
     command = ["bignbit.save_cnm_message.lambda_handler"]
   }
-  function_name    = "${local.lambda_resources_name}-save_cnm_message-lambda"
+  function_name    = "${local.lambda_resources_name}-save_cma_message"
   role             = var.lambda_role.arn
   timeout          = 15
   memory_size      = 128

diff --git 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":{