Release 13.3.3 alpha 1 (#3145)

* revert default sort params to pre-CUMULUS-2930 changes * version bump * update changelog * merge 3104 to fix TS compilation error * resolve conflicts * resolve conflicts * fix merge issues * remove lzards-api-client, which came from a future release * remove errant test * fix lint and unit test errors Co-authored-by: jennyhliu <34660846+jennyhliu@users.noreply.github.com>
nasa · Nov 9, 2022 · ff4b3cf · ff4b3cf
1 parent 92e11b2
commit ff4b3cf
Show file tree

Hide file tree

Showing 86 changed files with 467 additions and 372 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## [v13.3.3-alpha] 2022-11-8
+
+### Notable changes
+
+  - Published new tag [`43` of `cumuluss/async-operation` to Docker Hub](https://hub.docker.com/layers/cumuluss/async-operation/43/images/sha256-5f989c7d45db3dde87c88c553182d1e4e250a1e09af691a84ff6aa683088b948?context=explore) which was built with node:14.19.3-buster.
+### Fixed
+
+  - **CUMULUS-3116**
+    - Reverted ElasticSearch sort behavior to pre-13.3.0. Introducing a fallback sort on
+      `_uid` is thought to add additional latency to ElasticSearch requests
+  - **CUMULUS-3104**
+    - Fixed TS compilation error on aws-client package caused by @aws-sdk/client-s3 3.202.0 upgrade
+
+### Changed
+
+  - **CUMULUS-3104**
+    - Updated Dockerfile of async operation docker image to build from node:14.19.3-buster
+    - Sets default async_operation_image version to 43.
+    - Upgraded saml2-js 4.0.0, rewire to 6.0.0 to address security vulnerabilities
+    - Fixed TS compilation error caused by @aws-sdk/client-s3 3.190->3.193 upgrade
+
 ## [v13.3.2] 2022-10-10 [BACKPORT]
 
 **Please note** changes in 13.3.2 may not yet be released in future versions, as
@@ -1144,7 +1165,7 @@ aws lambda invoke --function-name $PREFIX-data-migration1 \
 ### Changed
 
 - **CUMULUS-NONE**
-  - Adds logging to ecs/async-operation Docker conatiner that launches async
+  - Adds logging to ecs/async-operation Docker container that launches async
     tasks on ECS. Sets default async_operation_image_version to 39.
 
 - **CUMULUS-2845**
@@ -6447,7 +6468,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.2...HEAD
+[unreleased]: https://github.com/nasa/cumulus/compare/v13.3.3-alpha...HEAD
+[v13.3.3-alpha]: https://github.com/nasa/cumulus/compare/v13.3.2...v13.3.3-alpha
 [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

diff --git a/audit-ci.json b/audit-ci.json
@@ -2,5 +2,5 @@
     "high": true,
     "pass-enoaudit": true,
     "retry-count": 20,
-    "allowlist": ["node-forge"]
+    "allowlist": ["xmldom"]
 }
diff --git a/bamboo/cleanup-integration-tests.sh b/bamboo/cleanup-integration-tests.sh
@@ -20,6 +20,6 @@ npm install
 npm --version
 
 ## This is needed to ensure lock-stack has the expected dependencies
-npx lerna bootstrap --scope @cumulus/cumulus-integration-tests --scope @cumulus/aws-client --scope @cumulus/common --scope @cumulus/errors --scope @cumulus/logger
+npx lerna bootstrap --scope @cumulus/cumulus-integration-tests --scope @cumulus/aws-client --scope @cumulus/checksum --scope @cumulus/common --scope @cumulus/errors --scope @cumulus/logger
 
 cd example && node ./scripts/lock-stack.js lock "$GIT_SHA" "$DEPLOYMENT" false
diff --git a/example/cumulus-tf/variables.tf b/example/cumulus-tf/variables.tf
@@ -350,7 +350,7 @@ variable "rds_admin_access_secret_arn" {
 variable "async_operation_image_version" {
   description = "docker image version to use for Cumulus async operations tasks"
   type = string
-  default = "42"
+  default = "43"
 }
 
 variable "cumulus_process_activity_version" {

diff --git a/example/lambdas/asyncOperations/package.json b/example/lambdas/asyncOperations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-async-operations",
-  "version": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "FTP Population Utility Lambda",
   "main": "index.js",
   "private": true,
@@ -19,12 +19,12 @@
     "access": "private"
   },
   "dependencies": {
-    "@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",
+    "@cumulus/api": "13.3.3-alpha.0",
+    "@cumulus/api-client": "13.3.3-alpha.0",
+    "@cumulus/common": "13.3.3-alpha.0",
+    "@cumulus/integration-tests": "13.3.3-alpha.0",
+    "@cumulus/logger": "13.3.3-alpha.0",
+    "@cumulus/test-data": "13.3.3-alpha.0",
     "aws-sdk": "^2.585.0",
     "fs-extra": "^9.0.0",
     "js-yaml": "^3.13.1",

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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "Cumulus Integration Test Deployment",
   "private": true,
   "main": "index.js",
@@ -45,32 +45,32 @@
     ]
   },
   "dependencies": {
-    "@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"
+    "@cumulus/api": "13.3.3-alpha.0",
+    "@cumulus/api-client": "13.3.3-alpha.0",
+    "@cumulus/async-operations": "13.3.3-alpha.0",
+    "@cumulus/aws-client": "13.3.3-alpha.0",
+    "@cumulus/checksum": "13.3.3-alpha.0",
+    "@cumulus/cmr-client": "13.3.3-alpha.0",
+    "@cumulus/cmrjs": "13.3.3-alpha.0",
+    "@cumulus/common": "13.3.3-alpha.0",
+    "@cumulus/discover-granules": "13.3.3-alpha.0",
+    "@cumulus/discover-pdrs": "13.3.3-alpha.0",
+    "@cumulus/files-to-granules": "13.3.3-alpha.0",
+    "@cumulus/hello-world": "13.3.3-alpha.0",
+    "@cumulus/ingest": "13.3.3-alpha.0",
+    "@cumulus/integration-tests": "13.3.3-alpha.0",
+    "@cumulus/message": "13.3.3-alpha.0",
+    "@cumulus/move-granules": "13.3.3-alpha.0",
+    "@cumulus/parse-pdr": "13.3.3-alpha.0",
+    "@cumulus/pdr-status-check": "13.3.3-alpha.0",
+    "@cumulus/post-to-cmr": "13.3.3-alpha.0",
+    "@cumulus/queue-granules": "13.3.3-alpha.0",
+    "@cumulus/queue-pdrs": "13.3.3-alpha.0",
+    "@cumulus/sf-sqs-report": "13.3.3-alpha.0",
+    "@cumulus/sync-granule": "13.3.3-alpha.0",
+    "@cumulus/test-processing": "13.3.3-alpha.0"
   },
   "devDependencies": {
-    "@cumulus/test-data": "13.3.2"
+    "@cumulus/test-data": "13.3.3-alpha.0"
   }
 }
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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "Script to generate test data for scaled ingest",
   "keywords": [
     "GIBS",
@@ -22,8 +22,8 @@
     "directory": "packages/types"
   },
   "dependencies": {
-    "@cumulus/aws-client": "13.3.2",
-    "@cumulus/common": "13.3.2"
+    "@cumulus/aws-client": "13.3.3-alpha.0",
+    "@cumulus/common": "13.3.3-alpha.0"
   },
   "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": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "example project libs",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib",
   "engines": {

diff --git a/example/spec/parallel/discoverGranules/DiscoverGranulesDuplicateHandlingErrorSpec.js b/example/spec/parallel/discoverGranules/DiscoverGranulesDuplicateHandlingErrorSpec.js
@@ -164,7 +164,7 @@ describe('The DiscoverGranules workflow with an existing granule and duplicateHa
         status: 'failed',
       });
 
-      const errorCause = JSON.parse(get(execution, 'error.Cause', {}));
+      const errorCause = JSON.parse(get(execution, 'error.Cause', '{}'));
       expect(errorCause.errorMessage)
         .toBe(`Duplicate granule found for ${existingGranuleId} with duplicate configuration set to error`);
     }

diff --git a/example/spec/parallel/ingestGranule/IngestGranuleFailureSpec.js b/example/spec/parallel/ingestGranule/IngestGranuleFailureSpec.js
@@ -107,6 +107,7 @@ describe('The Ingest Granule failure workflow', () => {
         },
       });
     } catch (error) {
+      console.log(`*** error.apiMessage ${error.apiMessage}`);
       const apiMessage = JSON.parse(error.apiMessage);
       if (apiMessage.name !== 'NoSuchBucket') {
         throw new Error(`Could not complete test cleanup ${error.apiMessage}`);

diff --git a/lambdas/data-migration1/package.json b/lambdas/data-migration1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/data-migration1",
-  "version": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "A Lambda function used for doing data migrations",
   "license": "Apache-2.0",
   "engines": {
@@ -25,18 +25,18 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@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",
+    "@cumulus/api": "13.3.3-alpha.0",
+    "@cumulus/aws-client": "13.3.3-alpha.0",
+    "@cumulus/common": "13.3.3-alpha.0",
+    "@cumulus/db": "13.3.3-alpha.0",
+    "@cumulus/errors": "13.3.3-alpha.0",
+    "@cumulus/logger": "13.3.3-alpha.0",
+    "@cumulus/types": "13.3.3-alpha.0",
     "knex": "0.95.15",
     "lodash": "^4.17.21",
     "pg": "^8.3.0"
   },
   "devDependencies": {
-    "@cumulus/test-data": "13.3.2"
+    "@cumulus/test-data": "13.3.3-alpha.0"
   }
 }
diff --git a/lambdas/data-migration2/package.json b/lambdas/data-migration2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/data-migration2",
-  "version": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "A Lambda function used for doing data migrations intended to be executed after data-migration1.",
   "license": "Apache-2.0",
   "engines": {
@@ -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.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",
+    "@cumulus/api": "13.3.3-alpha.0",
+    "@cumulus/aws-client": "13.3.3-alpha.0",
+    "@cumulus/common": "13.3.3-alpha.0",
+    "@cumulus/db": "13.3.3-alpha.0",
+    "@cumulus/errors": "13.3.3-alpha.0",
+    "@cumulus/logger": "13.3.3-alpha.0",
+    "@cumulus/message": "13.3.3-alpha.0",
+    "@cumulus/types": "13.3.3-alpha.0",
     "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.2"
+    "@cumulus/test-data": "13.3.3-alpha.0"
   }
 }
diff --git a/lambdas/db-migration/package.json b/lambdas/db-migration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db-migration-lambda",
-  "version": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "A Lambda function used for deploying DB migrations",
   "license": "Apache-2.0",
   "engines": {
@@ -20,7 +20,7 @@
     "tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles"
   },
   "dependencies": {
-    "@cumulus/db": "13.3.2",
+    "@cumulus/db": "13.3.3-alpha.0",
     "knex": "0.95.15",
     "pg": "^8.3.0"
   }

diff --git a/lambdas/db-provision-user-database/package.json b/lambdas/db-provision-user-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db-provision-user-database-lambda",
-  "version": "13.3.2",
+  "version": "13.3.3-alpha.0",
   "description": "A Lambda function used for provisioning user databases",
   "engines": {
     "node": ">=14.19.1"
@@ -24,8 +24,8 @@
     "timeout": "2m"
   },
   "dependencies": {
-    "@cumulus/common": "13.3.2",
-    "@cumulus/db": "13.3.2",
+    "@cumulus/common": "13.3.3-alpha.0",
+    "@cumulus/db": "13.3.3-alpha.0",
     "knex": "0.95.15",
     "pg": "^8.3.0"
   },