@cumulus/integration-tests 10.0.1 → 10.1.2

package/index.js

@@ -22,14 +22,13 @@ const {
   getWorkflowFileKey,
 } = require('@cumulus/common/workflows');
 const { readJsonFile } = require('@cumulus/common/FileUtils');
-const RulesModel = require('@cumulus/api/models/rules');
 const collectionsApi = require('@cumulus/api-client/collections');
 const providersApi = require('@cumulus/api-client/providers');
+const rulesApi = require('@cumulus/api-client/rules');
 const asyncOperationsApi = require('@cumulus/api-client/asyncOperations');
 const { pullStepFunctionEvent } = require('@cumulus/message/StepFunctions');
 
 const { addCollections, addCustomUrlPathToCollectionFiles, buildCollection } = require('./Collections.js');
-const rulesApi = require('./api/rules');
 const executionsApi = require('./api/executions');
 const granulesApi = require('./api/granules');
 const api = require('./api/api');
@@ -432,7 +431,7 @@ async function addRulesWithPostfix(config, dataDirectory, overrides, postfix) {
   // race condition
   return await pMap(
     rules,
-    (rule) => {
+    async (rule) => {
       if (postfix) {
         rule.name += replace(postfix, /-/g, '_');
         rule.collection.name += postfix;
@@ -447,9 +446,14 @@ async function addRulesWithPostfix(config, dataDirectory, overrides, postfix) {
         ...config,
       }));
 
-      const rulesmodel = new RulesModel();
       console.log(`adding rule ${JSON.stringify(templatedRule)}`);
-      return rulesmodel.create(templatedRule);
+
+      const response = await rulesApi.postRule({
+        prefix: stackName,
+        rule: templatedRule,
+      });
+      const { record } = JSON.parse(response.body);
+      return record;
     },
     { concurrency: 1 }
   );
@@ -467,17 +471,6 @@ function addRules(config, dataDirectory, overrides) {
   return addRulesWithPostfix(config, dataDirectory, overrides);
 }
 
-/**
- * deletes a rule by name
- *
- * @param {string} name - name of the rule to delete.
- * @returns {Promise.<dynamodbDocClient.delete>} - superclass delete promise
- */
-async function _deleteOneRule(name) {
-  const rulesModel = new RulesModel();
-  return await rulesModel.get({ name }).then((item) => rulesModel.delete(item));
-}
-
 /**
  * Remove params added to the rule when it is saved into dynamo
  * and comes back from the db
@@ -523,7 +516,10 @@ async function deleteRules(stackName, bucketName, rules, postfix) {
 
   await pMap(
     rules,
-    (rule) => _deleteOneRule(postfix ? `${rule.name}${postfix}` : rule.name),
+    (rule) => rulesApi.deleteRule({
+      prefix: stackName,
+      ruleName: postfix ? `${rule.name}${postfix}` : rule.name,
+    }),
     { concurrency: process.env.CONCURRENCY || 3 }
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/integration-tests",
-  "version": "10.0.1",
+  "version": "10.1.2",
   "description": "Integration tests",
   "bin": {
     "cumulus-test": "./bin/cli.js"
@@ -20,6 +20,7 @@
   "scripts": {
     "build": "rm -rf dist && mkdir dist && ../../node_modules/.bin/webpack",
     "build-docs": "../../node_modules/.bin/jsdoc2md --template README.hbs Collections.js Executions.js Granules.js Providers.js Rules.js > README.md",
+    "clean": "rm -rf dist",
     "package": "npm run build",
     "test": "../../node_modules/.bin/ava",
     "test:coverage": "../../node_modules/.bin/nyc npm test"
@@ -27,16 +28,16 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/api": "10.0.1",
-    "@cumulus/api-client": "10.0.1",
-    "@cumulus/aws-client": "10.0.1",
-    "@cumulus/cmr-client": "10.0.1",
-    "@cumulus/cmrjs": "10.0.1",
-    "@cumulus/common": "10.0.1",
-    "@cumulus/launchpad-auth": "10.0.1",
-    "@cumulus/logger": "10.0.1",
-    "@cumulus/message": "10.0.1",
-    "@cumulus/oauth-client": "10.0.1",
+    "@cumulus/api": "10.1.2",
+    "@cumulus/api-client": "10.1.2",
+    "@cumulus/aws-client": "10.1.2",
+    "@cumulus/cmr-client": "10.1.2",
+    "@cumulus/cmrjs": "10.1.2",
+    "@cumulus/common": "10.1.2",
+    "@cumulus/launchpad-auth": "10.1.2",
+    "@cumulus/logger": "10.1.2",
+    "@cumulus/message": "10.1.2",
+    "@cumulus/oauth-client": "10.1.2",
     "aws-sdk": "^2.585.0",
     "base-64": "^0.1.0",
     "commander": "^2.15.0",
@@ -47,7 +48,7 @@
     "handlebars": "^4.0.11",
     "js-yaml": "^3.13.1",
     "jsonwebtoken": "^8.5.1",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "moment": "2.29.1",
     "p-map": "^2.1.0",
     "p-retry": "^2.0.0",
@@ -55,5 +56,5 @@
     "uuid": "^3.2.1",
     "xml2js": "^0.4.19"
   },
-  "gitHead": "49c3c88336838184f22f35fbce298c71cd269138"
+  "gitHead": "3b59753fa85064549b70ad8ed4a4ee213c5af313"
 }