diff --git a/CHANGELOG.md b/CHANGELOG.md index 188739b6926..8c13049d042 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ## Unreleased +## [v15.0.2] 2023-04-25 + +### Fixed + +- **CUMULUS-3120** + - Fixed a bug by adding in `default_log_retention_periods` and `cloudwatch_log_retention_periods` + to Cumulus modules so they can be used during deployment for configuring cloudwatch retention periods + - Updated cloudwatch retention documentation to reflect the bugfix changes + ## [v15.0.1] 2023-04-20 ### Changed @@ -6896,7 +6905,8 @@ Note: There was an issue publishing 1.12.0. Upgrade to 1.12.1. ## [v1.0.0] - 2018-02-23 -[unreleased]: https://github.com/nasa/cumulus/compare/v15.0.1...HEAD +[unreleased]: https://github.com/nasa/cumulus/compare/v15.0.2...HEAD +[v15.0.2]: https://github.com/nasa/cumulus/compare/v15.0.1...v15.0.2 [v15.0.1]: https://github.com/nasa/cumulus/compare/v15.0.0...v15.0.1 [v15.0.0]: https://github.com/nasa/cumulus/compare/v14.1.0...v15.0.0 [v14.1.0]: https://github.com/nasa/cumulus/compare/v14.0.0...v14.1.0 diff --git a/docs/configuration/cloudwatch-retention.md b/docs/configuration/cloudwatch-retention.md index f8a9a7fa37b..c1e6c31ef7b 100644 --- a/docs/configuration/cloudwatch-retention.md +++ b/docs/configuration/cloudwatch-retention.md @@ -35,44 +35,68 @@ Changing the log retention policy in the AWS Management Console is a fairly simp ## Terraform -The `cumulus` module exposes values for configuration of log retention for -cloudwatch log groups (in days). A configurable map of `cloudwatch_log_retention_periods` currently supports the following variables: - -- cumulus-tf_egress_lambda_log_retention -- archive_private_api_log_retention -- archive_api_log_retention -- archive_async_operation_log_retention -- archive_granule_files_cache_updater_log_retention -- archive_publish_executions_log_retention -- archive_publish_granule_log_retention -- archive_publish_pdrs_log_retention -- archive_replay_sqs_messages_log_retention -- cumulus_distribution_api_log_retention -- cumulus_ecs_service_default_log_retention -- ingest_discover_pdrs_task_log_retention -- ingest_hyrax_metadata_updates_task_log_retention -- ingest_parse_pdr_task_log_retention -- ingest_post_to_cmr_task_log_retention -- ingest_queue_pdrs_task_log_retention -- ingest_queue_workflow_task_log_retention -- ingest_sync_granule_task_log_retention -- ingest_update_cmr_access_constraints_task_log_retention - -In order to configure this value for the cloudwatch log group, the variable for the retention period for the respective group should be in the form of: - -```hcl -__log_retention: - type = number +Cumulus modules create cloudwatch log groups and manage log retention for a subset of lambdas and tasks. These log groups have a default log retention time, but, there are two optional variables which can be set to change the default retention period for all or specific Cumulus managed cloudwatch log groups through deployment. For cloudwatch log groups which are not managed by Cumulus modules, the retention period is indefinite or `Never Expire` by AWS, cloudwatch log configurations for all Cumulus lambdas and tasks will be added in a future release. + +There are optional variables that can be set during deployment of cumulus modules to configure +the retention period (in days) of cloudwatch log groups for lambdas and tasks which the `cumulus`, `cumulus_distribution`, and `cumulus_ecs_service` modules supports (using the `cumulus` module as an example): + +```tf +module "cumulus" { + # ... other variables + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods +} +``` + +By setting the below variables in `terraform.tfvars` and deploying, the cloudwatch log groups will be instantiated or updated with the new retention value. + +### default_log_retention_periods + +The variable `default_log_retention_days` can be configured in order to set the default log retention for all cloudwatch log groups managed by Cumulus in case a custom value isn't used. The log groups will use this value for their retention, and if this value is not set either, the retention will default to 30 days. For example, if a user would like their log groups of the Cumulus module to have a retention period of one year, deploy the respective modules with the variable in the example below. + +#### Example + +```tf +default_log_retention_periods = 365 ``` -An example, in the case of configuring the retention period for the `parse_pdr_task` `aws_cloudwatch_log_group`: +### cloudwatch_log_retention_periods + +The retention period (in days) of cloudwatch log groups for specific lambdas and tasks can be set +during deployment using the `cloudwatch_log_retention_periods` terraform map variable. In order to +configure these values for respective cloudwatch log groups, uncomment the `cloudwatch_log_retention_periods` variable and add the retention values listed below corresponding to the group's retention you want to change. The following values are supported correlating to their lambda/task name, (i.e. "/aws/lambda/prefix-DiscoverPdrs" would have the retention variable "DiscoverPdrs" ) + +- ApiEndpoints +- AsyncOperationEcsLogs +- DiscoverPdrs +- DistributionApiEndpoints +- EcsLogs +- granuleFilesCacheUpdater +- HyraxMetadataUpdates +- ParsePdr +- PostToCmr +- PrivateApiLambda +- publishExecutions +- publishGranules +- publishPdrs +- QueuePdrs +- QueueWorkflow +- replaySqsMessages +- SyncGranule +- UpdateCmrAccessConstraints + +:::note + +`EcsLogs` is used for all cumulus_ecs_service tasks cloudwatch log groups + +::: -### Example +#### Example ```tf cloudwatch_log_retention_periods = { - ingest_parse_pdr_task_log_retention = 365 + ParsePdr = 365 } ``` -Additionally, the variable `default_log_retention_days` can be configured separately during deployment in order to set the default log retention for the cloudwatch log groups in case a custom value isn't used. The log groups will use this value for their retention value, and if this value is not set either, the retention will default to 30 days. +The retention periods are the number of days you'd like to retain the logs in the specified log group for. There is a list of possible values available in the [aws logs documentation](https://docs.aws.amazon.com/cli/latest/reference/logs/put-retention-policy.html). diff --git a/example/cumulus-tf/cumulus_distribution.tf b/example/cumulus-tf/cumulus_distribution.tf index cc2a012724e..8e1f17a5333 100644 --- a/example/cumulus-tf/cumulus_distribution.tf +++ b/example/cumulus-tf/cumulus_distribution.tf @@ -40,4 +40,6 @@ module "cumulus_distribution" { system_bucket = var.system_bucket tags = local.tags vpc_id = local.vpc_id + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods } diff --git a/example/cumulus-tf/ecs_hello_world_workflow.tf b/example/cumulus-tf/ecs_hello_world_workflow.tf index 63ae80d0684..4a20e5146fc 100644 --- a/example/cumulus-tf/ecs_hello_world_workflow.tf +++ b/example/cumulus-tf/ecs_hello_world_workflow.tf @@ -22,6 +22,8 @@ module "hello_world_service" { cpu = 400 memory_reservation = 700 + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods environment = { AWS_DEFAULT_REGION = data.aws_region.current.name diff --git a/example/cumulus-tf/main.tf b/example/cumulus-tf/main.tf index 7d29791b609..7b58e9b9e8e 100644 --- a/example/cumulus-tf/main.tf +++ b/example/cumulus-tf/main.tf @@ -159,6 +159,8 @@ module "cumulus" { es_index_shards = var.es_index_shards dynamo_tables = merge(data.terraform_remote_state.data_persistence.outputs.dynamo_tables, var.optional_dynamo_tables) + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods # Archive API settings token_secret = var.token_secret diff --git a/example/cumulus-tf/python_processing_workflow.tf b/example/cumulus-tf/python_processing_workflow.tf index 6b61419b732..52ae56cf111 100644 --- a/example/cumulus-tf/python_processing_workflow.tf +++ b/example/cumulus-tf/python_processing_workflow.tf @@ -10,7 +10,8 @@ data "aws_ecr_repository" "cumulus_test_ingest_process" { module "python_test_ingest_processing_service" { source = "../../tf-modules/cumulus_ecs_service" - + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods prefix = var.prefix name = "PythonTestIngestProcess" tags = local.tags diff --git a/example/cumulus-tf/terraform.tfvars.example b/example/cumulus-tf/terraform.tfvars.example index 1dd4875c086..e6f82de5531 100644 --- a/example/cumulus-tf/terraform.tfvars.example +++ b/example/cumulus-tf/terraform.tfvars.example @@ -69,11 +69,11 @@ csdap_host_url = "csdap host url" deploy_cumulus_distribution = true # Optional, uncomment if needed, these variables are for configuring the cloudwatch log group's retention periods +# default_log_retention_days = 30 # cloudwatch_log_retention_periods = { -# __log_retention = 365 +# = 365 # } # -# default_log_retention_days = 30 # Optional. Uncomment if using Cumulus Distribution. # toggle this after deployed to put the correct port in. (and hosts and config) diff --git a/example/cumulus-tf/thin_egress_app.tf b/example/cumulus-tf/thin_egress_app.tf index 8a198d7f944..d34f73d5227 100644 --- a/example/cumulus-tf/thin_egress_app.tf +++ b/example/cumulus-tf/thin_egress_app.tf @@ -63,7 +63,7 @@ resource "aws_cloudwatch_log_subscription_filter" "egress_api_gateway_log_subscr resource "aws_cloudwatch_log_group" "egress_lambda_log_group" { count = (var.log_destination_arn != null) ? 1 : 0 name = "/aws/lambda/${module.thin_egress_app.egress_lambda_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "cumulus-tf_egress_lambda_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "thin-egress-app-EgressLambda", var.default_log_retention_days) tags = var.tags } diff --git a/example/cumulus-tf/variables.tf b/example/cumulus-tf/variables.tf index a3fa7949528..0ab05bbd0c1 100644 --- a/example/cumulus-tf/variables.tf +++ b/example/cumulus-tf/variables.tf @@ -1,11 +1,5 @@ # Required -variable "cloudwatch_log_retention_periods" { - type = map(number) - description = "number of days logs will be retained for the respective cloudwatch log group, in the form of __log_retention" - default = {} -} - variable "cmr_client_id" { type = string } @@ -56,12 +50,6 @@ variable "csdap_host_url" { description = "The csdap host url" } -variable "default_log_retention_days" { - type = number - default = 30 - description = "default value that user chooses for their log retention periods" -} - variable "launchpad_api" { type = string default = "launchpadApi" @@ -440,3 +428,34 @@ variable "subnets_tag_name" { type = string default = "Private application us-east-1a *" } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = { + thin-egress-app-EgressLambda = 7 + ApiEndpoints = 7 + AsyncOperationEcsLogs = 7 + DiscoverPdrs = 7 + DistributionApiEndpoints = 7 + EcsLogs = 7 + granuleFilesCacheUpdater = 7 + HyraxMetadataUpdates = 7 + ParsePdr = 7 + PostToCmr = 7 + PrivateApiLambda = 7 + publishExecutions = 7 + publishGranules = 7 + QueuePdrs = 7 + QueueWorkflow = 7 + replaySqsMessages = 7 + SyncGranule = 7 + UpdateCmrAccessConstraints = 7 + } +} + +variable "default_log_retention_days" { + type = number + default = 14 + description = "default value that user chooses for their log retention periods" +} diff --git a/example/lambdas/asyncOperations/package.json b/example/lambdas/asyncOperations/package.json index 77b9d9e1304..455f5cb6932 100644 --- a/example/lambdas/asyncOperations/package.json +++ b/example/lambdas/asyncOperations/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-async-operations", - "version": "15.0.1", + "version": "15.0.2", "description": "AsyncOperations Test Lambda", "main": "index.js", "private": true, diff --git a/example/lambdas/ftpPopulateTestLambda/package.json b/example/lambdas/ftpPopulateTestLambda/package.json index c019a7048eb..44d5cc41fb5 100644 --- a/example/lambdas/ftpPopulateTestLambda/package.json +++ b/example/lambdas/ftpPopulateTestLambda/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/ftp-populate-test-lambda", - "version": "15.0.1", + "version": "15.0.2", "description": "FTP Population Utility Lambda", "main": "index.js", "private": true, @@ -19,12 +19,12 @@ "access": "private" }, "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/api-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/integration-tests": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/test-data": "15.0.1", + "@cumulus/api": "15.0.2", + "@cumulus/api-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/integration-tests": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/test-data": "15.0.2", "aws-sdk": "^2.585.0", "fs-extra": "^9.0.0", "jsftp": "https://github.com/jkovarik/jsftp.git#add_288", diff --git a/example/lambdas/lzardsClientTest/package.json b/example/lambdas/lzardsClientTest/package.json index 8bb2cfaf5c7..fb11315bd06 100644 --- a/example/lambdas/lzardsClientTest/package.json +++ b/example/lambdas/lzardsClientTest/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-lzards-api-lambda", - "version": "15.0.1", + "version": "15.0.2", "description": "LZARDS API Client Test Lambda", "private": true, "engines": { @@ -20,7 +20,7 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/logger": "15.0.1", - "@cumulus/lzards-api-client": "15.0.1" + "@cumulus/logger": "15.0.2", + "@cumulus/lzards-api-client": "15.0.2" } } diff --git a/example/lambdas/python-processing/package.json b/example/lambdas/python-processing/package.json index 0d6797b1ac4..d8109c1e473 100644 --- a/example/lambdas/python-processing/package.json +++ b/example/lambdas/python-processing/package.json @@ -1,7 +1,7 @@ { "name": "@cumulus/python-process-activity", "private": true, - "version": "15.0.1", + "version": "15.0.2", "description": "Python reference activity", "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity", "repository": { diff --git a/example/lambdas/python-reference-activity/package.json b/example/lambdas/python-reference-activity/package.json index b6760a1f69a..eff5fde6072 100644 --- a/example/lambdas/python-reference-activity/package.json +++ b/example/lambdas/python-reference-activity/package.json @@ -1,7 +1,7 @@ { "name": "@cumulus/python-reference-activity", "private": true, - "version": "15.0.1", + "version": "15.0.2", "description": "Python reference activity", "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity", "repository": { diff --git a/example/lambdas/python-reference-task/package.json b/example/lambdas/python-reference-task/package.json index 7f5f5b01dcf..5582cbcb33e 100644 --- a/example/lambdas/python-reference-task/package.json +++ b/example/lambdas/python-reference-task/package.json @@ -1,7 +1,7 @@ { "name": "@cumulus/python-reference-task", "private": true, - "version": "15.0.1", + "version": "15.0.2", "description": "Python reference task", "main": "index.js", "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-task", diff --git a/example/lambdas/s3AccessTest/package.json b/example/lambdas/s3AccessTest/package.json index 1d645e3f79b..603ef373a7c 100644 --- a/example/lambdas/s3AccessTest/package.json +++ b/example/lambdas/s3AccessTest/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-s3-access", - "version": "15.0.1", + "version": "15.0.2", "description": "S3 Access Test Lambda", "main": "index.js", "private": true, diff --git a/example/lambdas/snsS3Test/package.json b/example/lambdas/snsS3Test/package.json index 2036e20f1c6..9c203a6064c 100644 --- a/example/lambdas/snsS3Test/package.json +++ b/example/lambdas/snsS3Test/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-sns-s3", - "version": "15.0.1", + "version": "15.0.2", "description": "SNS to S3 Test Lambda", "main": "index.js", "private": true, diff --git a/example/lambdas/versionUpTest/package.json b/example/lambdas/versionUpTest/package.json index 41324071f2e..0a370d5f79d 100644 --- a/example/lambdas/versionUpTest/package.json +++ b/example/lambdas/versionUpTest/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-version-up", - "version": "15.0.1", + "version": "15.0.2", "description": "Version Up Test Lambda", "main": "index.js", "private": true, diff --git a/example/package.json b/example/package.json index 971ddd651e6..eff2e74a2db 100644 --- a/example/package.json +++ b/example/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/cumulus-integration-tests", - "version": "15.0.1", + "version": "15.0.2", "description": "Cumulus Integration Test Deployment", "private": true, "main": "index.js", @@ -44,32 +44,32 @@ ] }, "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/api-client": "15.0.1", - "@cumulus/async-operations": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/checksum": "15.0.1", - "@cumulus/cmr-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/discover-granules": "15.0.1", - "@cumulus/discover-pdrs": "15.0.1", - "@cumulus/files-to-granules": "15.0.1", - "@cumulus/hello-world": "15.0.1", - "@cumulus/ingest": "15.0.1", - "@cumulus/integration-tests": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/move-granules": "15.0.1", - "@cumulus/parse-pdr": "15.0.1", - "@cumulus/pdr-status-check": "15.0.1", - "@cumulus/post-to-cmr": "15.0.1", - "@cumulus/queue-granules": "15.0.1", - "@cumulus/queue-pdrs": "15.0.1", - "@cumulus/sf-sqs-report": "15.0.1", - "@cumulus/sync-granule": "15.0.1", - "@cumulus/test-processing": "15.0.1" + "@cumulus/api": "15.0.2", + "@cumulus/api-client": "15.0.2", + "@cumulus/async-operations": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/checksum": "15.0.2", + "@cumulus/cmr-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/discover-granules": "15.0.2", + "@cumulus/discover-pdrs": "15.0.2", + "@cumulus/files-to-granules": "15.0.2", + "@cumulus/hello-world": "15.0.2", + "@cumulus/ingest": "15.0.2", + "@cumulus/integration-tests": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/move-granules": "15.0.2", + "@cumulus/parse-pdr": "15.0.2", + "@cumulus/pdr-status-check": "15.0.2", + "@cumulus/post-to-cmr": "15.0.2", + "@cumulus/queue-granules": "15.0.2", + "@cumulus/queue-pdrs": "15.0.2", + "@cumulus/sf-sqs-report": "15.0.2", + "@cumulus/sync-granule": "15.0.2", + "@cumulus/test-processing": "15.0.2" }, "devDependencies": { - "@cumulus/test-data": "15.0.1" + "@cumulus/test-data": "15.0.2" } } diff --git a/example/scripts/generate_ingest/package.json b/example/scripts/generate_ingest/package.json index 387fffe8a57..283cdbd10e6 100644 --- a/example/scripts/generate_ingest/package.json +++ b/example/scripts/generate_ingest/package.json @@ -1,7 +1,7 @@ { "name": "@cumulus/generate_ingest", "private": true, - "version": "15.0.1", + "version": "15.0.2", "description": "Script to generate test data for scaled ingest", "keywords": [ "GIBS", @@ -22,8 +22,8 @@ "directory": "packages/types" }, "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1" + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2" }, "author": "Cumulus Authors", "license": "Apache-2.0" diff --git a/example/scripts/lib/package.json b/example/scripts/lib/package.json index 7934d57f223..045875a8cf3 100644 --- a/example/scripts/lib/package.json +++ b/example/scripts/lib/package.json @@ -1,7 +1,7 @@ { "name": "@cumulus/example-lib", "private": true, - "version": "15.0.1", + "version": "15.0.2", "description": "example project libs", "homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib", "engines": { diff --git a/lambdas/data-migration1/package.json b/lambdas/data-migration1/package.json index fdb6f725462..fdbc6c8e4db 100644 --- a/lambdas/data-migration1/package.json +++ b/lambdas/data-migration1/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/data-migration1", - "version": "15.0.1", + "version": "15.0.2", "description": "A Lambda function used for doing data migrations", "license": "Apache-2.0", "engines": { @@ -25,18 +25,18 @@ "timeout": "15m" }, "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/api": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/types": "15.0.2", "knex": "2.4.1", "lodash": "^4.17.21", "pg": "^8.3.0" }, "devDependencies": { - "@cumulus/test-data": "15.0.1" + "@cumulus/test-data": "15.0.2" } } diff --git a/lambdas/data-migration2/package.json b/lambdas/data-migration2/package.json index f3898873305..8f03643ff46 100644 --- a/lambdas/data-migration2/package.json +++ b/lambdas/data-migration2/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/data-migration2", - "version": "15.0.1", + "version": "15.0.2", "description": "A Lambda function used for doing data migrations intended to be executed after data-migration1.", "license": "Apache-2.0", "engines": { @@ -28,14 +28,14 @@ "@aws-sdk/client-dynamodb": "^3.58.0", "@aws-sdk/lib-dynamodb": "^3.58.0", "@aws-sdk/util-dynamodb": "^3.58.0", - "@cumulus/api": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/api": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/types": "15.0.2", "JSONStream": "1.3.5", "knex": "2.4.1", "lodash": "^4.17.21", @@ -43,6 +43,6 @@ "pg": "^8.3.0" }, "devDependencies": { - "@cumulus/test-data": "15.0.1" + "@cumulus/test-data": "15.0.2" } } diff --git a/lambdas/db-migration/package.json b/lambdas/db-migration/package.json index b73576e13a8..9e697fe99ed 100644 --- a/lambdas/db-migration/package.json +++ b/lambdas/db-migration/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/db-migration-lambda", - "version": "15.0.1", + "version": "15.0.2", "description": "A Lambda function used for deploying DB migrations", "license": "Apache-2.0", "engines": { @@ -20,7 +20,7 @@ "tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles" }, "dependencies": { - "@cumulus/db": "15.0.1", + "@cumulus/db": "15.0.2", "knex": "2.4.1", "pg": "^8.3.0" } diff --git a/lambdas/db-provision-user-database/package.json b/lambdas/db-provision-user-database/package.json index 8ec142fe4ac..fe1df168e99 100644 --- a/lambdas/db-provision-user-database/package.json +++ b/lambdas/db-provision-user-database/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/db-provision-user-database-lambda", - "version": "15.0.1", + "version": "15.0.2", "description": "A Lambda function used for provisioning user databases", "engines": { "node": ">=16.19.0" @@ -24,8 +24,8 @@ "timeout": "2m" }, "dependencies": { - "@cumulus/common": "15.0.1", - "@cumulus/db": "15.0.1", + "@cumulus/common": "15.0.2", + "@cumulus/db": "15.0.2", "knex": "2.4.1", "pg": "^8.3.0" }, diff --git a/lambdas/postgres-migration-async-operation/package.json b/lambdas/postgres-migration-async-operation/package.json index 405ccdd9c66..dcd9bb9b81f 100644 --- a/lambdas/postgres-migration-async-operation/package.json +++ b/lambdas/postgres-migration-async-operation/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/postgres-migration-async-operation", - "version": "15.0.1", + "version": "15.0.2", "description": "A Lambda function used to start an ECS task to run data-migrations2 lambda", "license": "Apache-2.0", "engines": { @@ -28,12 +28,12 @@ "timeout": "15m" }, "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/async-operations": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/types": "15.0.1" + "@cumulus/api": "15.0.2", + "@cumulus/async-operations": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/types": "15.0.2" }, "devDependencies": { - "@cumulus/test-data": "15.0.1" + "@cumulus/test-data": "15.0.2" } } diff --git a/lambdas/postgres-migration-count-tool/package.json b/lambdas/postgres-migration-count-tool/package.json index efa59d258b9..28b64888fbe 100644 --- a/lambdas/postgres-migration-count-tool/package.json +++ b/lambdas/postgres-migration-count-tool/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/postgres-reconcile", - "version": "15.0.1", + "version": "15.0.2", "description": "A Lambda function used for generating counts between Dynamo/ES and Postgres", "license": "Apache-2.0", "engines": { @@ -21,14 +21,14 @@ "tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles" }, "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/api-client": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/api": "15.0.2", + "@cumulus/api-client": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/types": "15.0.2", "knex": "2.4.1", "p-map": "^4.0.0", "pg": "^8.3.0" diff --git a/lambdas/sqs-message-remover/package.json b/lambdas/sqs-message-remover/package.json index be192d4152a..6a92b0bd5a1 100644 --- a/lambdas/sqs-message-remover/package.json +++ b/lambdas/sqs-message-remover/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/sqs-message-remover-lambda", - "version": "15.0.1", + "version": "15.0.2", "description": "Remove processed messages from SQS queues", "main": "src/index.js", "private": true, @@ -36,10 +36,10 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/ingest": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/ingest": "15.0.2", + "@cumulus/logger": "15.0.2", "lodash": "^4.17.21" } } diff --git a/lerna.json b/lerna.json index bbcbb5fc391..68da25a682d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.20.2", - "version": "15.0.1", + "version": "15.0.2", "packages": [ "example", "example/lambdas/*", diff --git a/packages/api-client/package.json b/packages/api-client/package.json index ba41ccbe3cb..7413a645e8a 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/api-client", - "version": "15.0.1", + "version": "15.0.2", "description": "API client for working with the Cumulus archive API", "keywords": [ "GIBS", @@ -38,11 +38,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/logger": "15.0.2", "p-retry": "^2.0.0" }, "devDependencies": { - "@cumulus/types": "15.0.1" + "@cumulus/types": "15.0.2" } } diff --git a/packages/api/ecs/async-operation/package.json b/packages/api/ecs/async-operation/package.json index 1bf8023216f..6feec1b2ded 100644 --- a/packages/api/ecs/async-operation/package.json +++ b/packages/api/ecs/async-operation/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/ecs-async-operation", - "version": "15.0.1", + "version": "15.0.2", "description": "The docker image for running async operations", "keywords": [ "NASA", @@ -20,10 +20,10 @@ "test": "../../../../node_modules/.bin/ava" }, "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/es-client": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/es-client": "15.0.2", + "@cumulus/logger": "15.0.2", "aws-sdk": "^2.585.0", "crypto-random-string": "^3.2.0", "got": "^11.8.5", diff --git a/packages/api/package.json b/packages/api/package.json index 9f3e5a64a1f..68c60cb5364 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/api", - "version": "15.0.1", + "version": "15.0.2", "description": "Lambda functions for handling all daac's API operations", "main": "index.js", "engines": { @@ -52,26 +52,26 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/api-client": "15.0.1", - "@cumulus/async-operations": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmr-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/collection-config-store": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/distribution-utils": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/es-client": "15.0.1", - "@cumulus/ingest": "15.0.1", - "@cumulus/launchpad-auth": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/oauth-client": "15.0.1", - "@cumulus/object-store": "15.0.1", - "@cumulus/pvl": "15.0.1", - "@cumulus/sftp-client": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/api-client": "15.0.2", + "@cumulus/async-operations": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmr-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/collection-config-store": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/distribution-utils": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/es-client": "15.0.2", + "@cumulus/ingest": "15.0.2", + "@cumulus/launchpad-auth": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/oauth-client": "15.0.2", + "@cumulus/object-store": "15.0.2", + "@cumulus/pvl": "15.0.2", + "@cumulus/sftp-client": "15.0.2", + "@cumulus/types": "15.0.2", "@mapbox/dyno": "^1.4.2", "aggregate-error": "^3.1.0", "ajv": "^6.12.3", @@ -122,6 +122,6 @@ } }, "devDependencies": { - "@cumulus/test-data": "15.0.1" + "@cumulus/test-data": "15.0.2" } } diff --git a/packages/async-operations/package.json b/packages/async-operations/package.json index 4bb7172d919..b30eb092544 100644 --- a/packages/async-operations/package.json +++ b/packages/async-operations/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/async-operations", - "version": "15.0.1", + "version": "15.0.2", "description": "Cumulus Core internal async operations module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -28,17 +28,17 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/es-client": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/es-client": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/types": "15.0.2", "knex": "2.4.1", "uuid": "8.3.2" }, "devDependencies": { - "@cumulus/common": "15.0.1", + "@cumulus/common": "15.0.2", "@types/aws-sdk": "2.7.0", "@types/uuid": "^8.0.0" } diff --git a/packages/aws-client/package.json b/packages/aws-client/package.json index 2a8d364dd13..f4670c4875b 100644 --- a/packages/aws-client/package.json +++ b/packages/aws-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/aws-client", - "version": "15.0.1", + "version": "15.0.2", "description": "Utilities for working with AWS", "keywords": [ "GIBS", @@ -52,9 +52,9 @@ "@aws-sdk/s3-request-presigner": "^3.58.0", "@aws-sdk/signature-v4-crt": "^3.58.0", "@aws-sdk/types": "^3.58.0", - "@cumulus/checksum": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/checksum": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", "aws-sdk": "^2.585.0", "jsonpath-plus": "^1.1.0", "lodash": "~4.17.21", diff --git a/packages/checksum/package.json b/packages/checksum/package.json index 7bc1e3df644..54abc2f59cf 100644 --- a/packages/checksum/package.json +++ b/packages/checksum/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/checksum", - "version": "15.0.1", + "version": "15.0.2", "description": "Cumulus checksum utilities", "engines": { "node": ">=16.19.0" diff --git a/packages/cmr-client/package.json b/packages/cmr-client/package.json index e8c846ce60b..5a304008c60 100644 --- a/packages/cmr-client/package.json +++ b/packages/cmr-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/cmr-client", - "version": "15.0.1", + "version": "15.0.2", "description": "A Node.js client to NASA's Common Metadata Repository (CMR) API.", "engines": { "node": ">=16.19.0" @@ -34,10 +34,10 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", "got": "^11.8.5", "jsonwebtoken": "^9.0.0", "lodash": "^4.17.21", diff --git a/packages/cmrjs/package.json b/packages/cmrjs/package.json index 10b6bed1b27..a28fd4d8a9d 100644 --- a/packages/cmrjs/package.json +++ b/packages/cmrjs/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/cmrjs", - "version": "15.0.1", + "version": "15.0.2", "description": "A node SDK for CMR", "engines": { "node": ">=16.19.0" @@ -33,13 +33,13 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmr-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/distribution-utils": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/launchpad-auth": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmr-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/distribution-utils": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/launchpad-auth": "15.0.2", + "@cumulus/logger": "15.0.2", "got": "^11.8.1", "js2xmlparser": "^4.0.0", "lodash": "^4.17.21", diff --git a/packages/collection-config-store/package.json b/packages/collection-config-store/package.json index 039a93783d5..8c045c8c0b2 100644 --- a/packages/collection-config-store/package.json +++ b/packages/collection-config-store/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/collection-config-store", - "version": "15.0.1", + "version": "15.0.2", "description": "Utility for persisting collection configuration to S3 and retrieving it", "keywords": [ "CUMULUS", @@ -32,8 +32,8 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/message": "15.0.1" + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/message": "15.0.2" } } diff --git a/packages/common/package.json b/packages/common/package.json index d3ba98a23c4..943797debcb 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/common", - "version": "15.0.1", + "version": "15.0.2", "description": "Common utilities used across tasks", "keywords": [ "GIBS", @@ -43,9 +43,9 @@ "dependencies": { "@aws-sdk/client-s3": "^3.58.0", "@aws-sdk/signature-v4-crt": "^3.58.0", - "@cumulus/aws-client": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", "ajv": "^6.12.3", "aws-sdk": "^2.585.0", "follow-redirects": "^1.2.4", diff --git a/packages/db/package.json b/packages/db/package.json index c88be1c44f1..aa9b87a286c 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/db", - "version": "15.0.1", + "version": "15.0.2", "description": "Utilities for working with the Cumulus DB", "license": "Apache-2.0", "main": "./dist/index.js", @@ -29,12 +29,12 @@ "node": ">=16.19.0" }, "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/types": "15.0.2", "crypto-random-string": "^3.2.0", "is-valid-hostname": "1.0.2", "knex": "2.4.1", diff --git a/packages/distribution-utils/package.json b/packages/distribution-utils/package.json index 3c4347313ba..d61604850a1 100644 --- a/packages/distribution-utils/package.json +++ b/packages/distribution-utils/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/distribution-utils", - "version": "15.0.1", + "version": "15.0.2", "description": "Cumulus Distribution utilities", "keywords": [ "CUMULUS" @@ -33,9 +33,9 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2", "url-join": "^1.1.0" }, "devDependencies": { diff --git a/packages/errors/package.json b/packages/errors/package.json index 0bef636225d..23e93f2b430 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/errors", - "version": "15.0.1", + "version": "15.0.2", "description": "Provides error classes for Cumulus", "keywords": [ "GIBS", diff --git a/packages/es-client/package.json b/packages/es-client/package.json index ca07454cde6..fada79ee1de 100644 --- a/packages/es-client/package.json +++ b/packages/es-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/es-client", - "version": "15.0.1", + "version": "15.0.2", "description": "Utilities for working with Elasticsearch", "keywords": [ "CUMULUS", @@ -30,10 +30,10 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", "@elastic/elasticsearch": "^5.6.20", "aws-elasticsearch-connector": "8.2.0", "aws-sdk": "^2.585.0", @@ -42,8 +42,8 @@ "p-limit": "^1.2.0" }, "devDependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/test-data": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/test-data": "15.0.2", "p-each-series": "^2.1.0" } } diff --git a/packages/ingest/package.json b/packages/ingest/package.json index 3808f51b879..e7a8e48532b 100644 --- a/packages/ingest/package.json +++ b/packages/ingest/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/ingest", - "version": "15.0.1", + "version": "15.0.2", "description": "Ingest utilities", "engines": { "node": ">=16.19.0" @@ -38,13 +38,13 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/db": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/sftp-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/db": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/sftp-client": "15.0.2", "aws-sdk": "^2.585.0", "cksum": "^1.3.0", "encodeurl": "^1.0.2", @@ -60,9 +60,9 @@ "tough-cookie": "~4.0.0" }, "devDependencies": { - "@cumulus/checksum": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/test-data": "15.0.1", - "@cumulus/types": "15.0.1" + "@cumulus/checksum": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/test-data": "15.0.2", + "@cumulus/types": "15.0.2" } } diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index b040ac1b9df..51e8ccce3ba 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/integration-tests", - "version": "15.0.1", + "version": "15.0.2", "description": "Integration tests", "bin": { "cumulus-test": "./bin/cli.js" @@ -28,16 +28,16 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/api-client": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmr-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/launchpad-auth": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/message": "15.0.1", - "@cumulus/oauth-client": "15.0.1", + "@cumulus/api": "15.0.2", + "@cumulus/api-client": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmr-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/launchpad-auth": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/message": "15.0.2", + "@cumulus/oauth-client": "15.0.2", "aws-sdk": "^2.585.0", "base-64": "^0.1.0", "commander": "^2.15.0", diff --git a/packages/launchpad-auth/package.json b/packages/launchpad-auth/package.json index 146d1af846d..4a1403aaa4a 100644 --- a/packages/launchpad-auth/package.json +++ b/packages/launchpad-auth/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/launchpad-auth", - "version": "15.0.1", + "version": "15.0.2", "description": "Utilities for authentication with Launchpad", "keywords": [ "CUMULUS", @@ -37,8 +37,8 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/logger": "15.0.2", "got": "^11.8.5", "lodash": "^4.17.21", "uuid": "^3.2.1" diff --git a/packages/logger/package.json b/packages/logger/package.json index 7cceb943fcb..924a8430cbb 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/logger", - "version": "15.0.1", + "version": "15.0.2", "description": "A log library for use on Cumulus", "keywords": [ "GIBS", diff --git a/packages/lzards-api-client/package.json b/packages/lzards-api-client/package.json index 10291223ff2..ab339a31909 100644 --- a/packages/lzards-api-client/package.json +++ b/packages/lzards-api-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/lzards-api-client", - "version": "15.0.1", + "version": "15.0.2", "description": "A Node.js client to NASA's Level Zero and Repositories Data Store (LZARDS) API.", "engines": { "node": ">=16.19.0" @@ -33,11 +33,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/launchpad-auth": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/launchpad-auth": "15.0.2", + "@cumulus/logger": "15.0.2", "got": "^11.8.5", "lodash": "^4.17.21" } diff --git a/packages/message/package.json b/packages/message/package.json index 9ed0d3db929..ce67dcf626a 100644 --- a/packages/message/package.json +++ b/packages/message/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/message", - "version": "15.0.1", + "version": "15.0.2", "description": "Utilities for building and parsing Cumulus messages", "keywords": [ "GIBS", @@ -38,11 +38,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/types": "15.0.2", "jsonpath-plus": "^3.0.0", "lodash": "^4.17.21", "uuid": "^8.2.0" diff --git a/packages/oauth-client/package.json b/packages/oauth-client/package.json index e43f371727b..34d57e471a8 100644 --- a/packages/oauth-client/package.json +++ b/packages/oauth-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/oauth-client", - "version": "15.0.1", + "version": "15.0.2", "description": "A generic auth client", "homepage": "https://github.com/nasa/cumulus/tree/master/packages/oauth-client#readme", "repository": { diff --git a/packages/object-store/package.json b/packages/object-store/package.json index 4679a1ba832..d2194b17de6 100644 --- a/packages/object-store/package.json +++ b/packages/object-store/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/object-store", - "version": "15.0.1", + "version": "15.0.2", "description": "Utilities for managing object stores", "keywords": [ "GIBS", @@ -39,6 +39,6 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1" + "@cumulus/aws-client": "15.0.2" } } diff --git a/packages/pvl/package.json b/packages/pvl/package.json index c8a108dc1b4..488560707f9 100644 --- a/packages/pvl/package.json +++ b/packages/pvl/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/pvl", - "version": "15.0.1", + "version": "15.0.2", "description": "Parse and serialize Parameter Value Language, a data markup language used by NASA", "main": "index.js", "engine": { diff --git a/packages/s3-credentials-endpoint/package.json b/packages/s3-credentials-endpoint/package.json index fb72bcac962..b93df5d6e9c 100644 --- a/packages/s3-credentials-endpoint/package.json +++ b/packages/s3-credentials-endpoint/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/s3-credentials-endpoint", - "version": "15.0.1", + "version": "15.0.2", "description": "An API Gateway Lambda to return AWS credentials for fetching objects from S3", "license": "Apache-2.0", "engines": { @@ -17,12 +17,12 @@ "timeout": "15m" }, "dependencies": { - "@cumulus/api": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/oauth-client": "15.0.1", + "@cumulus/api": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/oauth-client": "15.0.2", "aws-serverless-express": "^3.3.6", "body-parser": "^1.19.0", "cookie-parser": "^1.4.4", diff --git a/packages/schemas/package.json b/packages/schemas/package.json index 2ea8f31b018..b8d7955677d 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/schemas", - "version": "15.0.1", + "version": "15.0.2", "description": "Helpers for managing Cumulus task schemas", "homepage": "https://github.com/nasa/cumulus/tree/master/packages/schemas", "repository": { diff --git a/packages/sftp-client/package.json b/packages/sftp-client/package.json index 92cdeca59cd..9f33f4e3031 100644 --- a/packages/sftp-client/package.json +++ b/packages/sftp-client/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/sftp-client", - "version": "15.0.1", + "version": "15.0.2", "description": "A Promise-based SFTP client", "keywords": [ "GIBS", @@ -36,16 +36,16 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", "lodash": "^4.17.21", "mime-types": "^2.1.27", "ssh2": "^1.0.0", "ssh2-sftp-client": "^7.0.4" }, "devDependencies": { - "@cumulus/checksum": "15.0.1", - "@cumulus/test-data": "15.0.1", + "@cumulus/checksum": "15.0.2", + "@cumulus/test-data": "15.0.2", "@types/ssh2-sftp-client": "^7.0.0" } } diff --git a/packages/tea-map-cache/package.json b/packages/tea-map-cache/package.json index 1ea047927df..ca47103c511 100644 --- a/packages/tea-map-cache/package.json +++ b/packages/tea-map-cache/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/tea-map-cache", - "version": "15.0.1", + "version": "15.0.2", "description": "Tea Bucket Map Cache Writer", "main": "index.js", "engines": { @@ -27,8 +27,8 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/logger": "15.0.2", "got": "^11.8.5", "p-retry": "^4.2.0" }, diff --git a/packages/test-data/package.json b/packages/test-data/package.json index e35747e6590..fd20736f63f 100644 --- a/packages/test-data/package.json +++ b/packages/test-data/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-data", - "version": "15.0.1", + "version": "15.0.2", "description": "Includes the test data for various packages", "keywords": [ "GIBS", diff --git a/packages/tf-inventory/package.json b/packages/tf-inventory/package.json index 9f3f3b1617d..2bc5864e02e 100644 --- a/packages/tf-inventory/package.json +++ b/packages/tf-inventory/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/tf-inventory", - "version": "15.0.1", + "version": "15.0.2", "description": "Package to help keep track of what resources are managed by Terraform in the AWS account", "main": "index.js", "engines": { @@ -30,11 +30,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", "commander": "^4.1.0", "lodash": "^4.17.21" }, "devDependencies": { - "@cumulus/common": "15.0.1" + "@cumulus/common": "15.0.2" } } diff --git a/packages/types/package.json b/packages/types/package.json index f57f80fcfe5..96b7714698d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/types", - "version": "15.0.1", + "version": "15.0.2", "description": "TypeScript definitions for working with Cumulus data structures", "keywords": [ "GIBS", diff --git a/tasks/add-missing-file-checksums/package.json b/tasks/add-missing-file-checksums/package.json index 050d98d3790..c1c4e97c67c 100644 --- a/tasks/add-missing-file-checksums/package.json +++ b/tasks/add-missing-file-checksums/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/add-missing-file-checksums", - "version": "15.0.1", + "version": "15.0.2", "description": "Add checksums to files in S3 which don't have one", "author": "Cumulus Authors", "license": "Apache-2.0", @@ -42,12 +42,12 @@ } }, "dependencies": { - "@cumulus/aws-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4" }, "devDependencies": { - "@cumulus/schemas": "15.0.1", - "@cumulus/types": "15.0.1", + "@cumulus/schemas": "15.0.2", + "@cumulus/types": "15.0.2", "@types/aws-lambda": "^8.10.58" } } diff --git a/tasks/discover-granules/package.json b/tasks/discover-granules/package.json index d103e8e2dba..e1ae03e8af4 100644 --- a/tasks/discover-granules/package.json +++ b/tasks/discover-granules/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/discover-granules", - "version": "15.0.1", + "version": "15.0.2", "description": "Discover Granules in FTP/HTTP/HTTPS/SFTP/S3 endpoints", "main": "index.js", "directories": { @@ -35,16 +35,16 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/api-client": "15.0.1", + "@cumulus/api-client": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/ingest": "15.0.1", - "@cumulus/logger": "15.0.1", + "@cumulus/ingest": "15.0.2", + "@cumulus/logger": "15.0.2", "got": "^11.8.5", "lodash": "^4.17.21", "p-map": "^4.0.0" }, "devDependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1" + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2" } } diff --git a/tasks/discover-pdrs/package.json b/tasks/discover-pdrs/package.json index 89a5584b7ae..cec2ffc33f5 100644 --- a/tasks/discover-pdrs/package.json +++ b/tasks/discover-pdrs/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/discover-pdrs", - "version": "15.0.1", + "version": "15.0.2", "description": "Discover PDRs in FTP and HTTP endpoints", "main": "index.js", "directories": { @@ -34,14 +34,14 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/ingest": "15.0.1", + "@cumulus/ingest": "15.0.2", "lodash": "^4.17.21", "p-filter": "^2.1.0" }, "devDependencies": { - "@cumulus/common": "15.0.1", - "@cumulus/errors": "15.0.1" + "@cumulus/common": "15.0.2", + "@cumulus/errors": "15.0.2" } } diff --git a/tasks/files-to-granules/package.json b/tasks/files-to-granules/package.json index ffe80f4c088..41d270013e3 100644 --- a/tasks/files-to-granules/package.json +++ b/tasks/files-to-granules/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/files-to-granules", - "version": "15.0.1", + "version": "15.0.2", "description": "Converts array-of-files input into a granules object by extracting granuleId from filename", "main": "index.js", "directories": { @@ -32,12 +32,12 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", "lodash": "^4.17.21" }, "devDependencies": { - "@cumulus/common": "15.0.1", - "@cumulus/schemas": "15.0.1" + "@cumulus/common": "15.0.2", + "@cumulus/schemas": "15.0.2" } } diff --git a/tasks/hello-world/package.json b/tasks/hello-world/package.json index d306b172e7e..a028fe922fb 100644 --- a/tasks/hello-world/package.json +++ b/tasks/hello-world/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/hello-world", - "version": "15.0.1", + "version": "15.0.2", "description": "Example task", "main": "index.js", "directories": { @@ -32,8 +32,8 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4" } } diff --git a/tasks/hyrax-metadata-updates/package.json b/tasks/hyrax-metadata-updates/package.json index 659a0b3c157..9e5f874c774 100644 --- a/tasks/hyrax-metadata-updates/package.json +++ b/tasks/hyrax-metadata-updates/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/hyrax-metadata-updates", - "version": "15.0.1", + "version": "15.0.2", "description": "Update granule metadata with hooks to OPeNDAP URL", "main": "index.js", "directories": { @@ -38,18 +38,18 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmr-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmr-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/errors": "15.0.1", + "@cumulus/errors": "15.0.2", "libxmljs": "^0.19.7", "lodash": "^4.17.21", "xml2js": "0.5.0" }, "devDependencies": { - "@cumulus/schemas": "15.0.1", + "@cumulus/schemas": "15.0.2", "jsonwebtoken": "^9.0.0", "nock": "^12.0.1", "rewire": "^6.0.0" diff --git a/tasks/lzards-backup/package.json b/tasks/lzards-backup/package.json index 860c5f4ebda..1e39ac7e4c4 100644 --- a/tasks/lzards-backup/package.json +++ b/tasks/lzards-backup/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/lzards-backup", - "version": "15.0.1", + "version": "15.0.2", "description": "Run LZARDS backup", "author": "Cumulus Authors", "license": "Apache-2.0", @@ -42,20 +42,20 @@ } }, "dependencies": { - "@cumulus/api-client": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/api-client": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/db": "15.0.1", - "@cumulus/distribution-utils": "15.0.1", - "@cumulus/launchpad-auth": "15.0.1", - "@cumulus/logger": "15.0.1", - "@cumulus/lzards-api-client": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/db": "15.0.2", + "@cumulus/distribution-utils": "15.0.2", + "@cumulus/launchpad-auth": "15.0.2", + "@cumulus/logger": "15.0.2", + "@cumulus/lzards-api-client": "15.0.2", + "@cumulus/message": "15.0.2", "got": "^11.8.5" }, "devDependencies": { - "@cumulus/schemas": "15.0.1", - "@cumulus/types": "15.0.1" + "@cumulus/schemas": "15.0.2", + "@cumulus/types": "15.0.2" } } diff --git a/tasks/move-granules/package.json b/tasks/move-granules/package.json index dcfe1166672..e15b9e41623 100644 --- a/tasks/move-granules/package.json +++ b/tasks/move-granules/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/move-granules", - "version": "15.0.1", + "version": "15.0.2", "description": "Move granule files from staging to final location", "main": "index.js", "directories": { @@ -38,17 +38,17 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/distribution-utils": "15.0.1", - "@cumulus/errors": "15.0.1", - "@cumulus/ingest": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/distribution-utils": "15.0.2", + "@cumulus/errors": "15.0.2", + "@cumulus/ingest": "15.0.2", + "@cumulus/message": "15.0.2", "lodash": "^4.17.21" }, "devDependencies": { - "@cumulus/schemas": "15.0.1" + "@cumulus/schemas": "15.0.2" } } diff --git a/tasks/parse-pdr/package.json b/tasks/parse-pdr/package.json index 5731ec3d424..515ae50d928 100644 --- a/tasks/parse-pdr/package.json +++ b/tasks/parse-pdr/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/parse-pdr", - "version": "15.0.1", + "version": "15.0.2", "description": "Download and Parse a given PDR", "license": "Apache-2.0", "main": "index.js", @@ -30,17 +30,17 @@ "timeout": "15m" }, "dependencies": { - "@cumulus/api-client": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/collection-config-store": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/api-client": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/collection-config-store": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/errors": "15.0.1", - "@cumulus/ingest": "15.0.1", - "@cumulus/pvl": "15.0.1", + "@cumulus/errors": "15.0.2", + "@cumulus/ingest": "15.0.2", + "@cumulus/pvl": "15.0.2", "lodash": "^4.17.21" }, "devDependencies": { - "@cumulus/test-data": "15.0.1" + "@cumulus/test-data": "15.0.2" } } diff --git a/tasks/pdr-status-check/package.json b/tasks/pdr-status-check/package.json index acac4e2f3d5..2bccfb10f8f 100644 --- a/tasks/pdr-status-check/package.json +++ b/tasks/pdr-status-check/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/pdr-status-check", - "version": "15.0.1", + "version": "15.0.2", "description": "Checks execution status of granules in a PDR", "main": "index.js", "directories": { @@ -32,9 +32,9 @@ "timeout": "15m" }, "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/errors": "15.0.1" + "@cumulus/errors": "15.0.2" } } diff --git a/tasks/post-to-cmr/package.json b/tasks/post-to-cmr/package.json index b7c0d4b35b3..811324c3664 100644 --- a/tasks/post-to-cmr/package.json +++ b/tasks/post-to-cmr/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/post-to-cmr", - "version": "15.0.1", + "version": "15.0.2", "description": "Post a given granule to CMR", "main": "index.js", "directories": { @@ -33,16 +33,16 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/errors": "15.0.1", - "@cumulus/launchpad-auth": "15.0.1", + "@cumulus/errors": "15.0.2", + "@cumulus/launchpad-auth": "15.0.2", "lodash": "^4.17.21" }, "devDependencies": { - "@cumulus/cmr-client": "15.0.1", - "@cumulus/schemas": "15.0.1" + "@cumulus/cmr-client": "15.0.2", + "@cumulus/schemas": "15.0.2" } } diff --git a/tasks/queue-granules/package.json b/tasks/queue-granules/package.json index f2688cb1e3e..af09e6b63dd 100644 --- a/tasks/queue-granules/package.json +++ b/tasks/queue-granules/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/queue-granules", - "version": "15.0.1", + "version": "15.0.2", "description": "Add discovered granules to the queue", "main": "index.js", "directories": { @@ -31,13 +31,13 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/api-client": "15.0.1", - "@cumulus/aws-client": "15.0.1", - "@cumulus/collection-config-store": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/api-client": "15.0.2", + "@cumulus/aws-client": "15.0.2", + "@cumulus/collection-config-store": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/ingest": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/ingest": "15.0.2", + "@cumulus/message": "15.0.2", "lodash": "^4.17.21", "p-map": "^4.0.0" } diff --git a/tasks/queue-pdrs/package.json b/tasks/queue-pdrs/package.json index 7808d41e35a..0faafc1b76d 100644 --- a/tasks/queue-pdrs/package.json +++ b/tasks/queue-pdrs/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/queue-pdrs", - "version": "15.0.1", + "version": "15.0.2", "description": "Add discovered PDRs to a queue", "main": "index.js", "directories": { @@ -31,11 +31,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/ingest": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/ingest": "15.0.2", + "@cumulus/message": "15.0.2", "lodash": "^4.17.21" } } diff --git a/tasks/queue-workflow/package.json b/tasks/queue-workflow/package.json index 64c0d2d38f2..e375f210131 100644 --- a/tasks/queue-workflow/package.json +++ b/tasks/queue-workflow/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/queue-workflow", - "version": "15.0.1", + "version": "15.0.2", "description": "Add workflow to the queue", "main": "index.js", "directories": { @@ -31,11 +31,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/ingest": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/ingest": "15.0.2", + "@cumulus/message": "15.0.2", "lodash": "^4.17.21" } } diff --git a/tasks/sf-sqs-report/package.json b/tasks/sf-sqs-report/package.json index 6a05254b74f..87a03aa07b0 100644 --- a/tasks/sf-sqs-report/package.json +++ b/tasks/sf-sqs-report/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/sf-sqs-report", - "version": "15.0.1", + "version": "15.0.2", "description": "Sends an incoming Cumulus message to SQS", "main": "index.js", "directories": { @@ -32,11 +32,11 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", "lodash": "^4.17.21" }, "devDependencies": { - "@cumulus/common": "15.0.1" + "@cumulus/common": "15.0.2" } } diff --git a/tasks/sync-granule/package.json b/tasks/sync-granule/package.json index b1364c54c10..5405fe38125 100644 --- a/tasks/sync-granule/package.json +++ b/tasks/sync-granule/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/sync-granule", - "version": "15.0.1", + "version": "15.0.2", "description": "Download a given granule", "main": "index.js", "directories": { @@ -37,19 +37,19 @@ "timeout": "15m" }, "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/collection-config-store": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/collection-config-store": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/errors": "15.0.1", - "@cumulus/ingest": "15.0.1", - "@cumulus/message": "15.0.1", + "@cumulus/errors": "15.0.2", + "@cumulus/ingest": "15.0.2", + "@cumulus/message": "15.0.2", "lodash": "^4.17.21", "p-map": "^2.1.0", "uuid": "^3.4.0" }, "devDependencies": { - "@cumulus/schemas": "15.0.1", - "@cumulus/test-data": "15.0.1" + "@cumulus/schemas": "15.0.2", + "@cumulus/test-data": "15.0.2" } } diff --git a/tasks/test-processing/package.json b/tasks/test-processing/package.json index 8be717fb3c7..66835329aef 100644 --- a/tasks/test-processing/package.json +++ b/tasks/test-processing/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/test-processing", - "version": "15.0.1", + "version": "15.0.2", "description": "Fake processing task used for integration tests", "main": "index.js", "homepage": "https://github.com/nasa/cumulus/tree/master/tasks/test-processing", @@ -21,8 +21,8 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/aws-client": "15.0.1", + "@cumulus/aws-client": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/integration-tests": "15.0.1" + "@cumulus/integration-tests": "15.0.2" } } diff --git a/tasks/update-cmr-access-constraints/package.json b/tasks/update-cmr-access-constraints/package.json index 250142f1edc..693512b166a 100644 --- a/tasks/update-cmr-access-constraints/package.json +++ b/tasks/update-cmr-access-constraints/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/update-cmr-access-constraints", - "version": "15.0.1", + "version": "15.0.2", "description": "Updates CMR metadata to set access constraints", "author": "Cumulus Authors", "license": "Apache-2.0", @@ -34,13 +34,13 @@ "verbose": true }, "dependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/cmrjs": "15.0.1", + "@cumulus/aws-client": "15.0.2", + "@cumulus/cmrjs": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", "lodash": "^4.17.5" }, "devDependencies": { - "@cumulus/common": "15.0.1", - "@cumulus/schemas": "15.0.1" + "@cumulus/common": "15.0.2", + "@cumulus/schemas": "15.0.2" } } diff --git a/tasks/update-granules-cmr-metadata-file-links/package.json b/tasks/update-granules-cmr-metadata-file-links/package.json index 0816bf23068..88c302822de 100644 --- a/tasks/update-granules-cmr-metadata-file-links/package.json +++ b/tasks/update-granules-cmr-metadata-file-links/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/update-granules-cmr-metadata-file-links", - "version": "15.0.1", + "version": "15.0.2", "description": "Update CMR metadata files with correct online access urls and etags and transfer etag info to granules' CMR files", "main": "index.js", "directories": { @@ -38,14 +38,14 @@ "author": "Cumulus Authors", "license": "Apache-2.0", "dependencies": { - "@cumulus/cmrjs": "15.0.1", - "@cumulus/common": "15.0.1", + "@cumulus/cmrjs": "15.0.2", + "@cumulus/common": "15.0.2", "@cumulus/cumulus-message-adapter-js": "2.0.4", - "@cumulus/distribution-utils": "15.0.1", + "@cumulus/distribution-utils": "15.0.2", "lodash": "^4.17.15" }, "devDependencies": { - "@cumulus/aws-client": "15.0.1", - "@cumulus/schemas": "15.0.1" + "@cumulus/aws-client": "15.0.2", + "@cumulus/schemas": "15.0.2" } } diff --git a/tf-modules/archive/api.tf b/tf-modules/archive/api.tf index a0e87d0196d..b712508f943 100644 --- a/tf-modules/archive/api.tf +++ b/tf-modules/archive/api.tf @@ -114,13 +114,13 @@ resource "aws_secretsmanager_secret_version" "api_config" { resource "aws_cloudwatch_log_group" "private_api" { name = "/aws/lambda/${aws_lambda_function.private_api.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_private_api_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "PrivateApiLambda", var.default_log_retention_days) tags = var.tags } resource "aws_cloudwatch_log_group" "api" { name = "/aws/lambda/${aws_lambda_function.api.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_api_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ApiEndpoints", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/archive/async_operation.tf b/tf-modules/archive/async_operation.tf index dc23a931970..f57aca2a3bb 100644 --- a/tf-modules/archive/async_operation.tf +++ b/tf-modules/archive/async_operation.tf @@ -1,9 +1,10 @@ resource "aws_cloudwatch_log_group" "async_operation" { name = "${var.prefix}-AsyncOperationEcsLogs" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_async_operation_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "AsyncOperationEcsLogs", var.default_log_retention_days) tags = var.tags } resource "aws_ecs_task_definition" "async_operation" { + depends_on = [aws_cloudwatch_log_group.async_operation] family = "${var.prefix}-AsyncOperationTaskDefinition" tags = var.tags requires_compatibilities = ["FARGATE"] diff --git a/tf-modules/archive/granule_files_cache_updater.tf b/tf-modules/archive/granule_files_cache_updater.tf index 0861ffb03a8..deccb92e0b9 100644 --- a/tf-modules/archive/granule_files_cache_updater.tf +++ b/tf-modules/archive/granule_files_cache_updater.tf @@ -56,6 +56,7 @@ resource "aws_iam_role_policy" "granule_files_cache_updater_lambda_role_policy" } resource "aws_lambda_function" "granule_files_cache_updater" { + depends_on = [aws_cloudwatch_log_group.granule_files_cache_updater_logs] filename = "${path.module}/../../packages/api/dist/granuleFilesCacheUpdater/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../packages/api/dist/granuleFilesCacheUpdater/lambda.zip") function_name = "${var.prefix}-granuleFilesCacheUpdater" @@ -85,8 +86,8 @@ resource "aws_lambda_function" "granule_files_cache_updater" { } resource "aws_cloudwatch_log_group" "granule_files_cache_updater_logs" { - name = "/aws/lambda/${aws_lambda_function.granule_files_cache_updater.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_granule_files_cache_updater_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-granuleFilesCacheUpdater" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "granuleFilesCacheUpdater", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/archive/ingest-reporting.tf b/tf-modules/archive/ingest-reporting.tf index 674652c4f23..b772677e7ee 100644 --- a/tf-modules/archive/ingest-reporting.tf +++ b/tf-modules/archive/ingest-reporting.tf @@ -100,7 +100,7 @@ resource "aws_lambda_function" "publish_executions" { resource "aws_cloudwatch_log_group" "publish_executions_logs" { name = "/aws/lambda/${var.prefix}-publishExecutions" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_publish_executions_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "publishExecutions", var.default_log_retention_days) tags = var.tags } @@ -176,6 +176,7 @@ resource "aws_sqs_queue" "publish_granules_dead_letter_queue" { } resource "aws_lambda_function" "publish_granules" { + depends_on = [aws_cloudwatch_log_group.publish_granules_logs] filename = "${path.module}/../../packages/api/dist/publishGranules/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../packages/api/dist/publishGranules/lambda.zip") function_name = "${var.prefix}-publishGranules" @@ -209,8 +210,8 @@ resource "aws_lambda_function" "publish_granules" { } resource "aws_cloudwatch_log_group" "publish_granules_logs" { - name = "/aws/lambda/${aws_lambda_function.publish_granules.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_publish_granule_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-publishGranules" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "publishGranules", var.default_log_retention_days) tags = var.tags } @@ -281,6 +282,7 @@ resource "aws_sqs_queue" "publish_pdrs_dead_letter_queue" { } resource "aws_lambda_function" "publish_pdrs" { + depends_on = [aws_cloudwatch_log_group.publish_pdrs_logs] filename = "${path.module}/../../packages/api/dist/publishPdrs/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../packages/api/dist/publishPdrs/lambda.zip") function_name = "${var.prefix}-publishPdrs" @@ -314,8 +316,8 @@ resource "aws_lambda_function" "publish_pdrs" { } resource "aws_cloudwatch_log_group" "publish_pdrs_logs" { - name = "/aws/lambda/${aws_lambda_function.publish_pdrs.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_publish_pdrs_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-publishPdrs" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "publishPdrs", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/archive/replay_sqs_messages.tf b/tf-modules/archive/replay_sqs_messages.tf index e48830256bb..428f4ff5799 100644 --- a/tf-modules/archive/replay_sqs_messages.tf +++ b/tf-modules/archive/replay_sqs_messages.tf @@ -51,6 +51,7 @@ resource "aws_iam_role_policy" "replay_sqs_messages_role_policy" { } resource "aws_lambda_function" "replay_sqs_messages" { + depends_on = [aws_cloudwatch_log_group.replay_sqs_messages] filename = "${path.module}/../../packages/api/dist/replaySqsMessages/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../packages/api/dist/replaySqsMessages/lambda.zip") function_name = "${var.prefix}-replaySqsMessages" @@ -82,7 +83,7 @@ resource "aws_lambda_function" "replay_sqs_messages" { } resource "aws_cloudwatch_log_group" "replay_sqs_messages" { - name = "/aws/lambda/${aws_lambda_function.replay_sqs_messages.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "archive_replay_sqs_messages_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-replaySqsMessages" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "replaySqsMessages", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/archive/variables.tf b/tf-modules/archive/variables.tf index 79aa9d067d4..f79e5d20531 100644 --- a/tf-modules/archive/variables.tf +++ b/tf-modules/archive/variables.tf @@ -10,12 +10,6 @@ variable "background_queue_url" { type = string } -variable "cloudwatch_log_retention_periods" { - type = map(number) - description = "number of days logs will be retained for the respective cloudwatch log group, in the form of __log_retention" - default = {} -} - variable "cmr_client_id" { type = string } @@ -46,12 +40,6 @@ variable "rds_user_access_secret_arn" { type = string } -variable "default_log_retention_days" { - type = number - default = 30 - description = "default value that user chooses for their log retention periods" -} - variable "deploy_to_ngap" { description = "Whether or not this instance of Cumulus is deployed to an NGAP environment" type = bool @@ -384,3 +372,15 @@ variable "es_index_shards" { type = number default = 2 } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = {} +} + +variable "default_log_retention_days" { + type = number + default = 30 + description = "default value that user chooses for their log retention periods" +} diff --git a/tf-modules/cumulus/archive.tf b/tf-modules/cumulus/archive.tf index c1df1501eb8..b79e103936b 100644 --- a/tf-modules/cumulus/archive.tf +++ b/tf-modules/cumulus/archive.tf @@ -14,6 +14,9 @@ module "archive" { async_operation_image = var.async_operation_image ecs_cluster_name = aws_ecs_cluster.default.name + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods + elasticsearch_client_config = var.elasticsearch_client_config elasticsearch_domain_arn = var.elasticsearch_domain_arn elasticsearch_hostname = var.elasticsearch_hostname diff --git a/tf-modules/cumulus/distribution.tf b/tf-modules/cumulus/distribution.tf index c11b6bc8922..17b8c90a0fe 100644 --- a/tf-modules/cumulus/distribution.tf +++ b/tf-modules/cumulus/distribution.tf @@ -29,4 +29,7 @@ module "distribution" { deploy_to_ngap = var.deploy_to_ngap tags = var.tags + + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods } diff --git a/tf-modules/cumulus/ingest.tf b/tf-modules/cumulus/ingest.tf index ec701d1a330..1b1560f2ec8 100644 --- a/tf-modules/cumulus/ingest.tf +++ b/tf-modules/cumulus/ingest.tf @@ -59,4 +59,5 @@ module "ingest" { # Cloudwatch log retention config cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods + default_log_retention_days = var.default_log_retention_days } diff --git a/tf-modules/cumulus/variables.tf b/tf-modules/cumulus/variables.tf index e98ae27e25d..dbd62d02da1 100644 --- a/tf-modules/cumulus/variables.tf +++ b/tf-modules/cumulus/variables.tf @@ -6,12 +6,6 @@ variable "async_operation_image" { default = "cumuluss/async-operation:44" } -variable "cloudwatch_log_retention_periods" { - type = map(number) - description = "number of days logs will be retained for the respective cloudwatch log group, in the form of __log_retention" - default = {} -} - variable "cmr_client_id" { description = "Client ID that you want to use for requests to CMR (https://cmr.earthdata.nasa.gov/search/site/docs/search/api.html)" type = string @@ -604,3 +598,15 @@ variable "deploy_cumulus_distribution" { type = bool default = false } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = {} +} + +variable "default_log_retention_days" { + type = number + description = "default value that user chooses for their log retention periods" + default = 30 +} diff --git a/tf-modules/cumulus_distribution/api.tf b/tf-modules/cumulus_distribution/api.tf index 41dcc4c9f3e..97cc62df4c4 100644 --- a/tf-modules/cumulus_distribution/api.tf +++ b/tf-modules/cumulus_distribution/api.tf @@ -36,7 +36,7 @@ resource "aws_secretsmanager_secret_version" "api_oauth_client_password" { resource "aws_cloudwatch_log_group" "api" { name = "/aws/lambda/${aws_lambda_function.api.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "cumulus_distribution_api_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "DistributionApiEndpoints", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/cumulus_distribution/variables.tf b/tf-modules/cumulus_distribution/variables.tf index 77106907916..98c06498d9d 100644 --- a/tf-modules/cumulus_distribution/variables.tf +++ b/tf-modules/cumulus_distribution/variables.tf @@ -1,9 +1,3 @@ -variable "default_log_retention_days" { - type = number - default = 30 - description = "default value that user chooses for their log retention periods" -} - variable "deploy_to_ngap" { description = "Whether or not this instance of Cumulus is deployed to an NGAP environment" type = bool @@ -25,12 +19,6 @@ variable "bucketname_prefix" { description = "all data buckets should have names prefixed with this. Must be compatible with S3 naming conventions (lower case only, etc). An empty string can be used to indicate no prefix" } -variable "cloudwatch_log_retention_periods" { - type = map(number) - description = "number of days logs will be retained for the respective cloudwatch log group, in the form of __log_retention" - default = {} -} - variable "oauth_client_id" { type = string description = "oauth_client_id" @@ -130,3 +118,15 @@ variable "vpc_id" { description = "VPC used by Lambda functions" default = null } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = {} +} + +variable "default_log_retention_days" { + type = number + default = 30 + description = "default value that user chooses for their log retention periods" +} diff --git a/tf-modules/cumulus_ecs_service/main.tf b/tf-modules/cumulus_ecs_service/main.tf index 969d2aeb86e..2c1f0540fee 100644 --- a/tf-modules/cumulus_ecs_service/main.tf +++ b/tf-modules/cumulus_ecs_service/main.tf @@ -16,7 +16,7 @@ data "aws_region" "current" {} resource "aws_cloudwatch_log_group" "default" { name = "${local.full_name}EcsLogs" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "cumulus_ecs_service_default_log_retention", var.default_log_retention_days) + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "EcsLogs", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/cumulus_ecs_service/variables.tf b/tf-modules/cumulus_ecs_service/variables.tf index 6b0cbd4532b..052e70b7a23 100644 --- a/tf-modules/cumulus_ecs_service/variables.tf +++ b/tf-modules/cumulus_ecs_service/variables.tf @@ -5,12 +5,6 @@ variable "cluster_arn" { type = string } -variable "default_log_retention_days" { - type = number - default = 30 - description = "default value that user chooses for their log retention periods" -} - variable "image" { description = "Image used to start the container. See https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerDefinition.html#ECS-Type-ContainerDefinition-image" type = string @@ -36,10 +30,16 @@ variable "alarms" { variable "cloudwatch_log_retention_periods" { type = map(number) - description = "number of days logs will be retained for the respective cloudwatch log group, in the form of __log_retention" + description = "retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" default = {} } +variable "default_log_retention_days" { + type = number + default = 30 + description = "default value that user chooses for their log retention periods" +} + variable "command" { description = "The command that is passed to the ECS container. Command is concatenated from a list of strings." type = list(string) diff --git a/tf-modules/distribution/main.tf b/tf-modules/distribution/main.tf index 9c88724d2af..75241add566 100644 --- a/tf-modules/distribution/main.tf +++ b/tf-modules/distribution/main.tf @@ -21,6 +21,8 @@ module "tea_map_cache" { lambda_subnet_ids = var.subnet_ids vpc_id = var.vpc_id deploy_to_ngap = var.deploy_to_ngap + default_log_retention_days = var.default_log_retention_days + cloudwatch_log_retention_periods = var.cloudwatch_log_retention_periods } data "aws_lambda_invocation" "tea_map_cache" { diff --git a/tf-modules/distribution/variables.tf b/tf-modules/distribution/variables.tf index 45b616afa18..4f7e57f7420 100644 --- a/tf-modules/distribution/variables.tf +++ b/tf-modules/distribution/variables.tf @@ -144,3 +144,15 @@ variable "vpc_id" { description = "VPC used by Lambda functions" default = null } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = {} +} + +variable "default_log_retention_days" { + type = number + default = 30 + description = "default value that user chooses for their log retention periods" +} diff --git a/tf-modules/ingest/discover-pdrs-task.tf b/tf-modules/ingest/discover-pdrs-task.tf index 7aafeece6c6..ff207351b28 100644 --- a/tf-modules/ingest/discover-pdrs-task.tf +++ b/tf-modules/ingest/discover-pdrs-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "discover_pdrs_task" { + depends_on = [aws_cloudwatch_log_group.discover_pdrs_task] function_name = "${var.prefix}-DiscoverPdrs" filename = "${path.module}/../../tasks/discover-pdrs/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/discover-pdrs/dist/lambda.zip") @@ -31,7 +32,7 @@ resource "aws_lambda_function" "discover_pdrs_task" { } resource "aws_cloudwatch_log_group" "discover_pdrs_task" { - name = "/aws/lambda/${aws_lambda_function.discover_pdrs_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_discover_pdrs_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-DiscoverPdrs" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "DiscoverPdrs", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/hyrax-metadata-updates-task.tf b/tf-modules/ingest/hyrax-metadata-updates-task.tf index 2442961e995..88706f01548 100644 --- a/tf-modules/ingest/hyrax-metadata-updates-task.tf +++ b/tf-modules/ingest/hyrax-metadata-updates-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "hyrax_metadata_updates_task" { + depends_on = [aws_cloudwatch_log_group.hyrax_metadata_updates_task] function_name = "${var.prefix}-HyraxMetadataUpdates" filename = "${path.module}/../../tasks/hyrax-metadata-updates/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/hyrax-metadata-updates/dist/lambda.zip") @@ -34,8 +35,8 @@ resource "aws_lambda_function" "hyrax_metadata_updates_task" { } resource "aws_cloudwatch_log_group" "hyrax_metadata_updates_task" { - name = "/aws/lambda/${aws_lambda_function.hyrax_metadata_updates_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_hyrax_metadata_updates_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-HyraxMetadataUpdates" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "HyraxMetadataUpdates", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/package.json b/tf-modules/ingest/package.json index 6af56ae7bb0..040f9edd49b 100644 --- a/tf-modules/ingest/package.json +++ b/tf-modules/ingest/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/ingest-module", - "version": "15.0.1", + "version": "15.0.2", "description": "Terraform module for data ingest related functionality", "engines": { "node": ">=16.19.0" diff --git a/tf-modules/ingest/parse-pdr-task.tf b/tf-modules/ingest/parse-pdr-task.tf index 647785d8b3f..af5fe53da1d 100644 --- a/tf-modules/ingest/parse-pdr-task.tf +++ b/tf-modules/ingest/parse-pdr-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "parse_pdr_task" { + depends_on = [aws_cloudwatch_log_group.parse_pdr_task] function_name = "${var.prefix}-ParsePdr" filename = "${path.module}/../../tasks/parse-pdr/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/parse-pdr/dist/lambda.zip") @@ -31,7 +32,7 @@ resource "aws_lambda_function" "parse_pdr_task" { } resource "aws_cloudwatch_log_group" "parse_pdr_task" { - name = "/aws/lambda/${aws_lambda_function.parse_pdr_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_parse_pdr_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-ParsePdr" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ParsePdr", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/post-to-cmr-task.tf b/tf-modules/ingest/post-to-cmr-task.tf index 3ef5bf0d963..de76b804239 100644 --- a/tf-modules/ingest/post-to-cmr-task.tf +++ b/tf-modules/ingest/post-to-cmr-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "post_to_cmr_task" { + depends_on = [aws_cloudwatch_log_group.post_to_cmr_task] function_name = "${var.prefix}-PostToCmr" filename = "${path.module}/../../tasks/post-to-cmr/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/post-to-cmr/dist/lambda.zip") @@ -34,7 +35,7 @@ resource "aws_lambda_function" "post_to_cmr_task" { } resource "aws_cloudwatch_log_group" "post_to_cmr_task" { - name = "/aws/lambda/${aws_lambda_function.post_to_cmr_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_post_to_cmr_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-PostToCmr" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "PostToCmr", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/queue-pdrs-task.tf b/tf-modules/ingest/queue-pdrs-task.tf index c0efc3696f9..c3ea7d33bad 100644 --- a/tf-modules/ingest/queue-pdrs-task.tf +++ b/tf-modules/ingest/queue-pdrs-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "queue_pdrs_task" { + depends_on = [aws_cloudwatch_log_group.queue_pdrs_task] function_name = "${var.prefix}-QueuePdrs" filename = "${path.module}/../../tasks/queue-pdrs/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/queue-pdrs/dist/lambda.zip") @@ -31,7 +32,7 @@ resource "aws_lambda_function" "queue_pdrs_task" { } resource "aws_cloudwatch_log_group" "queue_pdrs_task" { - name = "/aws/lambda/${aws_lambda_function.queue_pdrs_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_queue_pdrs_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-QueuePdrs" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "QueuePdrs", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/queue-workflow-task.tf b/tf-modules/ingest/queue-workflow-task.tf index 9f4c65c96dc..155b56db588 100644 --- a/tf-modules/ingest/queue-workflow-task.tf +++ b/tf-modules/ingest/queue-workflow-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "queue_workflow_task" { + depends_on = [aws_cloudwatch_log_group.queue_workflow_task] function_name = "${var.prefix}-QueueWorkflow" filename = "${path.module}/../../tasks/queue-workflow/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/queue-workflow/dist/lambda.zip") @@ -31,7 +32,7 @@ resource "aws_lambda_function" "queue_workflow_task" { } resource "aws_cloudwatch_log_group" "queue_workflow_task" { - name = "/aws/lambda/${aws_lambda_function.queue_workflow_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_queue_workflow_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-QueueWorkflow" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "QueueWorkflow", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/sync-granule-task.tf b/tf-modules/ingest/sync-granule-task.tf index d688ef4a0e9..60d9bfac967 100644 --- a/tf-modules/ingest/sync-granule-task.tf +++ b/tf-modules/ingest/sync-granule-task.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "sync_granule_task" { + depends_on = [aws_cloudwatch_log_group.sync_granule_task] function_name = "${var.prefix}-SyncGranule" filename = "${path.module}/../../tasks/sync-granule/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/sync-granule/dist/lambda.zip") @@ -32,7 +33,7 @@ resource "aws_lambda_function" "sync_granule_task" { } resource "aws_cloudwatch_log_group" "sync_granule_task" { - name = "/aws/lambda/${aws_lambda_function.sync_granule_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_sync_granule_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-SyncGranule" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "SyncGranule", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/update-cmr-access-constraints.tf b/tf-modules/ingest/update-cmr-access-constraints.tf index 1e7c5dfda36..0a86e6c801c 100644 --- a/tf-modules/ingest/update-cmr-access-constraints.tf +++ b/tf-modules/ingest/update-cmr-access-constraints.tf @@ -1,4 +1,5 @@ resource "aws_lambda_function" "update_cmr_access_constraints_task" { + depends_on = [aws_cloudwatch_log_group.update_cmr_access_constraints_task] function_name = "${var.prefix}-UpdateCmrAccessConstraints" filename = "${path.module}/../../tasks/update-cmr-access-constraints/dist/lambda.zip" source_code_hash = filebase64sha256("${path.module}/../../tasks/update-cmr-access-constraints/dist/lambda.zip") @@ -30,7 +31,7 @@ resource "aws_lambda_function" "update_cmr_access_constraints_task" { } resource "aws_cloudwatch_log_group" "update_cmr_access_constraints_task" { - name = "/aws/lambda/${aws_lambda_function.update_cmr_access_constraints_task.function_name}" - retention_in_days = lookup(var.cloudwatch_log_retention_periods, "ingest_update_cmr_access_constraints_task_log_retention", var.default_log_retention_days) + name = "/aws/lambda/${var.prefix}-UpdateCmrAccessConstraints" + retention_in_days = lookup(var.cloudwatch_log_retention_periods, "UpdateCmrAccessConstraints", var.default_log_retention_days) tags = var.tags } diff --git a/tf-modules/ingest/variables.tf b/tf-modules/ingest/variables.tf index 1f888b7f9ac..9ca37e8afb8 100644 --- a/tf-modules/ingest/variables.tf +++ b/tf-modules/ingest/variables.tf @@ -4,12 +4,6 @@ variable "buckets" { default = {} } -variable "cloudwatch_log_retention_periods"{ - type = map(number) - description = "number of days logs will be retained for the respective cloudwatch log group, in the form of __log_retention" - default = {} -} - variable "cmr_oauth_provider" { type = string } @@ -64,12 +58,6 @@ variable "custom_queues" { default = [] } -variable "default_log_retention_days" { - type = number - default = 30 - description = "default value that user chooses for their log retention periods" -} - variable "default_s3_multipart_chunksize_mb" { description = "default S3 multipart upload chunk size in MB" type = number @@ -185,3 +173,15 @@ variable "vpc_id" { type = string default = null } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "Optional retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = {} +} + +variable "default_log_retention_days" { + type = number + default = 30 + description = "Optional default value that user chooses for their log retention periods" +} diff --git a/tf-modules/internal/cumulus-test-cleanup/package.json b/tf-modules/internal/cumulus-test-cleanup/package.json index 270bd070275..afc346a5d90 100644 --- a/tf-modules/internal/cumulus-test-cleanup/package.json +++ b/tf-modules/internal/cumulus-test-cleanup/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/cumulus-test-cleanup", - "version": "15.0.1", + "version": "15.0.2", "description": "Nightly cron job for cleaning up integration test artifacts", "main": "index.js", "engines": { diff --git a/tf-modules/s3-replicator/package.json b/tf-modules/s3-replicator/package.json index 649e3c97758..d99d6415df4 100644 --- a/tf-modules/s3-replicator/package.json +++ b/tf-modules/s3-replicator/package.json @@ -1,6 +1,6 @@ { "name": "@cumulus/s3-replicator", - "version": "15.0.1", + "version": "15.0.2", "description": "Replicate S3 Events to alternate bucket. Solves same-region replication.", "main": "index.js", "engines": { diff --git a/tf-modules/tea-map-cache/variables.tf b/tf-modules/tea-map-cache/variables.tf index 727dfe6a888..f9dffe3c562 100644 --- a/tf-modules/tea-map-cache/variables.tf +++ b/tf-modules/tea-map-cache/variables.tf @@ -31,3 +31,15 @@ variable "deploy_to_ngap" { description = "Whether or not this instance of Cumulus is deployed to an NGAP environment" type = bool } + +variable "cloudwatch_log_retention_periods" { + type = map(number) + description = "Optional retention periods for the respective cloudwatch log group, these values will be used instead of default retention days" + default = {} +} + +variable "default_log_retention_days" { + type = number + default = 30 + description = "Optional default value that user chooses for their log retention periods" +}