Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-16.0.0-rev1' into jk/ter…
Browse files Browse the repository at this point in the history
…raform-provider-with-rel-16
  • Loading branch information
Jkovarik committed Jul 11, 2023
2 parents 7fa38fd + 9199b09 commit c91f7a3
Show file tree
Hide file tree
Showing 70 changed files with 326 additions and 326 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## Unreleased

## [v16.0.1-alpha.0] 2023-05-09
## [v16.0.0] 2023-05-09

### MIGRATION notes

Expand Down Expand Up @@ -7160,7 +7160,7 @@ 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/v16.0.0...HEAD
[v16.0.1-alpha.0]: https://github.com/nasa/cumulus/compare/v15.0.3...v16.0.1-alpha.0
[v16.0.0]: https://github.com/nasa/cumulus/compare/v15.0.3...v16.0.0
[v15.0.3]: https://github.com/nasa/cumulus/compare/v15.0.2...v15.0.3
[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
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": "16.0.2-alpha.0",
"version": "16.0.0",
"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": "16.0.2-alpha.0",
"version": "16.0.0",
"description": "FTP Population Utility Lambda",
"main": "index.js",
"private": true,
Expand All @@ -19,12 +19,12 @@
"access": "private"
},
"dependencies": {
"@cumulus/api": "16.0.2-alpha.0",
"@cumulus/api-client": "16.0.2-alpha.0",
"@cumulus/common": "16.0.2-alpha.0",
"@cumulus/integration-tests": "16.0.2-alpha.0",
"@cumulus/logger": "16.0.2-alpha.0",
"@cumulus/test-data": "16.0.2-alpha.0",
"@cumulus/api": "16.0.0",
"@cumulus/api-client": "16.0.0",
"@cumulus/common": "16.0.0",
"@cumulus/integration-tests": "16.0.0",
"@cumulus/logger": "16.0.0",
"@cumulus/test-data": "16.0.0",
"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": "16.0.2-alpha.0",
"version": "16.0.0",
"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": "16.0.2-alpha.0",
"@cumulus/lzards-api-client": "16.0.2-alpha.0"
"@cumulus/logger": "16.0.0",
"@cumulus/lzards-api-client": "16.0.0"
}
}
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": "16.0.2-alpha.0",
"version": "16.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": "16.0.2-alpha.0",
"version": "16.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": "16.0.2-alpha.0",
"version": "16.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": "16.0.2-alpha.0",
"version": "16.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": "16.0.2-alpha.0",
"version": "16.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": "16.0.2-alpha.0",
"version": "16.0.0",
"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": "16.0.2-alpha.0",
"version": "16.0.0",
"description": "Cumulus Integration Test Deployment",
"private": true,
"main": "index.js",
Expand Down Expand Up @@ -44,32 +44,32 @@
]
},
"dependencies": {
"@cumulus/api": "16.0.2-alpha.0",
"@cumulus/api-client": "16.0.2-alpha.0",
"@cumulus/async-operations": "16.0.2-alpha.0",
"@cumulus/aws-client": "16.0.2-alpha.0",
"@cumulus/checksum": "16.0.2-alpha.0",
"@cumulus/cmr-client": "16.0.2-alpha.0",
"@cumulus/cmrjs": "16.0.2-alpha.0",
"@cumulus/common": "16.0.2-alpha.0",
"@cumulus/discover-granules": "16.0.2-alpha.0",
"@cumulus/discover-pdrs": "16.0.2-alpha.0",
"@cumulus/files-to-granules": "16.0.2-alpha.0",
"@cumulus/hello-world": "16.0.2-alpha.0",
"@cumulus/ingest": "16.0.2-alpha.0",
"@cumulus/integration-tests": "16.0.2-alpha.0",
"@cumulus/message": "16.0.2-alpha.0",
"@cumulus/move-granules": "16.0.2-alpha.0",
"@cumulus/parse-pdr": "16.0.2-alpha.0",
"@cumulus/pdr-status-check": "16.0.2-alpha.0",
"@cumulus/post-to-cmr": "16.0.2-alpha.0",
"@cumulus/queue-granules": "16.0.2-alpha.0",
"@cumulus/queue-pdrs": "16.0.2-alpha.0",
"@cumulus/sf-sqs-report": "16.0.2-alpha.0",
"@cumulus/sync-granule": "16.0.2-alpha.0",
"@cumulus/test-processing": "16.0.2-alpha.0"
"@cumulus/api": "16.0.0",
"@cumulus/api-client": "16.0.0",
"@cumulus/async-operations": "16.0.0",
"@cumulus/aws-client": "16.0.0",
"@cumulus/checksum": "16.0.0",
"@cumulus/cmr-client": "16.0.0",
"@cumulus/cmrjs": "16.0.0",
"@cumulus/common": "16.0.0",
"@cumulus/discover-granules": "16.0.0",
"@cumulus/discover-pdrs": "16.0.0",
"@cumulus/files-to-granules": "16.0.0",
"@cumulus/hello-world": "16.0.0",
"@cumulus/ingest": "16.0.0",
"@cumulus/integration-tests": "16.0.0",
"@cumulus/message": "16.0.0",
"@cumulus/move-granules": "16.0.0",
"@cumulus/parse-pdr": "16.0.0",
"@cumulus/pdr-status-check": "16.0.0",
"@cumulus/post-to-cmr": "16.0.0",
"@cumulus/queue-granules": "16.0.0",
"@cumulus/queue-pdrs": "16.0.0",
"@cumulus/sf-sqs-report": "16.0.0",
"@cumulus/sync-granule": "16.0.0",
"@cumulus/test-processing": "16.0.0"
},
"devDependencies": {
"@cumulus/test-data": "16.0.2-alpha.0"
"@cumulus/test-data": "16.0.0"
}
}
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": "16.0.2-alpha.0",
"version": "16.0.0",
"description": "Script to generate test data for scaled ingest",
"keywords": [
"GIBS",
Expand All @@ -22,8 +22,8 @@
"directory": "packages/types"
},
"dependencies": {
"@cumulus/aws-client": "16.0.2-alpha.0",
"@cumulus/common": "16.0.2-alpha.0"
"@cumulus/aws-client": "16.0.0",
"@cumulus/common": "16.0.0"
},
"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": "16.0.2-alpha.0",
"version": "16.0.0",
"description": "example project libs",
"homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib",
"engines": {
Expand Down
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": "16.0.2-alpha.0",
"version": "16.0.0",
"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": "16.0.2-alpha.0",
"@cumulus/db": "16.0.0",
"knex": "2.4.1",
"pg": "~8.10"
}
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": "16.0.2-alpha.0",
"version": "16.0.0",
"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": "16.0.2-alpha.0",
"@cumulus/db": "16.0.2-alpha.0",
"@cumulus/common": "16.0.0",
"@cumulus/db": "16.0.0",
"knex": "2.4.1",
"pg": "~8.10"
},
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": "16.0.2-alpha.0",
"version": "16.0.0",
"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": "16.0.2-alpha.0",
"@cumulus/common": "16.0.2-alpha.0",
"@cumulus/ingest": "16.0.2-alpha.0",
"@cumulus/logger": "16.0.2-alpha.0",
"@cumulus/aws-client": "16.0.0",
"@cumulus/common": "16.0.0",
"@cumulus/ingest": "16.0.0",
"@cumulus/logger": "16.0.0",
"lodash": "^4.17.21"
}
}
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": "16.0.2-alpha.0",
"version": "16.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": "16.0.2-alpha.0",
"version": "16.0.0",
"description": "API client for working with the Cumulus archive API",
"keywords": [
"GIBS",
Expand Down Expand Up @@ -38,11 +38,11 @@
"author": "Cumulus Authors",
"license": "Apache-2.0",
"dependencies": {
"@cumulus/aws-client": "16.0.2-alpha.0",
"@cumulus/logger": "16.0.2-alpha.0",
"@cumulus/aws-client": "16.0.0",
"@cumulus/logger": "16.0.0",
"p-retry": "^2.0.0"
},
"devDependencies": {
"@cumulus/types": "16.0.2-alpha.0"
"@cumulus/types": "16.0.0"
}
}
10 changes: 5 additions & 5 deletions packages/api/ecs/async-operation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/ecs-async-operation",
"version": "16.0.2-alpha.0",
"version": "16.0.0",
"description": "The docker image for running async operations",
"keywords": [
"NASA",
Expand All @@ -20,10 +20,10 @@
"test": "../../../../node_modules/.bin/ava"
},
"dependencies": {
"@cumulus/aws-client": "16.0.2-alpha.0",
"@cumulus/db": "16.0.2-alpha.0",
"@cumulus/es-client": "16.0.2-alpha.0",
"@cumulus/logger": "16.0.2-alpha.0",
"@cumulus/aws-client": "16.0.0",
"@cumulus/db": "16.0.0",
"@cumulus/es-client": "16.0.0",
"@cumulus/logger": "16.0.0",
"aws-sdk": "^2.585.0",
"crypto-random-string": "^3.2.0",
"got": "^11.8.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/endpoints/schemas.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const router = require('express-promise-router')();
const schemas = require('../models/schemas');
const schemas = require('../lib/schemas');

/**
* get a particular schema
Expand Down
Loading

0 comments on commit c91f7a3

Please sign in to comment.