Merge pull request #472 from NASA-IMPACT/iss_436__Cumulus_Upgrade_From_v18_5_3__To__v20_0_0

Cumulus Upgrade from v18.5.3 to v20.0.0

Author: krisstanton

app/stacks/cumulus/main.tf

@@ -495,7 +495,7 @@ module "cumulus" {
   deploy_to_ngap = true
 
   cumulus_message_adapter_lambda_layer_version_arn = module.cma.lambda_layer_version_arn
-  async_operation_image                            = "cumuluss/async-operation:52"
+  async_operation_image                            = "cumuluss/async-operation:53"
 
   vpc_id            = module.vpc.vpc_id
   lambda_subnet_ids = module.vpc.subnets.ids
@@ -553,15 +553,15 @@ module "cumulus" {
   system_bucket = var.system_bucket
   buckets       = var.buckets
 
-  elasticsearch_alarms            = local.elasticsearch_alarms
-  elasticsearch_domain_arn        = local.elasticsearch_domain_arn
-  elasticsearch_hostname          = local.elasticsearch_hostname
-  elasticsearch_security_group_id = local.elasticsearch_security_group_id
+  # Upgrade from v18.5.3 to v20.0.0 had a removal of elastic search params from the Cumulus Module
+  #elasticsearch_alarms            = local.elasticsearch_alarms
+  #elasticsearch_domain_arn        = local.elasticsearch_domain_arn
+  #elasticsearch_hostname          = local.elasticsearch_hostname
+  #elasticsearch_security_group_id = local.elasticsearch_security_group_id
+  #es_index_shards = 2
 
   dynamo_tables = local.dynamo_tables
 
-  es_index_shards = 2
-
   # Archive API settings
   token_secret                = random_string.token_secret.result
   archive_api_users           = var.api_users

app/stacks/cumulus/ssm_parameters.tf

@@ -123,5 +123,5 @@ data "aws_ssm_parameter" "metrics_aws_account_id" {
 #-------------------------------------------------------------------------------
 
 data "aws_ssm_parameter" "ecs_image_id" {
-  name = "image_id_ecs_amz2"
+  name = "/ngap/amis/image_id_ecs_al2023_x86"
 }

app/stacks/cumulus/templates/ingest-and-publish-granule-workflow.asl.json

@@ -80,6 +80,7 @@
                     "downloadBucket": "{$.meta.buckets.protected.name}",
                     "duplicateHandling": "{$.meta.collection.duplicateHandling}",
                     "pdr": "{$.meta.pdr}",
+                    "useGranIdPath": false,
                     "cumulus_message": {
                       "input": "{$.payload}",
                       "outputs": [

config/helpers/cumulus_version_helper.rb

@@ -1,5 +1,5 @@
 module Terraspace::Project::CumulusVersionHelper
   def cumulus_version
-    "v18.5.3"
+    "v20.0.0"
   end
 end

package.json

@@ -60,16 +60,17 @@
     "@aws-sdk/lib-dynamodb": "^3.621.0",
     "@aws-sdk/lib-storage": "^3.621.0",
     "@aws-sdk/types": "^3.621.0",
-    "@cumulus/aws-client": "18.5.3",
-    "@cumulus/cmrjs": "18.5.3",
-    "@cumulus/common": "18.5.3",
+    "@cumulus/aws-client": "20.0.0",
+    "@cumulus/cmrjs": "20.0.0",
+    "@cumulus/common": "20.0.0",
     "@cumulus/cumulus-message-adapter-js": "2.0.4",
     "@smithy/util-stream": "^2.0.17",
-    "axios": "^1.7.4",
+    "axios": "^1.8.3",
     "date-fns": "^3.0.6",
     "duration-fns": "^3.0.1",
     "fp-ts": "^2.11.5",
     "fp-ts-contrib": "^0.1.29",
+    "http-cache-semantics": "^4.1.1",
     "io-ts": "^2.2.16",
     "io-ts-types": "^0.5.16",
     "monocle-ts": "^2.3.13",
@@ -79,8 +80,8 @@
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@aws-sdk/client-dynamodb": "^3.621.0",
-    "@cumulus/api-client": "18.5.3",
-    "@cumulus/types": "18.5.3",
+    "@cumulus/api-client": "20.0.0",
+    "@cumulus/types": "20.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@tsconfig/node20": "^20.1.4",
     "@types/aws-lambda": "^8.10.85",