Skip to content

Commit

Permalink
Merge pull request #1786 from nasa/release-2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jkovarik authored Jul 23, 2020
2 parents b4ac3c4 + 61019c0 commit 404fd95
Show file tree
Hide file tree
Showing 69 changed files with 2,083 additions and 291 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [v2.0.0] 2020-07-23

### BREAKING CHANGES

- Changes to the `@cumulus/cumulus-api` package
- The `CumulusApiClientError` class must now be imported using
`const { CumulusApiClientError } = require('@cumulus/cumulus-api/CumulusApiClientError')`
Expand Down Expand Up @@ -3196,7 +3199,9 @@ 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/v1.23.2...HEAD
[unreleased]: https://github.com/nasa/cumulus/compare/v2.0.0...HEAD
[v2.0.0]: https://github.com/nasa/cumulus/compare/v1.24.0...v2.0.0
[v1.24.0]: https://github.com/nasa/cumulus/compare/v1.23.2...v1.24.0
[v1.23.2]: https://github.com/nasa/cumulus/compare/v1.22.1...v1.23.2
[v1.22.1]: https://github.com/nasa/cumulus/compare/v1.21.0...v1.22.1
[v1.21.0]: https://github.com/nasa/cumulus/compare/v1.20.0...v1.21.0
Expand Down
6 changes: 5 additions & 1 deletion DATA_MODEL_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v2.0.0] 2020-07-23

### Added

- **CUMULUS-2011**
Expand Down Expand Up @@ -66,7 +68,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- **CUMULUS-1687**
- All asyncOperations now include the fields `description` and `operationType`. `operationType` can be one of the following. [`Bulk Delete`, `Bulk Granules`, `ES Index`, `Kinesis Replay`]

[unreleased]: https://github.com/nasa/cumulus/compare/v1.23.2...HEAD
[unreleased]: https://github.com/nasa/cumulus/compare/v2.0.0...HEAD
[v2.0.0]: https://github.com/nasa/cumulus/compare/v1.24.0...v2.0.0
[v1.24.0]: https://github.com/nasa/cumulus/compare/v1.23.2...v1.24.0
[v1.23.2]: https://github.com/nasa/cumulus/compare/v1.22.1...v1.23.2
[v1.22.1]: https://github.com/nasa/cumulus/compare/v1.21.0...v1.22.1
[v1.21.0]: https://github.com/nasa/cumulus/compare/v1.20.0...v1.21.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ This is for installation for Cumulus development. See the [Cumulus deployment i

### Prerequisites

- [NVM](https://github.com/creationix/nvm) and node version 10.16.3
- [NVM](https://github.com/creationix/nvm) and node version 12.18
- [AWS CLI](http://docs.aws.amazon.com/cli/latest/userguide/installing.html)
- BASH
- Docker (only required for testing)
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ Please see our [troubleshooting documentation for any issues with your deploymen
Please note that the requirements are similar to the [Cumulus stack deployment requirements](deployment-readme#requirements). The installation instructions below include a step that will install/use the required node version referenced in the `.nvmrc` file in the dashboard repository.

- git
- [node 10.16.3](https://nodejs.org/en/) (use [nvm](https://github.com/creationix/nvm) to upgrade/downgrade)
- [node 12.18](https://nodejs.org/en/) (use [nvm](https://github.com/creationix/nvm) to upgrade/downgrade)
- [npm](https://www.npmjs.com/get-npm)
- zip
- AWS CLI - [AWS command line interface](https://aws.amazon.com/cli/)
Expand Down
2 changes: 1 addition & 1 deletion docs/workflows/lambda.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AWS provides great getting started guide for building Lambdas in the [developer

Cumulus currently supports the following environments for Cumulus Message Adapter enabled functions:

* [Node.js 10.16.3](https://docs.aws.amazon.com/lambda/latest/dg/programming-model.html)
* [Node.js 12.18](https://docs.aws.amazon.com/lambda/latest/dg/programming-model.html)
* [Java 8](https://docs.aws.amazon.com/lambda/latest/dg/java-programming-model.html)
* [Python 2.7, 3.6](https://docs.aws.amazon.com/lambda/latest/dg/python-programming-model.html)

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": "1.23.2",
"version": "2.0.0",
"description": "AsyncOperations Test Lambda",
"main": "index.js",
"private": true,
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": "1.23.2",
"version": "2.0.0",
"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": "1.23.2",
"version": "2.0.0",
"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": "1.23.2",
"version": "2.0.0",
"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": "1.23.2",
"version": "2.0.0",
"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": "1.23.2",
"version": "2.0.0",
"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": "1.23.2",
"version": "2.0.0",
"description": "Version Up Test Lambda",
"main": "index.js",
"private": true,
Expand Down
46 changes: 23 additions & 23 deletions example/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/cumulus-integration-tests",
"version": "1.24.0",
"version": "2.0.0",
"description": "Cumulus Integration Test Deployment",
"private": true,
"main": "index.js",
Expand Down Expand Up @@ -40,29 +40,29 @@
]
},
"dependencies": {
"@cumulus/api": "1.24.0",
"@cumulus/api-client": "1.24.0",
"@cumulus/aws-client": "1.24.0",
"@cumulus/checksum": "1.24.0",
"@cumulus/cmrjs": "1.24.0",
"@cumulus/common": "1.24.0",
"@cumulus/discover-granules": "1.24.0",
"@cumulus/discover-pdrs": "1.24.0",
"@cumulus/files-to-granules": "1.24.0",
"@cumulus/hello-world": "1.24.0",
"@cumulus/integration-tests": "1.24.0",
"@cumulus/message": "1.24.0",
"@cumulus/move-granules": "1.24.0",
"@cumulus/parse-pdr": "1.24.0",
"@cumulus/pdr-status-check": "1.24.0",
"@cumulus/post-to-cmr": "1.24.0",
"@cumulus/queue-granules": "1.24.0",
"@cumulus/queue-pdrs": "1.24.0",
"@cumulus/sf-sqs-report": "1.24.0",
"@cumulus/sync-granule": "1.24.0",
"@cumulus/test-processing": "1.24.0"
"@cumulus/api": "2.0.0",
"@cumulus/api-client": "2.0.0",
"@cumulus/aws-client": "2.0.0",
"@cumulus/checksum": "2.0.0",
"@cumulus/cmrjs": "2.0.0",
"@cumulus/common": "2.0.0",
"@cumulus/discover-granules": "2.0.0",
"@cumulus/discover-pdrs": "2.0.0",
"@cumulus/files-to-granules": "2.0.0",
"@cumulus/hello-world": "2.0.0",
"@cumulus/integration-tests": "2.0.0",
"@cumulus/message": "2.0.0",
"@cumulus/move-granules": "2.0.0",
"@cumulus/parse-pdr": "2.0.0",
"@cumulus/pdr-status-check": "2.0.0",
"@cumulus/post-to-cmr": "2.0.0",
"@cumulus/queue-granules": "2.0.0",
"@cumulus/queue-pdrs": "2.0.0",
"@cumulus/sf-sqs-report": "2.0.0",
"@cumulus/sync-granule": "2.0.0",
"@cumulus/test-processing": "2.0.0"
},
"devDependencies": {
"@cumulus/test-data": "1.24.0"
"@cumulus/test-data": "2.0.0"
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "3.20.2",
"version": "1.24.0",
"version": "2.0.0",
"packages": [
"example",
"example/lambdas/*",
Expand Down
8 changes: 4 additions & 4 deletions packages/api-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/api-client",
"version": "1.24.0",
"version": "2.0.0",
"description": "API client for working with the Cumulus archive API",
"keywords": [
"GIBS",
Expand Down Expand Up @@ -37,11 +37,11 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "1.24.0",
"@cumulus/logger": "1.24.0",
"@cumulus/aws-client": "2.0.0",
"@cumulus/logger": "2.0.0",
"p-retry": "^2.0.0"
},
"devDependencies": {
"@cumulus/types": "1.24.0-alpha.0"
"@cumulus/types": "2.0.0"
}
}
30 changes: 15 additions & 15 deletions packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/api",
"version": "1.24.1-alpha.0",
"version": "2.0.0",
"description": "Lambda functions for handling all daac's API operations",
"main": "index.js",
"engines": {
Expand Down Expand Up @@ -44,19 +44,19 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "1.24.0",
"@cumulus/cmr-client": "1.24.0",
"@cumulus/cmrjs": "1.24.0",
"@cumulus/collection-config-store": "1.24.0",
"@cumulus/common": "1.24.0",
"@cumulus/earthdata-login-client": "1.24.0-alpha.0",
"@cumulus/errors": "1.24.0",
"@cumulus/ingest": "1.24.0",
"@cumulus/launchpad-auth": "1.24.0",
"@cumulus/logger": "1.24.0",
"@cumulus/message": "1.24.0",
"@cumulus/pvl": "1.24.0",
"@cumulus/sftp-client": "1.24.0",
"@cumulus/aws-client": "2.0.0",
"@cumulus/cmr-client": "2.0.0",
"@cumulus/cmrjs": "2.0.0",
"@cumulus/collection-config-store": "2.0.0",
"@cumulus/common": "2.0.0",
"@cumulus/earthdata-login-client": "2.0.0",
"@cumulus/errors": "2.0.0",
"@cumulus/ingest": "2.0.0",
"@cumulus/launchpad-auth": "2.0.0",
"@cumulus/logger": "2.0.0",
"@cumulus/message": "2.0.0",
"@cumulus/pvl": "2.0.0",
"@cumulus/sftp-client": "2.0.0",
"@elastic/elasticsearch": "^5.6.20",
"@mapbox/dyno": "^1.4.2",
"aggregate-error": "^3.0.1",
Expand Down Expand Up @@ -97,6 +97,6 @@
"xml2js": "^0.4.22"
},
"devDependencies": {
"@cumulus/test-data": "1.24.0"
"@cumulus/test-data": "2.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/aws-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ Calculate checksum for S3 Object
<a name="module_S3.s3Join"></a>

### S3.s3Join(args) ⇒ <code>string</code>
Join strings into an S3 key without a leading slash or double slashes
Join strings into an S3 key without a leading slash

**Kind**: static method of [<code>S3</code>](#module_S3)
**Returns**: <code>string</code> - the full S3 key
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/aws-client",
"version": "1.24.0",
"version": "2.0.0",
"description": "Utilities for working with AWS",
"keywords": [
"GIBS",
Expand Down Expand Up @@ -42,9 +42,9 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/checksum": "1.24.0",
"@cumulus/errors": "1.24.0",
"@cumulus/logger": "1.24.0",
"@cumulus/checksum": "2.0.0",
"@cumulus/errors": "2.0.0",
"@cumulus/logger": "2.0.0",
"aws-sdk": "^2.585.0",
"jsonpath-plus": "^1.1.0",
"lodash": "~4.17.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/checksum/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/checksum",
"version": "1.24.0",
"version": "2.0.0",
"description": "Cumulus checksum utilities",
"engines": {
"node": ">=12.18.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/cmr-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/cmr-client",
"version": "1.24.0",
"version": "2.0.0",
"description": "A Node.js client to NASA's Common Metadata Repository (CMR) API.",
"engines": {
"node": ">=12.18.0"
Expand Down Expand Up @@ -33,8 +33,8 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "1.24.0",
"@cumulus/logger": "1.24.0",
"@cumulus/aws-client": "2.0.0",
"@cumulus/logger": "2.0.0",
"got": "^9.6.0",
"lodash": "^4.17.15",
"public-ip": "^3.0.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/cmrjs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/cmrjs",
"version": "1.24.0",
"version": "2.0.0",
"description": "A node SDK for CMR",
"engines": {
"node": ">=12.18.0"
Expand Down Expand Up @@ -32,11 +32,11 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "1.24.0",
"@cumulus/cmr-client": "1.24.0",
"@cumulus/common": "1.24.0",
"@cumulus/errors": "1.24.0",
"@cumulus/launchpad-auth": "1.24.0",
"@cumulus/aws-client": "2.0.0",
"@cumulus/cmr-client": "2.0.0",
"@cumulus/common": "2.0.0",
"@cumulus/errors": "2.0.0",
"@cumulus/launchpad-auth": "2.0.0",
"got": "^8.3.0",
"js2xmlparser": "^4.0.0",
"lodash": "^4.17.15",
Expand Down
8 changes: 4 additions & 4 deletions packages/collection-config-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/collection-config-store",
"version": "1.24.0",
"version": "2.0.0",
"description": "Utility for persisting collection configuration to S3 and retrieving it",
"keywords": [
"CUMULUS",
Expand Down Expand Up @@ -32,8 +32,8 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "1.24.0",
"@cumulus/common": "1.24.0",
"@cumulus/message": "1.24.0"
"@cumulus/aws-client": "2.0.0",
"@cumulus/common": "2.0.0",
"@cumulus/message": "2.0.0"
}
}
6 changes: 3 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/common",
"version": "1.24.0",
"version": "2.0.0",
"description": "Common utilities used across tasks",
"keywords": [
"GIBS",
Expand Down Expand Up @@ -40,8 +40,8 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/errors": "1.24.0",
"@cumulus/logger": "1.24.0",
"@cumulus/errors": "2.0.0",
"@cumulus/logger": "2.0.0",
"ajv": "^5.2.2",
"aws-sdk": "^2.585.0",
"follow-redirects": "^1.2.4",
Expand Down
1 change: 1 addition & 0 deletions packages/earthdata-login-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ Query the Earthdata Login API for the UID associated with a token
| params | <code>Object</code> | |
| params.onBehalfOf | <code>string</code> | the Earthdata Login client id of the app requesting the username |
| params.token | <code>string</code> | the Earthdata Login token |
| [params.xRequestId] | <code>string</code> | a string to help identify the request in the Earthdata Login logs |


## About Cumulus
Expand Down
Loading

0 comments on commit 404fd95

Please sign in to comment.