eclipse-iofog
diff --git a/‎.travis.yml‎
Lines changed: 11 additions & 5 deletions b/‎.travis.yml‎
Lines changed: 11 additions & 5 deletions
diff --git a/‎package.json‎
Lines changed: 9 additions & 4 deletions b/‎package.json‎
Lines changed: 9 additions & 4 deletions
diff --git a/‎scripts/cli-tests.js‎
Lines changed: 420 additions & 0 deletions b/‎scripts/cli-tests.js‎
Lines changed: 420 additions & 0 deletions
diff --git a/‎scripts/postmantest.js‎
Lines changed: 32 additions & 0 deletions b/‎scripts/postmantest.js‎
Lines changed: 32 additions & 0 deletions
diff --git a/‎src/cli/catalog.js‎
Lines changed: 10 additions & 11 deletions b/‎src/cli/catalog.js‎
Lines changed: 10 additions & 11 deletions
diff --git a/‎src/cli/connector.js‎
Lines changed: 1 addition & 6 deletions b/‎src/cli/connector.js‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎src/cli/diagnostics.js‎
Lines changed: 1 addition & 11 deletions b/‎src/cli/diagnostics.js‎
Lines changed: 1 addition & 11 deletions
diff --git a/‎src/cli/flow.js‎
Lines changed: 4 additions & 11 deletions b/‎src/cli/flow.js‎
Lines changed: 4 additions & 11 deletions
diff --git a/‎src/cli/index.js‎
Lines changed: 7 additions & 0 deletions b/‎src/cli/index.js‎
Lines changed: 7 additions & 0 deletions
@@ -18,24 +18,28 @@ stages:
   if: type = pull_request
 - name: dev_deploy
   if: branch = develop AND type = push
-- name: prod_deploy
-  if: branch = release AND type = push
+- name: pre_release
+  if: branch =~ /^release-.*$/ AND type = push
 - name: release
   if: branch = master and type = push
 
 jobs:
   include:
   - stage: build
+    script:
+    - npm test
+    - NODE_ENV=production node /home/travis/build/ioFog/Controller/src/main.js start
+    - npm run postman_test
   - stage: dev_deploy
     before_install:
     - sudo apt-get install sshpass
     script: 
-    - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP "cd /FogController; NODE_ENV=production node src/main.js stop; git pull; npm i; NODE_ENV=production node src/main.js start"
-  - stage: prod_deploy
+    - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP "cd /FogController; NODE_ENV=production node src/main.js stop; git pull; npm i; npm test; NODE_ENV=production node src/main.js start; npm run postman_test"
+  - stage: pre_release
     before_install:
     - sudo apt-get install sshpass
     script: 
-    - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "cd /Controller; NODE_ENV=production node src/main.js stop; git pull; npm i; NODE_ENV=production node src/main.js start"
+    - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP "cd /Controller; NODE_ENV=production node src/main.js stop; git pull; git checkout ${TRAVIS_BRANCH}; npm i; npm test; NODE_ENV=production node src/main.js start; npm run postman_test"
   - stage: release
     #before_install:
       #- git clone "https://github.com/$TRAVIS_REPO_SLUG.git" "$TRAVIS_REPO_SLUG";
@@ -54,3 +58,5 @@ jobs:
       api_key: ${NPM_AUTH_TOKEN}
       on:
         tags: false
+    after_deploy:
+    - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "iofog-controller stop; npm update -g iofogcontroller; iofog-controller start"
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.33",
+	"version": "1.0.34",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",
@@ -41,7 +41,9 @@
 		"postinstall": "node scripts/postinstall.js",
 		"lint": "./node_modules/.bin/eslint \"**/*.js\"",
 		"automatic-release": "automatic-release",
-		"test": "node scripts/test.js",
+		"test": "node scripts/test.js && node scripts/cli-tests.js",
+		"postman_test": "node scripts/postmantest.js",
+		"cli-tests": "node scripts/cli-tests.js",
 		"coverage": "node scripts/coverage.js"
 	},
 	"preferGlobal": true,
@@ -80,7 +82,9 @@
 		"qs": "^6.5.2",
 		"child_process": "^1.0.2",
 		"os": "^0.1.1",
-		"semver": "^5.6.0"
+		"semver": "^5.6.0",
+		"newman": "^4.3.1",
+		"@sentry/node": "^4.5.0"
 	},
 	"devDependencies": {
 		"automatic-release": "^1.1.1",
@@ -92,6 +96,7 @@
 		"mocha": "^5.2.0",
 		"nyc": "^13.1.0",
 		"sinon": "^7.1.1",
-		"sinon-chai": "^3.2.0"
+		"sinon-chai": "^3.2.0",
+		"newman": "^4.3.1"
 	}
 }
@@ -0,0 +1,32 @@
+/*
+ *  *******************************************************************************
+ *  * Copyright (c) 2018 Edgeworx, Inc.
+ *  *
+ *  * This program and the accompanying materials are made available under the
+ *  * terms of the Eclipse Public License v. 2.0 which is available at
+ *  * http://www.eclipse.org/legal/epl-2.0
+ *  *
+ *  * SPDX-License-Identifier: EPL-2.0
+ *  *******************************************************************************
+ *
+ */
+ 
+ const newman = require('newman');
+ 
+// call newman.run to pass `options` object and wait for callback
+newman.run({
+    collection: require('../test/postman_collection.json'),
+    reporters: 'cli',
+    //abortOnError: true,
+    //abortOnFailure: true
+}).on('start', function (err, args) { // on start of run, log to console
+    console.log('running a collection...');
+}).on('done', function (err, summary) {
+    if (err || summary.error || summary.run.failures.length != 0) {
+        console.error('collection run encountered an error. tests did not pass.');
+        process.exitCode = 1;
+    }
+    else {
+        console.log('collection run completed.');
+    }
+});
@@ -18,6 +18,8 @@ const CatalogItemService = require('../services/catalog-service');
 const fs = require('fs');
 const AppHelper = require('../helpers/app-helper');
 const AuthDecorator = require('../decorators/cli-decorator');
+const Errors = require('../helpers/errors');
+const ErrorMessages = require('../helpers/error-messages');
 
 const JSON_SCHEMA = AppHelper.stringifyCliJsonSchema({
   name: "string",
@@ -214,41 +216,38 @@ const _createCatalogItem = async function (obj, user) {
     ? JSON.parse(fs.readFileSync(obj.file, 'utf8'))
     : _createCatalogItemObject(obj);
 
-  logger.info(JSON.stringify(item));
-
-  const result = await CatalogItemService.createCatalogItem(item, user);
-  logger.info(JSON.stringify(result));
-  logger.info('Catalog item has been created successfully.');
+  const catalogItemIdObject = await CatalogItemService.createCatalogItem(item, user);
+  logger.info(JSON.stringify({
+    id: catalogItemIdObject.id
+  }, null, 2));
 };
 
 const _updateCatalogItem = async function (obj) {
   const item = obj.file
     ? JSON.parse(fs.readFileSync(obj.file, 'utf8'))
     : _createCatalogItemObject(obj);
 
-  logger.info('Item id: ' + obj.itemId);
-  logger.info(JSON.stringify(item));
+  if (obj.itemId === undefined) {
+    throw new Errors.NotFoundError(ErrorMessages.CATALOG_UPDATE_REQUIRES_ID);
+  }
+
   await CatalogItemService.updateCatalogItem(obj.itemId, item, {}, true);
   logger.info('Catalog item has been updated successfully.');
 };
 
 const _deleteCatalogItem = async function (obj) {
-  logger.info(JSON.stringify(obj));
   await CatalogItemService.deleteCatalogItem(obj.itemId, {}, true);
   logger.info('Catalog item has been removed successfully');
 };
 
 const _listCatalogItems = async function () {
   const result = await CatalogItemService.listCatalogItems({}, true);
   logger.info(JSON.stringify(result, null, 2));
-  logger.info('Catalog items have been successfully retrieved.');
 };
 
 const _listCatalogItem = async function (obj) {
-  logger.info(JSON.stringify(obj));
   const result = await CatalogItemService.getCatalogItem(obj.itemId, {}, true);
   logger.info(JSON.stringify(result, null, 2));
-  logger.info('Catalog item has been successfully retrieved.');
 };
 
 const _createCatalogItemObject = function (catalogItem) {
 
@@ -127,10 +127,8 @@ async function _executeCase(commands, commandName, f, isUserRequired) {
 
 async function _createConnector(obj) {
   const connector = _createConnectorObject(obj);
-  logger.info(JSON.stringify(connector));
   try {
-    const result = await ConnectorService.createConnector(connector);
-    logger.info(JSON.stringify(result));
+    await ConnectorService.createConnector(connector);
     logger.info('Connector has been created successfully.');
   } catch (e) {
     logger.info(e.message)
@@ -139,7 +137,6 @@ async function _createConnector(obj) {
 
 async function _updateConnector(obj) {
   const connector = _createConnectorObject(obj);
-  logger.info(JSON.stringify(connector));
   try {
     await ConnectorService.updateConnector(connector);
     logger.info('Connector has been updated successfully.');
@@ -150,7 +147,6 @@ async function _updateConnector(obj) {
 
 async function _deleteConnector(obj) {
   const connector = _createConnectorObject(obj);
-  logger.info(JSON.stringify(connector));
   try {
     await ConnectorService.deleteConnector(connector);
     logger.info('Connector has been removed successfully.');
@@ -162,7 +158,6 @@ async function _deleteConnector(obj) {
 async function _getConnectorList() {
   const list = await ConnectorService.getConnectorList();
   logger.info(JSON.stringify(list, null, 2));
-  logger.info('Connector list has been gotten successfully');
 }
 
 function _createConnectorObject(cliData) {
 
@@ -126,17 +126,13 @@ const _executeCase = async function (diagnosticCommand, commandName, f, isUserRe
 };
 
 const _changeMicroserviceStraceState = async function (obj) {
-  logger.info(JSON.stringify(obj));
-
   const isEnable = AppHelper.validateBooleanCliOptions(obj.enable, obj.disable);
   await DiagnosticService.changeMicroserviceStraceState(obj.microserviceUuid, {enable: isEnable}, {}, true);
   const msg = isEnable ? 'Microservice strace has been enabled' : 'Microservice strace has been disabled';
   logger.info(msg);
 };
 
 const _getMicroserviceStraceData = async function (obj) {
-  logger.info(JSON.stringify(obj));
-
   const result = await DiagnosticService.getMicroserviceStraceData(obj.microserviceUuid, {format: obj.format}, {}, true);
   logger.info('Strace data:');
   logger.info('=============================');
@@ -145,22 +141,16 @@ const _getMicroserviceStraceData = async function (obj) {
 };
 
 const _postMicroserviceStraceDataToFtp = async function (obj) {
-  logger.info(JSON.stringify(obj));
-
   await DiagnosticService.postMicroserviceStraceDatatoFtp(obj.microserviceUuid, obj, {}, true);
-  logger.info('Strace data has been posted to ftp successfully.');
+  logger.info('Strace data has been posted to FTP successfully.');
 };
 
 const _postMicroserviceImageSnapshotCreate = async function (obj) {
-  logger.info(JSON.stringify(obj));
-
   await DiagnosticService.postMicroserviceImageSnapshotCreate(obj.microserviceUuid, {}, true);
   logger.info('Microservice image snapshot has been created successfully.');
 };
 
 const _getMicroserviceImageSnapshot = async function (obj) {
-  logger.info(JSON.stringify(obj));
-
   const filePath = await DiagnosticService.getMicroserviceImageSnapshot(obj.microserviceUuid, {}, true);
   logger.info('Microservice images path = ' + filePath);
 };
 
@@ -146,27 +146,24 @@ const _createFlow = async function (flowData, user) {
     ? JSON.parse(fs.readFileSync(flowData.file, 'utf8'))
     : _createFlowObject(flowData);
 
-  logger.info(JSON.stringify(flow));
-
-  await FlowService.createFlow(flow, user, true);
-  logger.info('Flow created successfully.');
+  const createdFlow = await FlowService.createFlow(flow, user, true);
+  logger.info(JSON.stringify({
+    id: createdFlow.id
+  }, null, 2));
 };
 
 const _updateFlow = async function (flowData) {
   const flow = flowData.file
     ? JSON.parse(fs.readFileSync(flowData.file, 'utf8'))
     : _createFlowObject(flowData);
 
-  logger.info(JSON.stringify(flow));
   const flowId = flowData.flowId;
 
   await FlowService.updateFlow(flow, flowId, {}, true);
   logger.info('Flow updated successfully.');
 };
 
 const _deleteFlow = async function (flowData) {
-  logger.info(JSON.stringify(flowData));
-
   const flowId = flowData.flowId;
 
   await FlowService.deleteFlow(flowId, {}, true);
@@ -176,17 +173,13 @@ const _deleteFlow = async function (flowData) {
 const _getAllFlows = async function () {
   const flows = await FlowService.getAllFlows(true);
   logger.info(JSON.stringify(flows, null, 2));
-  logger.info('All flows have been retrieved successfully.');
 };
 
 const _getFlow = async function (flowData) {
-  logger.info(JSON.stringify(flowData));
-
   const flowId = flowData.flowId;
 
   const flow = await FlowService.getFlowWithTransaction(flowId, {}, true);
   logger.info(JSON.stringify(flow, null, 2));
-  logger.info(`Flow with id ${flowId} has been retrieved successfully.`)
 };
 
 function _createFlowObject(data) {
 
@@ -24,9 +24,16 @@ const Microservice = require('./microservice');
 const Registry = require('./registry');
 const Controller = require('./controller');
 const Diagnostics = require('./diagnostics');
+const packageJson = require('./../../package');
 
 const constants = require('../helpers/constants');
 
+const Sentry = require('@sentry/node');
+Sentry.init({ dsn: 'https://[email protected]/1378606' });
+Sentry.configureScope(scope => {
+  scope.setExtra('version', packageJson.version);
+});
+
 class Cli extends BaseCLIHandler {
   constructor() {
     super();