diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a019ad..0f0bd34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ ## Unreleased +* Upgrade to [Cumulus v21.2.0](https://github.com/nasa/cumulus/releases/tag/v21.2.0) +* add variable "archive_records_config" to cumulus/variables.tf + ## v21.0.1.0 -* Updrade to [Cumulus v21.0.1](https://github.com/nasa/cumulus/releases/tag/v21.0.1) +* Upgrade to [Cumulus v21.0.1](https://github.com/nasa/cumulus/releases/tag/v21.0.1) * **NOTE** This version of Cumulus requires a manual update to the PostgreSQL database in the production environment. Please follow the instructions in [Update granules to include producer_granule_id](https://nasa.github.io/cumulus/docs/next/upgrade-notes/update-granules-to-include-producer_granule_id) ## v20.3.0.0 diff --git a/Makefile b/Makefile index 34265c9..c5a2d49 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # PYTHON_VER: python3 # --------------------------- -DOCKER_TAG := v21.0.1.0 +DOCKER_TAG := v21.2.0.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 ef2f374..9a2fa26 100644 --- a/cumulus/main.tf +++ b/cumulus/main.tf @@ -1,5 +1,5 @@ module "cumulus" { - source = "https://github.com/nasa/cumulus/releases/download/v21.0.1/terraform-aws-cumulus.zip//tf-modules/cumulus" + source = "https://github.com/nasa/cumulus/releases/download/v21.2.0/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/cumulus/variables.tf b/cumulus/variables.tf index 38e5a9c..f9fcf73 100644 --- a/cumulus/variables.tf +++ b/cumulus/variables.tf @@ -488,3 +488,33 @@ variable "html_template_dir" { Leave this field blank to use default templates that are included with the lambda code zip file. EOF } + +variable "archive_records_config" { + type = object({ + deploy_rule = bool, # deploy the archive records cron eventBridgeRule + update_limit = number, # number of granules or executions to archive in one run + batch_size = number, # number of granules or executions to archive call to the /archive endpoint + expiration_days = number, # age (in days) after which granules or executions should be archived + schedule_expression = string, # CloudWatch cron schedule for the record archival lambda + }) + description = "config object for archive-records tooling" + default = { + deploy_rule = true, + update_limit = 100000, + batch_size = 10000, + expiration_days = 365, + schedule_expression = "cron(0 4 * * ? *)", + } +} + +variable "sync_granule_s3_jitter_max_ms" { + description = "Maximum random jitter in milliseconds to apply before S3 operations in SyncGranule task (0-59000). Set to 0 to disable jitter." + type = number + default = 0 +} + +variable "allow_provider_mismatch_on_rule_filter" { + description = "optional variable to be used in message_consumer lambdas for disabling rule/message provider mismatches" + type = bool + default = false +} diff --git a/data-persistence/main.tf b/data-persistence/main.tf index dc15d3d..61f5505 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.0.1/terraform-aws-cumulus.zip//tf-modules/data-persistence" + source = "https://github.com/nasa/cumulus/releases/download/v21.2.0/terraform-aws-cumulus.zip//tf-modules/data-persistence" prefix = local.prefix subnet_ids = data.aws_subnets.subnet_ids.ids