Release v1.1.4

.circleci/config.yml

@@ -196,4 +196,4 @@ workflows:
             - build_and_test
           filters:
             branches:
-              only: master 
+              only: release 

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v1.1.4] - 2018-03-15
+### Added
+- added flag `useList` to parse-pdr [CUMULUS-404]
+
+### Fixed
+- Pass encrypted password to the ApiGranule Lambda function [CUMULUS-424]
+
 ## [v1.1.3] - 2018-03-14
 ### Fixed
 - Changed @cumulus/deployment package install behavior. The build process will happen after installation
@@ -72,7 +79,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [v1.0.0] - 2018-02-23
 
-[Unreleased]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.3...HEAD
+[Unreleased]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.4...HEAD
+[v1.1.4]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.3...v1.1.4
 [v1.1.3]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.2...v1.1.3
 [v1.1.2]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.1...v1.1.2
 [v1.1.1]: https://github.com/cumulus-nasa/cumulus/compare/v1.0.1...v1.1.1

cumulus/tasks/discover-granules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-granules",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Discover Granules in FTP/HTTP/SFTP endpoints",
   "main": "index.js",
   "directories": {
@@ -39,7 +39,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/discover-pdr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/discover-pdr",
   "private": true,
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "SIPS handler PDR discovery task",
   "main": "index.js",
   "keywords": [
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.3",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "ftp": "^0.3.10",
     "node-fetch": "^1.6.1",
     "parse-duration": "^0.1.1",

cumulus/tasks/discover-pdrs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-pdrs",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Discover PDRs in FTP and HTTP endpoints",
   "main": "index.js",
   "directories": {
@@ -38,7 +38,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/discover-s3-granules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-s3-granules",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Discover granules from an S3 bucket",
   "main": "index.js",
   "directories": {
@@ -37,7 +37,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/generate-pdr-file-list/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/generate-pdr-file-list",
   "private": true,
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "SIPS handler PDR processing task",
   "main": "index.js",
   "keywords": [
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.3",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/pvl": "^1.0.0",
     "ftp": "^0.3.10",
     "node-fetch": "^1.6.1",

cumulus/tasks/parse-pdr/index.js

@@ -32,7 +32,8 @@ function parsePdr(event) {
     config.stack,
     config.bucket,
     config.collection,
-    provider
+    provider,
+    config.useList
   );
 
   return parse.ingest()

cumulus/tasks/parse-pdr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/parse-pdr",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Download and Parse a given PDR",
   "main": "index.js",
   "directories": {
@@ -41,7 +41,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/parse-pdr/schemas/config.json

@@ -38,6 +38,11 @@
         "name": { "type": "string" },
         "granuleIdExtraction": { "type": "string" }
       }
+    },
+    "useList": {
+      "description": "flag to tell ftp server to use 'LIST' instead of 'STAT'",
+      "default": false,
+      "type": "boolean"
     }
   }
 }

cumulus/tasks/parse-pdr/tests/parse_pdrs_test.js

@@ -32,6 +32,7 @@ test('parse PDR from FTP endpoint', async (t) => {
     username: 'testuser',
     password: 'testpass'
   };
+  newPayload.config.useList = true;
 
   await validateConfig(t, newPayload.config);
 

cumulus/tasks/pdr-status-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/pdr-status-check",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Checks execution status of granules in a PDR",
   "main": "index.js",
   "directories": {
@@ -42,7 +42,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/post-to-cmr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/post-to-cmr",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Post a given granule to CMR",
   "main": "index.js",
   "directories": {
@@ -44,7 +44,7 @@
     "@cumulus/cmrjs": "^1.1.3",
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/queue-granules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-granules",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Add discovered granules to the queue",
   "main": "index.js",
   "directories": {
@@ -40,7 +40,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",

cumulus/tasks/queue-pdrs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-pdrs",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Add discovered PDRs to a queue",
   "main": "index.js",
   "directories": {
@@ -39,7 +39,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",

cumulus/tasks/sync-granule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/sync-granule",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Download a given granule",
   "main": "index.js",
   "directories": {
@@ -43,7 +43,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.3",
     "@cumulus/cumulus-message-adapter-js": "^1.0.1",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/test-data": "^1.1.3",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

cumulus/tasks/validate-pdr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/validate-pdr",
   "private": true,
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "SIPS handler PDR processing task",
   "main": "index.js",
   "keywords": [
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.3",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/pvl": "^1.0.0",
     "ftp": "^0.3.10",
     "node-fetch": "^1.6.1",

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.9.0",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "packages": [
     "packages/*",
     "cumulus/tasks/*",

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/api",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Lambda functions for handling all daac's API operations",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,7 @@
   "dependencies": {
     "@cumulus/cmrjs": "^1.1.3",
     "@cumulus/common": "^1.1.3",
-    "@cumulus/ingest": "^1.1.3",
+    "@cumulus/ingest": "^1.1.4",
     "@cumulus/pvl": "^1.0.0",
     "ajv": "^5.2.2",
     "archiver": "^2.1.1",

packages/deployment/app/cloudformation.template.yml

@@ -27,7 +27,9 @@ Resources:
     Properties:
       Parameters:
         CmrPassword:
-          Ref: CmrPassword
+          Fn::GetAtt:
+            - CumulusCustomResource
+            - CmrPassword 
         ElasticSearchDomain:
           Fn::GetAtt:
             - {{../es.name}}Domain

packages/deployment/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/deployment",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Deployment templates for cumulus",
   "scripts": {
     "test": "ava --no-color",

packages/ingest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Ingest utilities",
   "scripts": {
     "test": "env TEST=true ava"

packages/ingest/pdr.js

@@ -106,6 +106,7 @@ class Parse {
     bucket,
     collection,
     provider,
+    useList = false,
     folder = 'pdrs') {
     if (this.constructor === Parse) {
       throw new TypeError('Can not construct abstract class.');
@@ -117,6 +118,7 @@ class Parse {
     this.collection = collection;
     this.provider = provider;
     this.folder = folder;
+    this.useList = useList;
 
     this.port = get(this.provider, 'port', 21);
     this.host = get(this.provider, 'host', null);

packages/integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/integration-tests",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Integration tests",
   "bin": {
     "cumulus-test": "./bin/cli.js"
@@ -30,7 +30,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/common": "^1.1.3",
-    "@cumulus/deployment": "^1.1.3",
+    "@cumulus/deployment": "^1.1.4",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",