Merge pull request #295 from cumulus-nasa/ChangeInternalBucketParameterToBucketInParsePdrTask

Change internal bucket parameter to bucket in parse pdr task

Author: Marc

CHANGELOG.md

@@ -21,10 +21,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - The config now takes a "stackName" property
 - [CUMULUS-450](https://bugs.earthdata.nasa.gov/browse/CUMULUS-450) - Updated
   the config schema of the **parse-pdr** task
-  - The config no longer takes a "buckets" property
   - The config no longer takes a "collection" property
-  - The config now takes an "internalBucket" property
-  - The "stack", "provider", and "internalBucket" config properties are now
+  - The "stack", "provider", and "bucket" config properties are now
     required
 
 ### Removed

tasks/parse-pdr/index.js

@@ -15,7 +15,7 @@ const log = require('@cumulus/common/log');
 * @param {string} event.config.stack - the name of the deployment stack
 * @param {string} event.config.pdrFolder - folder for the PDRs
 * @param {Object} event.config.provider - provider information
-* @param {Object} event.config.buckets - S3 buckets
+* @param {Object} event.config.bucket - the internal S3 bucket
 * @returns {Promise.<Object>} - see schemas/output.json for detailed output schema
 * that is passed to the next task in the workflow
 **/
@@ -28,7 +28,7 @@ function parsePdr(event) {
   const parse = new Parse(
     input.pdr,
     config.stack,
-    config.internalBucket,
+    config.bucket,
     provider,
     config.useList
   );

tasks/parse-pdr/schemas/config.json

@@ -2,7 +2,7 @@
   "title": "ParsePdrConfig",
   "description": "Describes the config used by the parse-pdr task",
   "type": "object",
-  "required": [ "stack", "provider", "internalBucket"],
+  "required": [ "stack", "provider", "bucket"],
   "properties": {
     "pdrFolder": {
       "type": "string"
@@ -22,7 +22,7 @@
         }
       }
     },
-    "internalBucket": { "type": "string" },
+    "bucket": { "type": "string" },
     "useList": {
       "description": "flag to tell ftp server to use 'LIST' instead of 'STAT'",
       "default": false,

tasks/parse-pdr/tests/parse_pdrs_test.js

@@ -20,7 +20,7 @@ test.beforeEach(async (t) => {
   t.context.payload = {
     config: {
       stack: randomString(),
-      internalBucket: randomString(),
+      bucket: randomString(),
       provider: {}
     },
     input: {
@@ -31,22 +31,22 @@ test.beforeEach(async (t) => {
     }
   };
 
-  await s3().createBucket({ Bucket: t.context.payload.config.internalBucket }).promise();
+  await s3().createBucket({ Bucket: t.context.payload.config.bucket }).promise();
 
   const collectionConfig = {
     name: 'MOD09GQ',
     granuleIdExtraction: '^(.*)\.hdf'
   };
 
   const collectionConfigStore = new CollectionConfigStore(
-    t.context.payload.config.internalBucket,
+    t.context.payload.config.bucket,
     t.context.payload.config.stack
   );
   await collectionConfigStore.put('MOD09GQ', collectionConfig);
 });
 
 test.afterEach(async (t) => {
-  await recursivelyDeleteS3Bucket(t.context.payload.config.internalBucket);
+  await recursivelyDeleteS3Bucket(t.context.payload.config.bucket);
 });
 
 test('parse PDR from FTP endpoint', async (t) => {

tests/fixtures/workflows/pdr_parse_ingest.json

@@ -41,10 +41,9 @@
         "lambda": "tasks/parse-pdr",
         "handler": "index.handler",
         "cumulusConfig": {
-          "useQueue": true,
           "provider": "{{$.meta.provider}}",
           "collection": "{{$.meta.collection}}",
-          "internalBucket": "{{$.meta.buckets.internal}}",
+          "bucket": "{{$.meta.buckets.internal}}",
           "stack": "{{$.meta.stack}}",
           "templateUri": "{{$.meta.templates.IngestGranule}}",
           "queueUrl": "{{$.meta.queues.startSF}}"