Release 16.1.4 (#3634)

* Update ECS Cluster EBS Volume Default Encryption Settings (CUMULUS-3547/NDCUM-1184) (#3580) * Updated Encrypted=true for EBS volume(s) associated with instances in the ECS cluster * Updated the ChangeLog based on CUMULUS-3547 changes --------- Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Tim Clark <[email protected]> Co-authored-by: Jonathan Kovarik <[email protected]> * update changelog * CUMULUS-3673: Fixes Granules API URI encoding by escaping path components. (#3629) * URI encodes granule API path components. * Updates CL for CUMULUS-3673 * Fixes JSDoc linter warnings * Removes JSDoc types from granules API handler * Updates CnmWorkflowFromSqsSpec to not encode collection ID * WIP: Updating specs to not encode collection ID * WIP: Updates specs to not encode collection ID * WIP: Fixes linter errors in spec files * Removes unnecessary JSDoc blocks * WIP: Removes last bits of int test encoding collection IDs * Version bump and add contributors * version bump and add contributors for real * Update docs * changelog fixup * update dockerfile to force system version of Python to 3.7 * Revert "update dockerfile to force system version of Python to 3.7" This reverts commit 3bbb101. * fix lint * Revert change to integration test --------- Co-authored-by: Tim Clark <[email protected]> Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Tim Clark <[email protected]> Co-authored-by: Jonathan Kovarik <[email protected]> Co-authored-by: Paul Pilone <[email protected]>
nasa · Apr 29, 2024 · 61460b9 · 61460b9
1 parent 77dbeef
commit 61460b9
Show file tree

Hide file tree

Showing 117 changed files with 691 additions and 680 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
+## [v16.1.4] 2024-4-23
 
 ### Migration Notes
 
@@ -28,6 +28,12 @@ instructions](https://nasa.github.io/cumulus/docs/upgrade-notes/upgrade-rds-clus
 - **CUMULUS-3444**
   - Update `cumulus-rds-tf` module to take additional parameters in support of
     migration from Aurora PostgreSQl v11 to v13.   See Migration Notes for more details.
+- **CUMULUS-3547**
+  - Updated ECS Cluster `/dev/xvdcz` EBS volumes so they're encrypted.
+
+## Fixed
+- **CUMULUS-3673**
+  - Fixes Granules API so that paths containing a granule and/or collection ID properly URI encode the ID.
 
 ## [v16.1.3] 2024-1-15
 
@@ -37,7 +43,7 @@ included in the future will have a corresponding CHANGELOG entry in future relea
 
 ### Changed
 
-- **CUMULUS_3499
+- **CUMULUS_3499**
   - Update AWS-SDK dependency pin to "2.1490" to prevent SQS issue.  Dependency
     pin expected to be changed with the resolution to CUMULUS-2900
 
@@ -7337,7 +7343,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/v16.1.3...HEAD
+[unreleased]: https://github.com/nasa/cumulus/compare/v16.1.4...HEAD
+[v16.1.4]: https://github.com/nasa/cumulus/compare/v16.1.3...v16.1.4
 [v16.1.3]: https://github.com/nasa/cumulus/compare/v16.1.2...v16.1.3
 [v16.1.2]: https://github.com/nasa/cumulus/compare/v16.1.1...v16.1.2
 [v16.1.1]: https://github.com/nasa/cumulus/compare/v16.0.0...v16.1.1

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -35,12 +35,14 @@
 * Nate Pauzenga
 * Pat Cappelaere
 * Patrick Quinn
+* Paul Pilone
 * Phil Osip
 * Sara Chaparro Diaz
 * Sean Quinlan
 * Seth Vincent
 * Slav Korolev
 * Snyk bot
+* Tim Clark
 * Tobias Nießen
 * Vanh Khuyen Nguyen
 * Vanh Nguyen
diff --git a/example/lambdas/asyncOperations/package.json b/example/lambdas/asyncOperations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-async-operations",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "AsyncOperations Test Lambda",
   "main": "index.js",
   "private": true,

diff --git a/example/lambdas/ftpPopulateTestLambda/package.json b/example/lambdas/ftpPopulateTestLambda/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ftp-populate-test-lambda",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "FTP Population Utility Lambda",
   "main": "index.js",
   "private": true,
@@ -19,12 +19,12 @@
     "access": "private"
   },
   "dependencies": {
-    "@cumulus/api": "16.1.3",
-    "@cumulus/api-client": "16.1.3",
-    "@cumulus/common": "16.1.3",
-    "@cumulus/integration-tests": "16.1.3",
-    "@cumulus/logger": "16.1.3",
-    "@cumulus/test-data": "16.1.3",
+    "@cumulus/api": "16.1.4",
+    "@cumulus/api-client": "16.1.4",
+    "@cumulus/common": "16.1.4",
+    "@cumulus/integration-tests": "16.1.4",
+    "@cumulus/logger": "16.1.4",
+    "@cumulus/test-data": "16.1.4",
     "aws-sdk": "2.1490.0",
     "fs-extra": "^9.0.0",
     "jsftp": "https://github.com/jkovarik/jsftp.git#add_288",

diff --git a/example/lambdas/lzardsClientTest/package.json b/example/lambdas/lzardsClientTest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-lzards-api-lambda",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "LZARDS API Client Test Lambda",
   "private": true,
   "engines": {
@@ -20,7 +20,7 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/logger": "16.1.3",
-    "@cumulus/lzards-api-client": "16.1.3"
+    "@cumulus/logger": "16.1.4",
+    "@cumulus/lzards-api-client": "16.1.4"
   }
 }
diff --git a/example/lambdas/python-processing/package.json b/example/lambdas/python-processing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/python-process-activity",
   "private": true,
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "Python reference activity",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity",
   "repository": {

diff --git a/example/lambdas/python-reference-activity/package.json b/example/lambdas/python-reference-activity/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/python-reference-activity",
   "private": true,
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "Python reference activity",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity",
   "repository": {

diff --git a/example/lambdas/python-reference-task/package.json b/example/lambdas/python-reference-task/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/python-reference-task",
   "private": true,
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "Python reference task",
   "main": "index.js",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-task",

diff --git a/example/lambdas/s3AccessTest/package.json b/example/lambdas/s3AccessTest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-s3-access",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "S3 Access Test Lambda",
   "main": "index.js",
   "private": true,

diff --git a/example/lambdas/snsS3Test/package.json b/example/lambdas/snsS3Test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-sns-s3",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "SNS to S3 Test Lambda",
   "main": "index.js",
   "private": true,

diff --git a/example/lambdas/versionUpTest/package.json b/example/lambdas/versionUpTest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-version-up",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "Version Up Test Lambda",
   "main": "index.js",
   "private": true,

diff --git a/example/package.json b/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/cumulus-integration-tests",
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "Cumulus Integration Test Deployment",
   "private": true,
   "main": "index.js",
@@ -44,32 +44,32 @@
     ]
   },
   "dependencies": {
-    "@cumulus/api": "16.1.3",
-    "@cumulus/api-client": "16.1.3",
-    "@cumulus/async-operations": "16.1.3",
-    "@cumulus/aws-client": "16.1.3",
-    "@cumulus/checksum": "16.1.3",
-    "@cumulus/cmr-client": "16.1.3",
-    "@cumulus/cmrjs": "16.1.3",
-    "@cumulus/common": "16.1.3",
-    "@cumulus/discover-granules": "16.1.3",
-    "@cumulus/discover-pdrs": "16.1.3",
-    "@cumulus/files-to-granules": "16.1.3",
-    "@cumulus/hello-world": "16.1.3",
-    "@cumulus/ingest": "16.1.3",
-    "@cumulus/integration-tests": "16.1.3",
-    "@cumulus/message": "16.1.3",
-    "@cumulus/move-granules": "16.1.3",
-    "@cumulus/parse-pdr": "16.1.3",
-    "@cumulus/pdr-status-check": "16.1.3",
-    "@cumulus/post-to-cmr": "16.1.3",
-    "@cumulus/queue-granules": "16.1.3",
-    "@cumulus/queue-pdrs": "16.1.3",
-    "@cumulus/sf-sqs-report": "16.1.3",
-    "@cumulus/sync-granule": "16.1.3",
-    "@cumulus/test-processing": "16.1.3"
+    "@cumulus/api": "16.1.4",
+    "@cumulus/api-client": "16.1.4",
+    "@cumulus/async-operations": "16.1.4",
+    "@cumulus/aws-client": "16.1.4",
+    "@cumulus/checksum": "16.1.4",
+    "@cumulus/cmr-client": "16.1.4",
+    "@cumulus/cmrjs": "16.1.4",
+    "@cumulus/common": "16.1.4",
+    "@cumulus/discover-granules": "16.1.4",
+    "@cumulus/discover-pdrs": "16.1.4",
+    "@cumulus/files-to-granules": "16.1.4",
+    "@cumulus/hello-world": "16.1.4",
+    "@cumulus/ingest": "16.1.4",
+    "@cumulus/integration-tests": "16.1.4",
+    "@cumulus/message": "16.1.4",
+    "@cumulus/move-granules": "16.1.4",
+    "@cumulus/parse-pdr": "16.1.4",
+    "@cumulus/pdr-status-check": "16.1.4",
+    "@cumulus/post-to-cmr": "16.1.4",
+    "@cumulus/queue-granules": "16.1.4",
+    "@cumulus/queue-pdrs": "16.1.4",
+    "@cumulus/sf-sqs-report": "16.1.4",
+    "@cumulus/sync-granule": "16.1.4",
+    "@cumulus/test-processing": "16.1.4"
   },
   "devDependencies": {
-    "@cumulus/test-data": "16.1.3"
+    "@cumulus/test-data": "16.1.4"
   }
 }
diff --git a/example/scripts/generate_ingest/package.json b/example/scripts/generate_ingest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/generate_ingest",
   "private": true,
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "Script to generate test data for scaled ingest",
   "keywords": [
     "GIBS",
@@ -22,8 +22,8 @@
     "directory": "packages/types"
   },
   "dependencies": {
-    "@cumulus/aws-client": "16.1.3",
-    "@cumulus/common": "16.1.3"
+    "@cumulus/aws-client": "16.1.4",
+    "@cumulus/common": "16.1.4"
   },
   "author": "Cumulus Authors",
   "license": "Apache-2.0"

diff --git a/example/scripts/lib/package.json b/example/scripts/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/example-lib",
   "private": true,
-  "version": "16.1.3",
+  "version": "16.1.4",
   "description": "example project libs",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib",
   "engines": {

diff --git a/example/spec/helpers/Collections.js b/example/spec/helpers/Collections.js
@@ -126,17 +126,4 @@ const removeCollectionAndAllDependencies = async (params) => {
   }
 };
 
-/**
- * Returns collectionId with version encoded.
- *
- * @param {string} name - collection name
- * @param {string} version - collection version
- * @returns {string}
- */
-const encodedConstructCollectionId = (name, version) => {
-  const encodedVersion = encodeURIComponent(version);
-
-  return constructCollectionId(name, encodedVersion);
-};
-
-module.exports = { removeCollectionAndAllDependencies, encodedConstructCollectionId };
+module.exports = { removeCollectionAndAllDependencies };
diff --git a/example/spec/parallel/cnmWorkflow/CnmWorkflowFromSqsSpec.js b/example/spec/parallel/cnmWorkflow/CnmWorkflowFromSqsSpec.js
@@ -30,9 +30,10 @@ const {
   waitForCompletedExecution,
 } = require('@cumulus/integration-tests');
 
+const { constructCollectionId } = require('@cumulus/message/Collections');
+
 const { waitForApiStatus } = require('../../helpers/apiUtils');
 const { waitForTestSfForRecord } = require('../../helpers/kinesisHelpers');
-const { encodedConstructCollectionId } = require('../../helpers/Collections');
 
 const {
   loadConfig,
@@ -75,7 +76,7 @@ async function cleanUp() {
   await deleteExecution({ prefix: config.stackName, executionArn: workflowExecution.executionArn });
   await removePublishedGranule({ prefix: config.stackName,
     granuleId,
-    collectionId: encodedConstructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version) });
+    collectionId: constructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version) });
 
   await Promise.all([
     deleteFolder(config.bucket, testDataFolder),
@@ -236,7 +237,7 @@ describe('The Cloud Notification Mechanism SQS workflow', () => {
             {
               prefix: config.stackName,
               granuleId,
-              collectionId: encodedConstructCollectionId(record.collection, record.product.dataVersion),
+              collectionId: constructCollectionId(record.collection, record.product.dataVersion),
             },
             'completed'
           );

diff --git a/example/spec/parallel/cnmWorkflow/KinesisTestTriggerSpec.js b/example/spec/parallel/cnmWorkflow/KinesisTestTriggerSpec.js
@@ -31,7 +31,7 @@ const { getExecution, deleteExecution } = require('@cumulus/api-client/execution
 const { getGranule, deleteGranule } = require('@cumulus/api-client/granules');
 const { randomString } = require('@cumulus/common/test-utils');
 const { getExecutionUrlFromArn } = require('@cumulus/message/Executions');
-const { encodedConstructCollectionId } = require('../../helpers/Collections');
+const { constructCollectionId } = require('@cumulus/message/Collections');
 
 const {
   waitForApiRecord,
@@ -109,7 +109,7 @@ describe('The Cloud Notification Mechanism Kinesis workflow', () => {
     await deleteExecution({ prefix: testConfig.stackName, executionArn: workflowExecution.executionArn });
     await deleteGranule({ prefix: testConfig.stackName,
       granuleId,
-      collectionId: encodedConstructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version) });
+      collectionId: constructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version) });
 
     await Promise.all([
       deleteFolder(testConfig.bucket, testDataFolder),
@@ -370,7 +370,7 @@ describe('The Cloud Notification Mechanism Kinesis workflow', () => {
           {
             prefix: testConfig.stackName,
             granuleId,
-            collectionId: encodedConstructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version),
+            collectionId: constructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version),
           },
           {
             status: 'completed',
@@ -464,7 +464,7 @@ describe('The Cloud Notification Mechanism Kinesis workflow', () => {
             {
               prefix: testConfig.stackName,
               granuleId,
-              collectionId: encodedConstructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version),
+              collectionId: constructCollectionId(ruleOverride.collection.name, ruleOverride.collection.version),
             },
             {
               status: 'failed',