Skip to content

Commit

Permalink
Release 13.3.x with master (#3121)
Browse files Browse the repository at this point in the history
* Release 13.3.1 (#3106)

* merge CUMULUS-2557

* merge CUMULUS-2971

* CUMULUS-3021: Support Collections with a collection.version containing slashes (#3096)

* Support Collections with a collection.version containing slashes

* merge CUMULUS-3021

* merge CUMULUS-3024

* bump version to 13.3.1

* update documentation

* update changelog

* remove duplicate api user

* Sort results in unit test before comparison

Co-authored-by: Charles Huang <charleshuang80@users.noreply.github.com>
Co-authored-by: jennyhliu <34660846+jennyhliu@users.noreply.github.com>
Co-authored-by: Jonathan Kovarik <kovarik@nsidc.org>

* CUMULUS-3027 -- Tightly constrain typescript version due to knex typing (#3095)

* Tightly constrain typescript verseion due to knex typing

Unpinned dependency resulted in typescript 4.8 being installed,
however knex (all versions) has an outstanding bug:
knex/knex#5279

* Add CHANGELOG 🔔

* Update generate-ts-build-cache to always 'npm install'

* Update CHANGELOG

* Release 13.3.2 (#3117)

* Update CNM lambdas to utilize newer releases (#3094)

* 13.3.2 version bump

* update changelog

Co-authored-by: Jonathan Kovarik <kovarik@nsidc.org>

* update changelog

* re-add comma

Co-authored-by: Charles Huang <charleshuang80@users.noreply.github.com>
Co-authored-by: jennyhliu <34660846+jennyhliu@users.noreply.github.com>
Co-authored-by: Jonathan Kovarik <kovarik@nsidc.org>
  • Loading branch information
4 people committed Oct 18, 2022
1 parent 27616bc commit 65204e3
Show file tree
Hide file tree
Showing 72 changed files with 373 additions and 370 deletions.
43 changes: 21 additions & 22 deletions CHANGELOG.md
Expand Up @@ -14,7 +14,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- files_to_granules_task_timeout and files_to_granule_task_memory_size
- hello_world_task_timeout and hello_world_task_memory_size
- sf_sqs_report_task_timeout and sf_sqs_report_task_memory_size

- **CUMULUS-2986**
- Adds Terraform memory_size configurations to lambda functions with customizable timeouts enabled (the minimum default size has also been raised from 256 MB to 512 MB)
allowed properties include:
Expand All @@ -34,7 +33,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- update_cmr_access_constraints_task_memory_size
- update_granules_cmr_task_memory_size
- Initializes the lambda_memory_size(s) variable in the Terraform variable list

- **CUMULUS-2631**
- Added 'Bearer token' support to s3credentials endpoint
- **CUMULUS-2787**
Expand All @@ -43,19 +41,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
### Changed

- Updated `example/cumulus-tf/variables.tf` to have `cmr_oauth_provider` default to `launchpad`

- **CUMULUS-3024**
- Update PUT /granules endpoint to operate consistently across datastores
(PostgreSQL, ElasticSearch, DynamoDB). Previously it was possible, given a
partial Granule payload to have different data in Dynamo/ElasticSearch and PostgreSQL
- Given a partial Granule object, the /granules update endpoint now operates
with behavior more consistent with a PATCH operation where fields not provided
in the payload will not be updated in the datastores.
- Granule translation (db/src/granules.ts) now supports removing null/undefined fields when converting from API to Postgres
granule formats.
- Update granule write logic: if a `null` files key is provided in an update payload (e.g. `files: null`),
an error will be thrown. `null` files were not previously supported and would throw potentially unclear errors. This makes the error clearer and more explicit.
- Update granule write logic: If an empty array is provided for the `files` key, all files will be removed in all datastores
- **CUMULUS-2787**
- Updated `lzards-backup-task` to send Cumulus provider and granule createdAt values as metadata in LZARDS backup request to support querying LZARDS for reconciliation reports
- **CUMULUS-2913**
Expand All @@ -69,22 +54,35 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
discussed in https://github.com/knex/knex/pull/5279
- Update generate-ts-build-cache script to always install root project dependencies

## [v13.3.2] 2022-10-10 [BACKPORT]

**Please note** changes in 13.3.2 may not yet be released in future versions, as
this is a backport and patch release on the 13.3.x series of releases. Updates that
are included in the future will have a corresponding CHANGELOG entry in future
releases.

### Fixed

- **CUMULUS-2557**
- Updated `@cumulus/aws-client/S3/moveObject` to handle zero byte files (0 byte files).
- **CUMULUS-2969**
- Updated `@cumulus/api/models/rules.buildPayload` to only include
stepFunction name and arn in for the `definition` return value, excluding
step function definition and other extraneous step function object
key/values that are not used downstream, but were causing rules to exceed internal AWS limits.
- **CUMULUS-2971**
- Updated `@cumulus/aws-client/S3ObjectStore` class to take string query parameters and
its methods `signGetObject` and `signHeadObject` to take parameter presignOptions

- **CUMULUS-3021**
- Updated `@cumulus/api-client/collections` and `@cumulus/integration-tests/api` to encode
collection version in the URI path
- **CUMULUS-3024**
- Update PUT /granules endpoint to operate consistently across datastores
(PostgreSQL, ElasticSearch, DynamoDB). Previously it was possible, given a
partial Granule payload to have different data in Dynamo/ElasticSearch and PostgreSQL
- Given a partial Granule object, the /granules update endpoint now operates
with behavior more consistent with a PATCH operation where fields not provided
in the payload will not be updated in the datastores.
- Granule translation (db/src/granules.ts) now supports removing null/undefined fields when converting from API to Postgres
granule formats.
- Update granule write logic: if a `null` files key is provided in an update payload (e.g. `files: null`),
an error will be thrown. `null` files were not previously supported and would throw potentially unclear errors. This makes the error clearer and more explicit.
- Update granule write logic: If an empty array is provided for the `files` key, all files will be removed in all datastores

## [v13.3.0] 2022-8-19

Expand Down Expand Up @@ -6561,7 +6559,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/v13.3.0...HEAD
[unreleased]: https://github.com/nasa/cumulus/compare/v13.3.2...HEAD
[v13.3.2]: https://github.com/nasa/cumulus/compare/v13.3.0...v13.3.2
[v13.3.0]: https://github.com/nasa/cumulus/compare/v13.2.1...v13.3.0
[v13.2.1]: https://github.com/nasa/cumulus/compare/v13.2.0...v13.2.1
[v13.2.0]: https://github.com/nasa/cumulus/compare/v13.1.0...v13.2.0
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/asyncOperations/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-async-operations",
"version": "13.3.0",
"version": "13.3.2",
"description": "AsyncOperations Test Lambda",
"main": "index.js",
"private": true,
Expand Down
14 changes: 7 additions & 7 deletions example/lambdas/ftpPopulateTestLambda/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/ftp-populate-test-lambda",
"version": "13.3.0",
"version": "13.3.2",
"description": "FTP Population Utility Lambda",
"main": "index.js",
"private": true,
Expand All @@ -19,12 +19,12 @@
"access": "private"
},
"dependencies": {
"@cumulus/api": "13.3.0",
"@cumulus/api-client": "13.3.0",
"@cumulus/common": "13.3.0",
"@cumulus/integration-tests": "13.3.0",
"@cumulus/logger": "13.3.0",
"@cumulus/test-data": "13.3.0",
"@cumulus/api": "13.3.2",
"@cumulus/api-client": "13.3.2",
"@cumulus/common": "13.3.2",
"@cumulus/integration-tests": "13.3.2",
"@cumulus/logger": "13.3.2",
"@cumulus/test-data": "13.3.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
@@ -1,7 +1,7 @@
{
"name": "@cumulus/python-process-activity",
"private": true,
"version": "13.3.0",
"version": "13.3.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
@@ -1,7 +1,7 @@
{
"name": "@cumulus/python-reference-activity",
"private": true,
"version": "13.3.0",
"version": "13.3.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
@@ -1,7 +1,7 @@
{
"name": "@cumulus/python-reference-task",
"private": true,
"version": "13.3.0",
"version": "13.3.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
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-s3-access",
"version": "13.3.0",
"version": "13.3.2",
"description": "S3 Access Test Lambda",
"main": "index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion example/lambdas/snsS3Test/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-sns-s3",
"version": "13.3.0",
"version": "13.3.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
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-version-up",
"version": "13.3.0",
"version": "13.3.2",
"description": "Version Up Test Lambda",
"main": "index.js",
"private": true,
Expand Down
52 changes: 26 additions & 26 deletions example/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/cumulus-integration-tests",
"version": "13.3.0",
"version": "13.3.2",
"description": "Cumulus Integration Test Deployment",
"private": true,
"main": "index.js",
Expand Down Expand Up @@ -45,32 +45,32 @@
]
},
"dependencies": {
"@cumulus/api": "13.3.0",
"@cumulus/api-client": "13.3.0",
"@cumulus/async-operations": "13.3.0",
"@cumulus/aws-client": "13.3.0",
"@cumulus/checksum": "13.3.0",
"@cumulus/cmr-client": "13.3.0",
"@cumulus/cmrjs": "13.3.0",
"@cumulus/common": "13.3.0",
"@cumulus/discover-granules": "13.3.0",
"@cumulus/discover-pdrs": "13.3.0",
"@cumulus/files-to-granules": "13.3.0",
"@cumulus/hello-world": "13.3.0",
"@cumulus/ingest": "13.3.0",
"@cumulus/integration-tests": "13.3.0",
"@cumulus/message": "13.3.0",
"@cumulus/move-granules": "13.3.0",
"@cumulus/parse-pdr": "13.3.0",
"@cumulus/pdr-status-check": "13.3.0",
"@cumulus/post-to-cmr": "13.3.0",
"@cumulus/queue-granules": "13.3.0",
"@cumulus/queue-pdrs": "13.3.0",
"@cumulus/sf-sqs-report": "13.3.0",
"@cumulus/sync-granule": "13.3.0",
"@cumulus/test-processing": "13.3.0"
"@cumulus/api": "13.3.2",
"@cumulus/api-client": "13.3.2",
"@cumulus/async-operations": "13.3.2",
"@cumulus/aws-client": "13.3.2",
"@cumulus/checksum": "13.3.2",
"@cumulus/cmr-client": "13.3.2",
"@cumulus/cmrjs": "13.3.2",
"@cumulus/common": "13.3.2",
"@cumulus/discover-granules": "13.3.2",
"@cumulus/discover-pdrs": "13.3.2",
"@cumulus/files-to-granules": "13.3.2",
"@cumulus/hello-world": "13.3.2",
"@cumulus/ingest": "13.3.2",
"@cumulus/integration-tests": "13.3.2",
"@cumulus/message": "13.3.2",
"@cumulus/move-granules": "13.3.2",
"@cumulus/parse-pdr": "13.3.2",
"@cumulus/pdr-status-check": "13.3.2",
"@cumulus/post-to-cmr": "13.3.2",
"@cumulus/queue-granules": "13.3.2",
"@cumulus/queue-pdrs": "13.3.2",
"@cumulus/sf-sqs-report": "13.3.2",
"@cumulus/sync-granule": "13.3.2",
"@cumulus/test-processing": "13.3.2"
},
"devDependencies": {
"@cumulus/test-data": "13.3.0"
"@cumulus/test-data": "13.3.2"
}
}
6 changes: 3 additions & 3 deletions example/scripts/generate_ingest/package.json
@@ -1,7 +1,7 @@
{
"name": "@cumulus/generate_ingest",
"private": true,
"version": "13.3.0",
"version": "13.3.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": "13.3.0",
"@cumulus/common": "13.3.0"
"@cumulus/aws-client": "13.3.2",
"@cumulus/common": "13.3.2"
},
"author": "Cumulus Authors",
"license": "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion example/scripts/lib/package.json
@@ -1,7 +1,7 @@
{
"name": "@cumulus/example-lib",
"private": true,
"version": "13.3.0",
"version": "13.3.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
@@ -1,6 +1,6 @@
{
"name": "@cumulus/data-migration1",
"version": "13.3.0",
"version": "13.3.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": "13.3.0",
"@cumulus/aws-client": "13.3.0",
"@cumulus/common": "13.3.0",
"@cumulus/db": "13.3.0",
"@cumulus/errors": "13.3.0",
"@cumulus/logger": "13.3.0",
"@cumulus/types": "13.3.0",
"@cumulus/api": "13.3.2",
"@cumulus/aws-client": "13.3.2",
"@cumulus/common": "13.3.2",
"@cumulus/db": "13.3.2",
"@cumulus/errors": "13.3.2",
"@cumulus/logger": "13.3.2",
"@cumulus/types": "13.3.2",
"knex": "0.95.15",
"lodash": "^4.17.21",
"pg": "^8.3.0"
},
"devDependencies": {
"@cumulus/test-data": "13.3.0"
"@cumulus/test-data": "13.3.2"
}
}
20 changes: 10 additions & 10 deletions lambdas/data-migration2/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/data-migration2",
"version": "13.3.0",
"version": "13.3.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.58.0",
"@aws-sdk/lib-dynamodb": "^3.58.0",
"@aws-sdk/util-dynamodb": "^3.58.0",
"@cumulus/api": "13.3.0",
"@cumulus/aws-client": "13.3.0",
"@cumulus/common": "13.3.0",
"@cumulus/db": "13.3.0",
"@cumulus/errors": "13.3.0",
"@cumulus/logger": "13.3.0",
"@cumulus/message": "13.3.0",
"@cumulus/types": "13.3.0",
"@cumulus/api": "13.3.2",
"@cumulus/aws-client": "13.3.2",
"@cumulus/common": "13.3.2",
"@cumulus/db": "13.3.2",
"@cumulus/errors": "13.3.2",
"@cumulus/logger": "13.3.2",
"@cumulus/message": "13.3.2",
"@cumulus/types": "13.3.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": "13.3.0"
"@cumulus/test-data": "13.3.2"
}
}
4 changes: 2 additions & 2 deletions lambdas/db-migration/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/db-migration-lambda",
"version": "13.3.0",
"version": "13.3.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": "13.3.0",
"@cumulus/db": "13.3.2",
"knex": "0.95.15",
"pg": "^8.3.0"
}
Expand Down
6 changes: 3 additions & 3 deletions lambdas/db-provision-user-database/package.json
@@ -1,6 +1,6 @@
{
"name": "@cumulus/db-provision-user-database-lambda",
"version": "13.3.0",
"version": "13.3.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": "13.3.0",
"@cumulus/db": "13.3.0",
"@cumulus/common": "13.3.2",
"@cumulus/db": "13.3.2",
"knex": "0.95.15",
"pg": "^8.3.0"
},
Expand Down

0 comments on commit 65204e3

Please sign in to comment.