Merge pull request #237 from cumulus-nasa/CUMULUS-371

break up kes.override.js - CUMULUS-371-part-1
nasa · Mar 8, 2018 · b96dd06 · b96dd06
2 parents 581e71b + ae36e46
commit b96dd06
Show file tree

Hide file tree

Showing 23 changed files with 898 additions and 642 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,8 +12,37 @@ jobs:
 
       - restore_cache:
           keys:
-            - dependencies-{{ checksum "lerna.json" }}-{{ checksum "package.json" }}
-            - dependencies-
+            - core-{{ checksum "lerna.json" }}-{{ checksum "package.json" }}
+            - core-
+
+      - run:
+          name: core installation 
+          command: |
+            yarn install
+
+            # generate global hash
+            ./node_modules/.bin/lerna exec --concurrency 1 -- sha1sum package.json | awk '{print $1}' '' >> /home/circleci/project/global-hash 
+
+      - save_cache:
+          paths:
+            - ./node_modules
+          key: core-{{ checksum "lerna.json" }}-{{ checksum "package.json" }}
+
+      - restore_cache:
+          keys:
+            - packages-{{ checksum "global-hash" }}
+
+      - restore_cache:
+          keys:
+            - cumulus-tasks-{{ checksum "global-hash" }}
+
+      - restore_cache:
+          keys:
+            - gitc-tasks-{{ checksum "global-hash" }}
+
+      - restore_cache:
+          keys:
+            - services-{{ checksum "global-hash" }}
 
       - run:
           name: Installing Dependencies
@@ -32,32 +61,66 @@ jobs:
             sudo bash /usr/sbin/sftp.sh user:password
             sudo cp -r /home/circleci/project/packages/test-data/* /home/user/
 
-            yarn install
             yarn bootstrap-no-build
 
       - save_cache:
+          key: packages-{{ checksum "global-hash" }}
+          paths:
+            - ./packages/deployment/node_modules
+            - ./packages/pvl/node_modules
+            - ./packages/test-data/node_modules
+            - ./packages/api/node_modules
+            - ./packages/common/node_modules
+            - ./packages/cmrjs/node_modules
+            - ./packages/ingest/node_modules
+            - ./packages/integration-tests/node_modules
+            - ./packages/task-debug/node_modules
+
+      - save_cache:
+          key: cumulus-tasks-{{ checksum "global-hash" }}
           paths:
-            - ./node_modules
-            - ./cumulus/tasks/discover-pdr/node_modules
-            - ./cumulus/tasks/discover-pdrs/node_modules
-            - ./cumulus/tasks/discover-granules/node_modules
-            - ./cumulus/tasks/discover-s3-granules/node_modules
             - ./cumulus/tasks/hello-world/node_modules
+            - ./cumulus/tasks/discover-granules/node_modules
+            - ./cumulus/tasks/discover-pdrs/node_modules
             - ./cumulus/tasks/parse-pdr/node_modules
-            - ./cumulus/tasks/pdr-status-check/node_modules
             - ./cumulus/tasks/post-to-cmr/node_modules
+            - ./cumulus/tasks/pdr-status-check/node_modules
             - ./cumulus/tasks/queue-granules/node_modules
             - ./cumulus/tasks/queue-pdrs/node_modules
-            - ./cumulus/tasks/run-gdal/node_modules
             - ./cumulus/tasks/sync-granule/node_modules
-            - ./cumulus/gibs-ops-api/node_modules
-            - ./cumulus/packages/api/node_modules
-            - ./cumulus/packages/cmrjs/node_modules
-            - ./cumulus/packages/common/node_modules
-            - ./cumulus/packages/pvl/node_modules
-            - ./cumulus/packages/ingest/node_modules
-            - ./cumulus/packages/deployment/node_modules
-          key: dependencies-{{ checksum "lerna.json" }}-{{ checksum "package.json" }}
+            - ./cumulus/tasks/discover-s3-granules/node_modules
+
+      - save_cache:
+          key: gitc-tasks-{{ checksum "global-hash" }}
+          paths:
+            - ./cumulus/tasks/copy-idx-from-s3-to-efs/node_modules
+            - ./cumulus/tasks/delete-ingest-tracking-data/node_modules
+            - ./cumulus/tasks/delete-pdr-ftp/node_modules
+            - ./cumulus/tasks/delete-pdr-s3/node_modules
+            - ./cumulus/tasks/discover-cmr-granules/node_modules
+            - ./cumulus/tasks/discover-http-tiles/node_modules
+            - ./cumulus/tasks/dowload-activity-mock/node_modules
+            - ./cumulus/tasks/filter-payload/node_modules
+            - ./cumulus/tasks/generate-mrf/node_modules
+            - ./cumulus/tasks/generate-pan/node_modules
+            - ./cumulus/tasks/generate-pdrd/node_modules
+            - ./cumulus/tasks/run-gdal/node_modules
+            - ./cumulus/tasks/sync-http-urls/node_modules
+            - ./cumulus/tasks/sync-wms/node_modules
+            - ./cumulus/tasks/tee/node_modules
+            - ./cumulus/tasks/trigger-ingest/node_modules
+            - ./cumulus/tasks/trigger-mrf-gen/node_modules
+            - ./cumulus/tasks/trigger-process-pdrs/node_modules
+            - ./cumulus/tasks/validate-archives/node_modules
+            - ./cumulus/tasks/discover-pdr/node_modules
+            - ./cumulus/tasks/generate-pdr-file-list/node_modules
+            - ./cumulus/tasks/validate-pdr/node_modules
+
+      - save_cache:
+          key: services-{{ checksum "global-hash" }}
+          paths:
+            - ./cumulus/services/sfn-scheduler/node_modules
+            - ./cumulus/services/sfn-throttler/node_modules
 
       - run:
           name: Running Test

diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,5 @@ packaged-*
 .vscode
 *-debug.log
 profiles.clj
-kes.js
 *.map  
 .DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Updated
+- Broke up `kes.override.js` of @cumulus/deployment to multiple modules and moved to a new location
+- Expanded @cumulus/deployment test coverage
+- all tasks were updated to use cumulus-message-adapter-js 1.0.1
+
 ## [v1.1.1] - 2018-03-08
 
 ### Removed

diff --git a/cumulus/tasks/discover-granules/package.json b/cumulus/tasks/discover-granules/package.json
@@ -38,7 +38,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/cumulus/tasks/discover-pdrs/package.json b/cumulus/tasks/discover-pdrs/package.json
@@ -37,7 +37,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/cumulus/tasks/discover-s3-granules/package.json b/cumulus/tasks/discover-s3-granules/package.json
@@ -36,7 +36,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/cumulus/tasks/hello-world/package.json b/cumulus/tasks/hello-world/package.json
@@ -37,7 +37,7 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",

diff --git a/cumulus/tasks/parse-pdr/package.json b/cumulus/tasks/parse-pdr/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/cumulus/tasks/pdr-status-check/package.json b/cumulus/tasks/pdr-status-check/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/cumulus/tasks/post-to-cmr/package.json b/cumulus/tasks/post-to-cmr/package.json
@@ -43,7 +43,7 @@
   "dependencies": {
     "@cumulus/cmrjs": "^1.1.0",
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/cumulus/tasks/queue-granules/package.json b/cumulus/tasks/queue-granules/package.json
@@ -39,7 +39,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/queue-pdrs/package.json b/cumulus/tasks/queue-pdrs/package.json
@@ -38,7 +38,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/sync-granule/package.json b/cumulus/tasks/sync-granule/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
+    "@cumulus/cumulus-message-adapter-js": "^1.0.1",
     "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",

diff --git a/packages/deployment/.gitignore b/packages/deployment/.gitignore
@@ -0,0 +1 @@
+app/*.js