From f51dc907f0061c49ac6dd604f086917b8b4bfa53 Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 30 Apr 2026 11:50:30 -0400 Subject: [PATCH 1/5] Hook up new variables to cumulus module --- cumulus/main.tf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cumulus/main.tf b/cumulus/main.tf index fd3b881..d6ce0b3 100644 --- a/cumulus/main.tf +++ b/cumulus/main.tf @@ -10,6 +10,8 @@ module "cumulus" { deploy_to_ngap = true + allow_provider_mismatch_on_rule_filter = var.allow_provider_mismatch_on_rule_filter + ecs_cluster_instance_image_id = var.ecs_cluster_instance_image_id != "" ? var.ecs_cluster_instance_image_id : data.aws_ssm_parameter.ecs_image_id.value ecs_cluster_instance_subnet_ids = data.aws_subnets.subnet_ids.ids @@ -19,6 +21,8 @@ module "cumulus" { ecs_cluster_instance_type = var.ecs_cluster_instance_type ecs_cluster_instance_docker_volume_size = var.ecs_cluster_instance_docker_volume_size + ecs_include_docker_cleanup_cronjob = var.ecs_include_docker_cleanup_cronjob + key_name = var.key_name rds_security_group = data.terraform_remote_state.data_persistence.outputs.rds_security_group_id @@ -73,6 +77,8 @@ module "cumulus" { archive_api_users = var.api_users archive_api_url = local.archive_api_url + sync_granule_s3_jitter_max_ms = var.sync_granule_s3_jitter_max_ms + orca_lambda_copy_to_archive_arn = local.orca_lambda_copy_to_archive_arn orca_sfn_recovery_workflow_arn = local.orca_sfn_recovery_workflow_arn orca_api_uri = local.orca_api_uri @@ -107,7 +113,7 @@ module "cumulus" { execution_limit = var.throttled_queue_execution_limit }], var.throttled_queues, local.throttled_queues) - ecs_include_docker_cleanup_cronjob = var.ecs_include_docker_cleanup_cronjob + archive_records_config = var.archive_records_config } resource "aws_security_group" "no_ingress_all_egress" { From f6132ddb0f948b4da61751a9ff97a31451908bac Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 30 Apr 2026 11:54:03 -0400 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b7b132..e26cd7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,15 @@ # CHANGELOG ## Unreleased + +## v21.3.3.0 +* Upgrade to [Cumulus v21.3.3](https://github.com/nasa/cumulus/releases/tag/v21.3.3) * Update Dockerfile python3 stage to use only node v22, remove all yum installs in favor of dnf -* Add dynamic_throttled_queues to allow for throttled queues with configurable names to be defined according to the pattern: https://sqs.${data.aws_region.current.name}.amazonaws.com/${data.aws_caller_identity.current.account_id}/${local.prefix}-${q.queue_name}. This allows for queue configurations to be defined programatically for similar deployments across deployment/account/regions/etc. +* Upgrade TEA to [v3.0.0](https://github.com/asfadmin/thin-egress-app/releases/tag/tea-release.3.0.0) +* Add `dynamic_throttled_queues` to allow for throttled queues with configurable names to be defined according to the pattern: `https://sqs.${data.aws_region.current.name}.amazonaws.com/${data.aws_caller_identity.current.account_id}/${local.prefix}-${q.queue_name}`. This allows for queue configurations to be defined programatically for similar deployments across deployment/account/regions/etc. +* Add `archive_records_config` +* Add `sync_granule_s3_jitter_max_ms` +* Add `allow_provider_mismatch_on_rule_filter` ## v21.3.2.0 * Upgrade to [Cumulus v21.3.2](https://github.com/nasa/cumulus/releases/tag/v21.3.2) From f5dfaee948a6b31fc1dbfe5e1d2c82e6f8e60e28 Mon Sep 17 00:00:00 2001 From: etcart Date: Fri, 29 May 2026 16:39:22 -0400 Subject: [PATCH 3/5] update to 22.1.1 --- Makefile | 2 +- cumulus/main.tf | 2 +- data-persistence/main.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6410adb..258c0bc 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # PYTHON_VER: python3 # --------------------------- -DOCKER_TAG := v21.3.3.0 +DOCKER_TAG := v22.1.1.0 export TF_IN_AUTOMATION="true" export TF_VAR_MATURITY=${MATURITY} export TF_VAR_DEPLOY_NAME=${DEPLOY_NAME} diff --git a/cumulus/main.tf b/cumulus/main.tf index d6ce0b3..6b459cb 100644 --- a/cumulus/main.tf +++ b/cumulus/main.tf @@ -1,5 +1,5 @@ module "cumulus" { - source = "https://github.com/nasa/cumulus/releases/download/v21.3.3/terraform-aws-cumulus.zip//tf-modules/cumulus" + source = "https://github.com/nasa/cumulus/releases/download/v22.1.1/terraform-aws-cumulus.zip//tf-modules/cumulus" cumulus_message_adapter_lambda_layer_version_arn = data.terraform_remote_state.daac.outputs.cma_layer_arn diff --git a/data-persistence/main.tf b/data-persistence/main.tf index d0cc2f0..b6547e3 100644 --- a/data-persistence/main.tf +++ b/data-persistence/main.tf @@ -1,5 +1,5 @@ module "data_persistence" { - source = "https://github.com/nasa/cumulus/releases/download/v21.3.3/terraform-aws-cumulus.zip//tf-modules/data-persistence" + source = "https://github.com/nasa/cumulus/releases/download/v22.1.1/terraform-aws-cumulus.zip//tf-modules/data-persistence" prefix = local.prefix subnet_ids = data.aws_subnets.subnet_ids.ids From f43f687e1d7ad44d1633885ce92b0b87349bb28a Mon Sep 17 00:00:00 2001 From: etcart Date: Mon, 1 Jun 2026 15:27:25 -0400 Subject: [PATCH 4/5] add variable pass through --- cumulus/main.tf | 3 ++- cumulus/variables.tf | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cumulus/main.tf b/cumulus/main.tf index 6b459cb..f0db0a0 100644 --- a/cumulus/main.tf +++ b/cumulus/main.tf @@ -90,7 +90,8 @@ module "cumulus" { tea_rest_api_root_resource_id = module.thin_egress_app.rest_api.root_resource_id tea_internal_api_endpoint = module.thin_egress_app.internal_api_endpoint tea_external_api_endpoint = module.thin_egress_app.api_endpoint - + tea_distribution_url_per_cmr_provider = var.tea_distribution_url_per_cmr_provider + sts_credentials_lambda_function_arn = data.aws_lambda_function.sts_credentials.arn sts_policy_helper_lambda_function_arn = data.aws_lambda_function.sts_policy_helper.arn cmr_acl_based_credentials = var.cmr_acl_based_credentials diff --git a/cumulus/variables.tf b/cumulus/variables.tf index fafff59..f8bc009 100644 --- a/cumulus/variables.tf +++ b/cumulus/variables.tf @@ -545,3 +545,9 @@ variable "dynamic_throttled_queues" { default = [] description = "List of SQS queue throttle configs. The queue_name is the suffix after the deployment prefix (e.g. 'ETQ-ASDC-StandardPdrJobs'). The full URL is constructed in locals.tf using local.prefix. Result will be merged with `throttled queues`" } + +variable "tea_distribution_url_per_cmr_provider" { + description = "Map of CMR provider short_name to TEA external endpoint URL. Used in consolidated deployments to route distribution URLs per Collection.cmrProvider. Falls back to tea_distribution_url for any provider not listed." + type = map(string) + default = {} +} \ No newline at end of file From 20940c83b88694300b0b1d4337e124f28c984e4d Mon Sep 17 00:00:00 2001 From: etcart Date: Mon, 1 Jun 2026 15:56:34 -0400 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e26cd7f..79661b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +## v22.1.1.0 +* Upgrade to [Cumulus v22.1.1](https://github.com/nasa/cumulus/releases/tag/v22.1.1) + ## v21.3.3.0 * Upgrade to [Cumulus v21.3.3](https://github.com/nasa/cumulus/releases/tag/v21.3.3) * Update Dockerfile python3 stage to use only node v22, remove all yum installs in favor of dnf