Skip to content

Commit

Permalink
Merge pull request #3342 from nasa/release-15.0.1
Browse files Browse the repository at this point in the history
Release 15.0.1
  • Loading branch information
jennyhliu authored Apr 20, 2023
2 parents ea822cc + ae4627c commit fb73047
Show file tree
Hide file tree
Showing 76 changed files with 382 additions and 360 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## Unreleased

## [v15.0.1] 2023-04-20

### Changed

- **CUMULUS-3279**
Expand All @@ -14,6 +16,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
`v0.5.0`
- Added audit-ci CVE override until July 1 to allow for Core package releases

## Fixed

- **CUMULUS-3285**
- Updated `api/lib/distribution.js isAuthBearTokenRequest` to handle non-Bearer authorization header

## [v15.0.0] 2023-03-10

### Breaking Changes
Expand Down Expand Up @@ -6889,7 +6896,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.0...HEAD
[unreleased]: https://github.com/nasa/cumulus/compare/v15.0.1...HEAD
[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
[v14.0.0]: https://github.com/nasa/cumulus/compare/v13.4.0...v14.0.0
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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"description": "FTP Population Utility Lambda",
"main": "index.js",
"private": true,
Expand All @@ -19,12 +19,12 @@
"access": "private"
},
"dependencies": {
"@cumulus/api": "15.0.0",
"@cumulus/api-client": "15.0.0",
"@cumulus/common": "15.0.0",
"@cumulus/integration-tests": "15.0.0",
"@cumulus/logger": "15.0.0",
"@cumulus/test-data": "15.0.0",
"@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",
"aws-sdk": "^2.585.0",
"fs-extra": "^9.0.0",
"jsftp": "https://github.com/jkovarik/jsftp.git#add_288",
Expand Down
6 changes: 3 additions & 3 deletions example/lambdas/lzardsClientTest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/test-lzards-api-lambda",
"version": "15.0.0",
"version": "15.0.1",
"description": "LZARDS API Client Test Lambda",
"private": true,
"engines": {
Expand All @@ -20,7 +20,7 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/logger": "15.0.0",
"@cumulus/lzards-api-client": "15.0.0"
"@cumulus/logger": "15.0.1",
"@cumulus/lzards-api-client": "15.0.1"
}
}
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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"version": "15.0.1",
"description": "Cumulus Integration Test Deployment",
"private": true,
"main": "index.js",
Expand Down Expand Up @@ -44,32 +44,32 @@
]
},
"dependencies": {
"@cumulus/api": "15.0.0",
"@cumulus/api-client": "15.0.0",
"@cumulus/async-operations": "15.0.0",
"@cumulus/aws-client": "15.0.0",
"@cumulus/checksum": "15.0.0",
"@cumulus/cmr-client": "15.0.0",
"@cumulus/cmrjs": "15.0.0",
"@cumulus/common": "15.0.0",
"@cumulus/discover-granules": "15.0.0",
"@cumulus/discover-pdrs": "15.0.0",
"@cumulus/files-to-granules": "15.0.0",
"@cumulus/hello-world": "15.0.0",
"@cumulus/ingest": "15.0.0",
"@cumulus/integration-tests": "15.0.0",
"@cumulus/message": "15.0.0",
"@cumulus/move-granules": "15.0.0",
"@cumulus/parse-pdr": "15.0.0",
"@cumulus/pdr-status-check": "15.0.0",
"@cumulus/post-to-cmr": "15.0.0",
"@cumulus/queue-granules": "15.0.0",
"@cumulus/queue-pdrs": "15.0.0",
"@cumulus/sf-sqs-report": "15.0.0",
"@cumulus/sync-granule": "15.0.0",
"@cumulus/test-processing": "15.0.0"
"@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"
},
"devDependencies": {
"@cumulus/test-data": "15.0.0"
"@cumulus/test-data": "15.0.1"
}
}
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": "15.0.0",
"version": "15.0.1",
"description": "Script to generate test data for scaled ingest",
"keywords": [
"GIBS",
Expand All @@ -22,8 +22,8 @@
"directory": "packages/types"
},
"dependencies": {
"@cumulus/aws-client": "15.0.0",
"@cumulus/common": "15.0.0"
"@cumulus/aws-client": "15.0.1",
"@cumulus/common": "15.0.1"
},
"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": "15.0.0",
"version": "15.0.1",
"description": "example project libs",
"homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib",
"engines": {
Expand Down
13 changes: 13 additions & 0 deletions example/spec/parallel/s3Access/teaS3CredentialsSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const { URL } = require('url');
const { STS } = require('aws-sdk');
const base64 = require('base-64');

const { models: { AccessToken } } = require('@cumulus/api');
const {
Expand Down Expand Up @@ -33,6 +34,18 @@ describe('When accessing s3credentials endpoint', () => {
});
});

describe('with basic authorization header', () => {
it('redirects to Earthdata login for requests on /s3credentials endpoint.', async () => {
const auth = base64.encode(`${process.env.EARTHDATA_USERNAME}:${process.env.EARTHDATA_PASSWORD}`);
const headers = { authorization: `Basic ${auth}` };
const response = await invokeS3CredentialsLambda('/s3credentials', headers);
const authorizeUrl = new URL(response.headers.location);
expect(authorizeUrl.origin).toEqual(process.env.EARTHDATA_BASE_URL);
expect(authorizeUrl.searchParams.get('state')).toEqual('/s3credentials');
expect(authorizeUrl.pathname).toEqual('/oauth/authorize');
});
});

describe('with token associated with an Earthdata Login ID', () => {
let accessToken;
let accessTokensModel;
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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"@cumulus/aws-client": "15.0.0",
"@cumulus/common": "15.0.0",
"@cumulus/db": "15.0.0",
"@cumulus/errors": "15.0.0",
"@cumulus/logger": "15.0.0",
"@cumulus/types": "15.0.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/types": "15.0.1",
"knex": "2.4.1",
"lodash": "^4.17.21",
"pg": "^8.3.0"
},
"devDependencies": {
"@cumulus/test-data": "15.0.0"
"@cumulus/test-data": "15.0.1"
}
}
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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"@cumulus/aws-client": "15.0.0",
"@cumulus/common": "15.0.0",
"@cumulus/db": "15.0.0",
"@cumulus/errors": "15.0.0",
"@cumulus/logger": "15.0.0",
"@cumulus/message": "15.0.0",
"@cumulus/types": "15.0.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",
"JSONStream": "1.3.5",
"knex": "2.4.1",
"lodash": "^4.17.21",
"p-map": "^4.0.0",
"pg": "^8.3.0"
},
"devDependencies": {
"@cumulus/test-data": "15.0.0"
"@cumulus/test-data": "15.0.1"
}
}
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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"@cumulus/db": "15.0.1",
"knex": "2.4.1",
"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": "15.0.0",
"version": "15.0.1",
"description": "A Lambda function used for provisioning user databases",
"engines": {
"node": ">=16.19.0"
Expand All @@ -24,8 +24,8 @@
"timeout": "2m"
},
"dependencies": {
"@cumulus/common": "15.0.0",
"@cumulus/db": "15.0.0",
"@cumulus/common": "15.0.1",
"@cumulus/db": "15.0.1",
"knex": "2.4.1",
"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": "15.0.0",
"version": "15.0.1",
"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": "15.0.0",
"@cumulus/async-operations": "15.0.0",
"@cumulus/logger": "15.0.0",
"@cumulus/types": "15.0.0"
"@cumulus/api": "15.0.1",
"@cumulus/async-operations": "15.0.1",
"@cumulus/logger": "15.0.1",
"@cumulus/types": "15.0.1"
},
"devDependencies": {
"@cumulus/test-data": "15.0.0"
"@cumulus/test-data": "15.0.1"
}
}
Loading

0 comments on commit fb73047

Please sign in to comment.