Skip to content

Commit

Permalink
Release 12.0.2 (#3076)
Browse files Browse the repository at this point in the history
* CUMULUS-3019: Fix file deletion bug (#3074)

* WIP

* update test and fix bug where incorrect files are deleted

* Update CHANGELOG.md

* Update packages/api/tests/lib/writeRecords/test-write-granules.js

Co-authored-by: Jonathan Kovarik <[email protected]>

* Update unit test to check file existence earlier

* remove trailing space

Co-authored-by: Jonathan Kovarik <[email protected]>

* Update changelog and update package versions

* Remove doc update to version 12.0.2

Co-authored-by: Nate Pauzenga <[email protected]>
Co-authored-by: Jonathan Kovarik <[email protected]>
  • Loading branch information
3 people authored Aug 11, 2022
1 parent 9d038d8 commit a35accb
Show file tree
Hide file tree
Showing 73 changed files with 401 additions and 357 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## Unreleased

## [v12.0.2] 2022-08-10 [BACKPORT]

### Notable Changes

- **CUMULUS-3019**
- Fix file write logic to delete files by `granule_cumulus_id` instead of
`cumulus_id`. Previous logic removed files by matching `file.cumulus_id`
to `granule.cumulus_id`.

## [v12.0.1] 2022-07-18

- **CUMULUS-2995**
Expand Down Expand Up @@ -5923,7 +5932,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/v12.0.1...HEAD
[unreleased]: https://github.com/nasa/cumulus/compare/v12.0.2...HEAD
[v12.0.2]: https://github.com/nasa/cumulus/compare/v12.0.1...v12.0.2
[v12.0.1]: https://github.com/nasa/cumulus/compare/v12.0.0...v12.0.1
[v12.0.0]: https://github.com/nasa/cumulus/compare/v11.1.0...v12.0.0
[v11.1.1]: https://github.com/nasa/cumulus/compare/v11.1.0...v11.1.1
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/asyncOperations/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-async-operations",
"version": "12.0.1",
"version": "12.0.2",
"description": "AsyncOperations Test Lambda",
"main": "index.js",
"private": true,
Expand Down
14 changes: 7 additions & 7 deletions example/lambdas/ftpPopulateTestLambda/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/ftp-populate-test-lambda",
"version": "12.0.1",
"version": "12.0.2",
"description": "FTP Population Utility Lambda",
"main": "index.js",
"private": true,
Expand All @@ -19,12 +19,12 @@
"access": "private"
},
"dependencies": {
"@cumulus/api": "12.0.1",
"@cumulus/api-client": "12.0.1",
"@cumulus/common": "12.0.1",
"@cumulus/integration-tests": "12.0.1",
"@cumulus/logger": "12.0.1",
"@cumulus/test-data": "12.0.1",
"@cumulus/api": "12.0.2",
"@cumulus/api-client": "12.0.2",
"@cumulus/common": "12.0.2",
"@cumulus/integration-tests": "12.0.2",
"@cumulus/logger": "12.0.2",
"@cumulus/test-data": "12.0.2",
"aws-sdk": "^2.585.0",
"fs-extra": "^9.0.0",
"js-yaml": "^3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/python-processing/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/python-process-activity",
"private": true,
"version": "12.0.1",
"version": "12.0.2",
"description": "Python reference activity",
"homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/python-reference-activity/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/python-reference-activity",
"private": true,
"version": "12.0.1",
"version": "12.0.2",
"description": "Python reference activity",
"homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/python-reference-task/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/python-reference-task",
"private": true,
"version": "12.0.1",
"version": "12.0.2",
"description": "Python reference task",
"main": "index.js",
"homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-task",
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/s3AccessTest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-s3-access",
"version": "12.0.1",
"version": "12.0.2",
"description": "S3 Access Test Lambda",
"main": "index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/snsS3Test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-sns-s3",
"version": "12.0.1",
"version": "12.0.2",
"description": "SNS to S3 Test Lambda",
"main": "index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/versionUpTest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-version-up",
"version": "12.0.1",
"version": "12.0.2",
"description": "Version Up Test Lambda",
"main": "index.js",
"private": true,
Expand Down
52 changes: 26 additions & 26 deletions example/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/cumulus-integration-tests",
"version": "12.0.1",
"version": "12.0.2",
"description": "Cumulus Integration Test Deployment",
"private": true,
"main": "index.js",
Expand Down Expand Up @@ -45,32 +45,32 @@
]
},
"dependencies": {
"@cumulus/api": "12.0.1",
"@cumulus/api-client": "12.0.1",
"@cumulus/async-operations": "12.0.1",
"@cumulus/aws-client": "12.0.1",
"@cumulus/checksum": "12.0.1",
"@cumulus/cmr-client": "12.0.1",
"@cumulus/cmrjs": "12.0.1",
"@cumulus/common": "12.0.1",
"@cumulus/discover-granules": "12.0.1",
"@cumulus/discover-pdrs": "12.0.1",
"@cumulus/files-to-granules": "12.0.1",
"@cumulus/hello-world": "12.0.1",
"@cumulus/ingest": "12.0.1",
"@cumulus/integration-tests": "12.0.1",
"@cumulus/message": "12.0.1",
"@cumulus/move-granules": "12.0.1",
"@cumulus/parse-pdr": "12.0.1",
"@cumulus/pdr-status-check": "12.0.1",
"@cumulus/post-to-cmr": "12.0.1",
"@cumulus/queue-granules": "12.0.1",
"@cumulus/queue-pdrs": "12.0.1",
"@cumulus/sf-sqs-report": "12.0.1",
"@cumulus/sync-granule": "12.0.1",
"@cumulus/test-processing": "12.0.1"
"@cumulus/api": "12.0.2",
"@cumulus/api-client": "12.0.2",
"@cumulus/async-operations": "12.0.2",
"@cumulus/aws-client": "12.0.2",
"@cumulus/checksum": "12.0.2",
"@cumulus/cmr-client": "12.0.2",
"@cumulus/cmrjs": "12.0.2",
"@cumulus/common": "12.0.2",
"@cumulus/discover-granules": "12.0.2",
"@cumulus/discover-pdrs": "12.0.2",
"@cumulus/files-to-granules": "12.0.2",
"@cumulus/hello-world": "12.0.2",
"@cumulus/ingest": "12.0.2",
"@cumulus/integration-tests": "12.0.2",
"@cumulus/message": "12.0.2",
"@cumulus/move-granules": "12.0.2",
"@cumulus/parse-pdr": "12.0.2",
"@cumulus/pdr-status-check": "12.0.2",
"@cumulus/post-to-cmr": "12.0.2",
"@cumulus/queue-granules": "12.0.2",
"@cumulus/queue-pdrs": "12.0.2",
"@cumulus/sf-sqs-report": "12.0.2",
"@cumulus/sync-granule": "12.0.2",
"@cumulus/test-processing": "12.0.2"
},
"devDependencies": {
"@cumulus/test-data": "12.0.1"
"@cumulus/test-data": "12.0.2"
}
}
6 changes: 3 additions & 3 deletions example/scripts/generate_ingest/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/generate_ingest",
"private": true,
"version": "12.0.1",
"version": "12.0.2",
"description": "Script to generate test data for scaled ingest",
"keywords": [
"GIBS",
Expand All @@ -22,8 +22,8 @@
"directory": "packages/types"
},
"dependencies": {
"@cumulus/aws-client": "12.0.1",
"@cumulus/common": "12.0.1"
"@cumulus/aws-client": "12.0.2",
"@cumulus/common": "12.0.2"
},
"author": "Cumulus Authors",
"license": "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion example/scripts/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/example-lib",
"private": true,
"version": "12.0.1",
"version": "12.0.2",
"description": "example project libs",
"homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib",
"engines": {
Expand Down
18 changes: 9 additions & 9 deletions lambdas/data-migration1/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/data-migration1",
"version": "12.0.1",
"version": "12.0.2",
"description": "A Lambda function used for doing data migrations",
"license": "Apache-2.0",
"engines": {
Expand All @@ -25,18 +25,18 @@
"timeout": "15m"
},
"dependencies": {
"@cumulus/api": "12.0.1",
"@cumulus/aws-client": "12.0.1",
"@cumulus/common": "12.0.1",
"@cumulus/db": "12.0.1",
"@cumulus/errors": "12.0.1",
"@cumulus/logger": "12.0.1",
"@cumulus/types": "12.0.1",
"@cumulus/api": "12.0.2",
"@cumulus/aws-client": "12.0.2",
"@cumulus/common": "12.0.2",
"@cumulus/db": "12.0.2",
"@cumulus/errors": "12.0.2",
"@cumulus/logger": "12.0.2",
"@cumulus/types": "12.0.2",
"knex": "0.95.15",
"lodash": "^4.17.21",
"pg": "^8.3.0"
},
"devDependencies": {
"@cumulus/test-data": "12.0.1"
"@cumulus/test-data": "12.0.2"
}
}
20 changes: 10 additions & 10 deletions lambdas/data-migration2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/data-migration2",
"version": "12.0.1",
"version": "12.0.2",
"description": "A Lambda function used for doing data migrations intended to be executed after data-migration1.",
"license": "Apache-2.0",
"engines": {
Expand Down Expand Up @@ -28,21 +28,21 @@
"@aws-sdk/client-dynamodb": "^3.53.0",
"@aws-sdk/lib-dynamodb": "^3.53.0",
"@aws-sdk/util-dynamodb": "^3.53.0",
"@cumulus/api": "12.0.1",
"@cumulus/aws-client": "12.0.1",
"@cumulus/common": "12.0.1",
"@cumulus/db": "12.0.1",
"@cumulus/errors": "12.0.1",
"@cumulus/logger": "12.0.1",
"@cumulus/message": "12.0.1",
"@cumulus/types": "12.0.1",
"@cumulus/api": "12.0.2",
"@cumulus/aws-client": "12.0.2",
"@cumulus/common": "12.0.2",
"@cumulus/db": "12.0.2",
"@cumulus/errors": "12.0.2",
"@cumulus/logger": "12.0.2",
"@cumulus/message": "12.0.2",
"@cumulus/types": "12.0.2",
"JSONStream": "1.3.5",
"knex": "0.95.15",
"lodash": "^4.17.21",
"p-map": "^4.0.0",
"pg": "^8.3.0"
},
"devDependencies": {
"@cumulus/test-data": "12.0.1"
"@cumulus/test-data": "12.0.2"
}
}
4 changes: 2 additions & 2 deletions lambdas/db-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/db-migration-lambda",
"version": "12.0.1",
"version": "12.0.2",
"description": "A Lambda function used for deploying DB migrations",
"license": "Apache-2.0",
"engines": {
Expand All @@ -20,7 +20,7 @@
"tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles"
},
"dependencies": {
"@cumulus/db": "12.0.1",
"@cumulus/db": "12.0.2",
"knex": "0.95.15",
"pg": "^8.3.0"
}
Expand Down
6 changes: 3 additions & 3 deletions lambdas/db-provision-user-database/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/db-provision-user-database-lambda",
"version": "12.0.1",
"version": "12.0.2",
"description": "A Lambda function used for provisioning user databases",
"engines": {
"node": ">=14.19.1"
Expand All @@ -24,8 +24,8 @@
"timeout": "2m"
},
"dependencies": {
"@cumulus/common": "12.0.1",
"@cumulus/db": "12.0.1",
"@cumulus/common": "12.0.2",
"@cumulus/db": "12.0.2",
"knex": "0.95.15",
"pg": "^8.3.0"
},
Expand Down
12 changes: 6 additions & 6 deletions lambdas/postgres-migration-async-operation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/postgres-migration-async-operation",
"version": "12.0.1",
"version": "12.0.2",
"description": "A Lambda function used to start an ECS task to run data-migrations2 lambda",
"license": "Apache-2.0",
"engines": {
Expand Down Expand Up @@ -28,12 +28,12 @@
"timeout": "15m"
},
"dependencies": {
"@cumulus/api": "12.0.1",
"@cumulus/async-operations": "12.0.1",
"@cumulus/logger": "12.0.1",
"@cumulus/types": "12.0.1"
"@cumulus/api": "12.0.2",
"@cumulus/async-operations": "12.0.2",
"@cumulus/logger": "12.0.2",
"@cumulus/types": "12.0.2"
},
"devDependencies": {
"@cumulus/test-data": "12.0.1"
"@cumulus/test-data": "12.0.2"
}
}
14 changes: 7 additions & 7 deletions lambdas/postgres-migration-count-tool/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/postgres-reconcile",
"version": "12.0.1",
"version": "12.0.2",
"description": "A Lambda function used for generating counts between Dynamo/ES and Postgres",
"license": "Apache-2.0",
"engines": {
Expand All @@ -21,12 +21,12 @@
"tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles"
},
"dependencies": {
"@cumulus/api": "12.0.1",
"@cumulus/api-client": "12.0.1",
"@cumulus/common": "12.0.1",
"@cumulus/db": "12.0.1",
"@cumulus/message": "12.0.1",
"@cumulus/types": "12.0.1",
"@cumulus/api": "12.0.2",
"@cumulus/api-client": "12.0.2",
"@cumulus/common": "12.0.2",
"@cumulus/db": "12.0.2",
"@cumulus/message": "12.0.2",
"@cumulus/types": "12.0.2",
"knex": "0.95.15",
"p-map": "^4.0.0",
"pg": "^8.3.0"
Expand Down
10 changes: 5 additions & 5 deletions lambdas/sqs-message-remover/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/sqs-message-remover-lambda",
"version": "12.0.1",
"version": "12.0.2",
"description": "Remove processed messages from SQS queues",
"main": "src/index.js",
"private": true,
Expand Down Expand Up @@ -36,10 +36,10 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "12.0.1",
"@cumulus/common": "12.0.1",
"@cumulus/ingest": "12.0.1",
"@cumulus/logger": "12.0.1",
"@cumulus/aws-client": "12.0.2",
"@cumulus/common": "12.0.2",
"@cumulus/ingest": "12.0.2",
"@cumulus/logger": "12.0.2",
"lodash": "^4.17.21"
}
}
Loading

0 comments on commit a35accb

Please sign in to comment.