Release 1.0.36 (#534)

* Master - Develop merge (#520) * Issues with update/delete system microservices CLI and API (#521) * fix cli issues with /update/delete system microservices * fix according team solution * Update default.json * Update development.json * Update production.json * fix remove of not running system microservices * fix formating after merge from develop * fix code review comment * fix code review comment * feat(tracking): add tracking for some events (ENG-429) * feat(core) added seed with catalog item for logging microservice (ENG-194) * bug(fix): improve validation for parameters with type "number" (ENG-546) (#525) * bug(fix): improve validation for parameters with type "number" (ENG-546) * bug(fix): fix for types (ENG-546) * bug(fix): seconf fix type float (ENG-546) * feat(tracking): add tracking for some events (#527) fix data format Closes ENG-261 * Add Ian's improvements: integration for slack (#522) * add Ian's improvements * update to try to fix the TravisCI build * Update .travis.yml * feat(microservices): allow to delete system microservies via cli (#528) Closes ENG-534 * feat(tracking): create temp db for tests (#524) * feat(tracking): create temp db for tests + db backups + refactoring Closes ENG-556 * feat(tracking): create temp db for tests + refactoring + single api script + possibility to call one script from another + postman test start and stop controller api by itself - delete stop and start commands from travis Closes ENG-556 * feat(tracking): create temp db for tests + fix travis. start server on dev_deploy and pre_release Closes ENG-556 * feat(SCRIPTS): create temp db for tests + correct vars' names Closes ENG-556 * pre release version 1.0.36 * Update .travis.yml * Pre-release merge (#531) * feat(catalog): allow update catalog item image without regular fields (#529) * feat(catalog): allow update catalog item image without regular fields + fix createOrUpdate for catalogItemManager (create didn't work) Closes ENG-622 * feat(catalog): allow update catalog item image without regular fields + fix tests Closes ENG-622 * Maksimchepelev/fetaure cli validation ENG-546 (#530) * feat(cli): add correct validation for cli + args parsing using Mar of <arg, values> + throw error if value for number arg not provided or string was provided: `--number_arg string` or `--number_arg` - validation of number type (integer/float) because there is no info about type in help * feat(cli): add correct validation for cli + float/integer validation +- number -> float/integer in cli help * feat(cli): add correct validation for cli +- correct regexp for parsing cli * feat(cli): add correct validation for cli +- correct Integer and Float types +- fix some problems Closes ENG-621 * fixes for release (#533) * feat(catalog): allow update catalog item image without regular fields (#529) * feat(catalog): allow update catalog item image without regular fields + fix createOrUpdate for catalogItemManager (create didn't work) Closes ENG-622 * feat(catalog): allow update catalog item image without regular fields + fix tests Closes ENG-622 * Maksimchepelev/fetaure cli validation ENG-546 (#530) * feat(cli): add correct validation for cli + args parsing using Mar of <arg, values> + throw error if value for number arg not provided or string was provided: `--number_arg string` or `--number_arg` - validation of number type (integer/float) because there is no info about type in help * feat(cli): add correct validation for cli + float/integer validation +- number -> float/integer in cli help * feat(cli): add correct validation for cli +- correct regexp for parsing cli * feat(cli): add correct validation for cli +- correct Integer and Float types +- fix some problems Closes ENG-621 * Maksimchepelev/bugs (#532) * feat(cli): delete unnecessary output - delete status code and port mapping id output Closes ENG-621 * fix(microservice): add internal port validation in remove port mapping Closes ENG-623
eclipse-iofog · Feb 7, 2019 · 2ec10d9 · 2ec10d9
1 parent bdd9961
commit 2ec10d9
Show file tree

Hide file tree

Showing 54 changed files with 1,271 additions and 322 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@ Thank you for your contribution!
 Code of Conduct: https://iofog.org/docs/contributing/code-of-conduct.html
 -->
 
-- [ ] Does the iofog.org or README.md documentation need to change?
+- Does the iofog.org or README.md documentation need to change?
   - [ ] Yes <!-- include PR link -->
   - [ ] No
 

diff --git a/.travis.yml b/.travis.yml
@@ -5,14 +5,11 @@ notifications:
   email: false
   slack:
     rooms:
-      - secure: T6GjQi6ap7dvARwdxo619XBUO8aXyzeP4wB8LRpnLKgDQtd+EVw3hwMcHEB7C5+KBC9D0LE0i5HjnLKj2T9ih1L1zKM0QDYFVO8jTt+zhWbEs9Famdq0kmfGiTCbiVG/vxr+9bvFF4QkFhzK8kV44uyqZkmQrHuFnrCpJivsg7dsqvxZ6iU3FV1lMOLU0SJTBHwjbVnIOEqbYcbXmuBJerLMqU7kSlGdlDgBMX8xnzPo/Ccqft+CHDSEl5XU2RZZo2kGSBApO0jpfl1r+7LzWBiwHbuIkFAR5/bVecyuCRpRB4EGEXD7cxCeNUHYjvdr/vaJwTCiPspvSOkJv5YDWgGl7V3WtCV0oPDcQGOU844nHxUTp9FPCQ1bfsPqJ13tCHgv177/Oku3xH22ex6rgTBI6kkVqP3QWTgVtRW91opaKLeBM0ZigQyxQ/hUvQKsMmXzqDrWELG2CuXt2cnNBQ5Hw9wvzEdyY/T4mkXHlbd1UMJ0PUuaymICusfzcErTTnNeByTDkSjrd4dudQtH3jg+Vn3BSQ1R1U1T6DdUhkV75tt37Ej/cbL9ZN8iey7gqx0N3nzqXA0JsBAsJspjCOZWZ0ODdI2XP9FiD+4TUj+HTBgwHtx5kUqf2uuGlKX0S74zN/RjEmHa2riviW3IVur16Vf33U8oiwY+ilht0Zo=
+      - secure: amP0nLt6NoTtatbxzq1DXpkyVWCmwasGVrzwtyeTEkz/A4H8rA6nAOHdBIIiIVBySaTBVpR2uar9MFWTVy7kWuzRDnBLlkjuXia0Paykv9ENf8CysW0bddhRZNz0zp3SKjjCUCPXe5bmEszQjGKCBOj2XJrkpdnYQdk0L+AqNMGcI2xhu8/RSlww6Ld7OsnkvDyVvOnriclXinZu3V3f6mY7GuXcRva/qowIE8RMGmH70DPBOkCbo7D8g6WtGXcT7sgJVsTOiqPknmQRHJcHi9d55J1fr2cRNRxOCi3pz6B8jwx9BLxKbSttEAO9r9634/Yx6GByE8JaidgVkIm6OTvi6fkCHZZWJGgyxRke/EOOjhdMHSuhVQtBX6RQ4ADRs4Ja4+g9EplXsPaxY4KI7E5jV0HuBn5M7m8RrZ2npP36kqc5/T87tDrocQVKTw5TxYiHUh2GHVw90eA5XFS5eYxT/Ts39n+Jk0CznBQsV47xcUi78OdajP8dAHu/6uC8+xTuN3A00KodH+8H0rQIq6GemMF9FbqRZDjb5ouGu5sI2aiTamKomn1XkBQkDkkrRXLbFg1xfG2XwQHuT7+rBrLqc9QSS+55hz3YDoHvs2EGoYjHLbs/5N25V24LbFJfbg1dF5PxVQ4L58NR5A23zNduElWgzsME8UDtgT9/lac=
     on_success: always
     on_failure: always
     template:
-    - Repo `%{repository_slug}` *%{result}* build (<%{build_url}|#%{build_number}>)
-      for commit (<%{compare_url}|%{commit}>) on branch `%{branch}`.
-    - 'Execution time: *%{duration}*'
-    - 'Message: %{message}'
+      - "Build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}>) of %{repository_slug}@%{branch} in PR <%{pull_request_url}|#%{pull_request_number}> by %{author} %{result} in %{duration}"
 stages:
 - name: build
   if: type = pull_request
@@ -28,18 +25,21 @@ jobs:
   - 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; npm test; NODE_ENV=production node src/main.js start; npm run postman_test"
+    - 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; npm run postman_test; NODE_ENV=production node src/main.js start;"
   - stage: pre_release
     before_install:
     - sudo apt-get install sshpass
     script: 
-    - 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"
+    - 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 checkout $TRAVIS_BRANCH; npm i;
+      npm test; npm run postman_test; NODE_ENV=production node src/main.js start;"
   - stage: release
     #before_install:
       #- git clone "https://github.com/$TRAVIS_REPO_SLUG.git" "$TRAVIS_REPO_SLUG";
@@ -54,9 +54,10 @@ jobs:
     deploy:
       skip_cleanup: true
       provider: npm
-      email: ${NPM_EMAIL_ADDRESS}
-      api_key: ${NPM_AUTH_TOKEN}
+      email: "${NPM_EMAIL_ADDRESS}"
+      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"
+    - 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"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.35",
+	"version": "1.0.36",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",
@@ -34,17 +34,17 @@
 		"url": "https://github.com/ioFog/Controller"
 	},
 	"scripts": {
-		"start": "node scripts/start.js",
-		"start-dev": "node scripts/start-dev.js",
-		"build": "node scripts/init.js",
-		"preuninstall": "node scripts/preuninstall.js",
-		"postinstall": "node scripts/postinstall.js",
+		"start": "node scripts/scripts-api.js start",
+		"start-dev": "node scripts/scripts-api.js start-dev",
+		"build": "node scripts/scripts-api.js init",
+		"preuninstall": "node scripts/scripts-api.js preuninstall",
+		"postinstall": "node scripts/scripts-api.js postinstall",
 		"lint": "./node_modules/.bin/eslint \"**/*.js\"",
 		"automatic-release": "automatic-release",
-		"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"
+		"test": "node scripts/scripts-api.js test",
+		"postman_test": "node scripts/scripts-api.js postmantest",
+		"cli-tests": "node scripts/scripts-api.js cli-tests",
+		"coverage": "node scripts/scripts-api.js coverage"
 	},
 	"preferGlobal": true,
 	"bin": {

diff --git a/scripts/cli-tests.js b/scripts/cli-tests.js
@@ -12,6 +12,8 @@
  */
 
 const execSync = require('child_process').execSync;
+const {init} = require('./init');
+const {restoreDBs, backupDBs} = require('./util');
 
 const options = {
   env: {
@@ -394,27 +396,41 @@ function responseContains(response, expectedResponsePart) {
   }
 }
 
-try {
-  testControllerSection();
-  testUserSection();
-  testConfigSection();
-  testConnectorSection();
-  testTunnelSection();
-  testIoFogSection();
-  testCatalogSection();
-  testFlowSection();
-  testMicroserviceSection();
-  testRegistrySection();
-  testDiagnosticsSection();
-} catch (exception) {
-  console.log("\nException during execution: ");
-  console.error(exception);
-  process.exit(1);
+function cliTest() {
+  try {
+    backupDBs();
+    //create new DBs
+    init();
+
+    testControllerSection();
+    testUserSection();
+    testConfigSection();
+    testConnectorSection();
+    testTunnelSection();
+    testIoFogSection();
+    testCatalogSection();
+    testFlowSection();
+    testMicroserviceSection();
+    testRegistrySection();
+    testDiagnosticsSection();
+
+    restoreDBs();
+  } catch (exception) {
+    restoreDBs();
+
+    console.log("\nException during execution: ");
+    console.error(exception);
+    process.exit(1);
+  }
+
+  if (testsFailed > 0) {
+    console.log("\nFailed tests count: " + testsFailed);
+    process.exit(1);
+  } else {
+    console.log("\nCLI Tests passed successfully.");
+  }
 }
 
-if (testsFailed > 0) {
-  console.log("\nFailed tests count: " + testsFailed);
-  process.exit(1);
-} else {
-  console.log("\nCLI Tests passed successfully.");
-}
+module.exports = {
+  cliTest: cliTest
+};
diff --git a/scripts/coverage.js b/scripts/coverage.js
@@ -13,12 +13,18 @@
 
 const execSync = require('child_process').execSync;
 
-const options = {
-  env: {
-    'NODE_ENV': 'test',
-    "PATH": process.env.PATH
-  },
-  stdio: [process.stdin, process.stdout, process.stderr]
-};
+function coverage() {
+  const options = {
+    env: {
+      'NODE_ENV': 'test',
+      "PATH": process.env.PATH
+    },
+    stdio: [process.stdin, process.stdout, process.stderr]
+  };
 
-execSync('nyc mocha', options);
+  execSync('nyc mocha', options);
+}
+
+module.exports = {
+  coverage: coverage
+};
diff --git a/scripts/init.js b/scripts/init.js
@@ -13,12 +13,19 @@
 
 const execSync = require('child_process').execSync;
 
-const options = {
-  env: {
-    'NODE_ENV': 'production',
-    "PATH": process.env.PATH
-  },
-  stdio: [process.stdin, process.stdout, process.stderr]
-};
 
-execSync('node ./src/main.js init', options);
+function init() {
+  const options = {
+    env: {
+      'NODE_ENV': 'production',
+      "PATH": process.env.PATH
+    },
+    stdio: [process.stdin, process.stdout, process.stderr]
+  };
+
+  execSync('node ./src/main.js init', options);
+}
+
+module.exports = {
+  init: init
+};
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
@@ -16,89 +16,49 @@ const execSync = require('child_process').execSync;
 const fs = require('fs');
 const semver = require('semver');
 const currentVersion = require('../package').version;
+const {restoreDBs, restoreConfigs, INSTALLATION_VARIABLES_FILE} = require('./util');
 
-const rootDir = `${__dirname}/..`;
-let installationVariablesFileName = 'iofogcontroller_install_variables';
-let tempDir = getTempDirLocation();
-const installationVariablesFile = tempDir + '/' + installationVariablesFileName;
-
+function postinstall() {
 //restore all files
-const devDbBackup = `${tempDir}/dev_database.sqlite`;
-const devDb = `${rootDir}/src/sequelize/dev_database.sqlite`;
-moveFileIfExists(devDbBackup, devDb);
-
-const prodDbBackup = `${tempDir}/prod_database.sqlite`;
-const prodDb = `${rootDir}/src/sequelize/prod_database.sqlite`;
-moveFileIfExists(prodDbBackup, prodDb);
-
-const defConfigBackup = `${tempDir}/default_iofog_backup.json`;
-const defConfig = `${rootDir}/src/config/default.json`;
-moveFileIfExists(defConfigBackup, defConfig);
-
-const prodConfigBackup = `${tempDir}/production_iofog_backup.json`;
-const prodConfig = `${rootDir}/src/config/production.json`;
-moveFileIfExists(prodConfigBackup, prodConfig);
-
-const devConfigBackup = `${tempDir}/development_iofog_backup.json`;
-const devConfig = `${rootDir}/src/config/development.json`;
-moveFileIfExists(devConfigBackup, devConfig);
+  restoreDBs();
+  restoreConfigs();
 
 //process migrations
-try {
-  const installationVarsStr = fs.readFileSync(installationVariablesFile);
-  const installationVars = JSON.parse(installationVarsStr);
-  const prevVersion = installationVars.prevVer;
-
-  console.log(`previous version - ${prevVersion}`);
-  console.log(`new version - ${currentVersion}`);
-
-  if (semver.satisfies(prevVersion, '<=1.0.0')) {
-    console.log('upgrading from version <= 1.0.0 :');
-    insertSeeds();
-  }
-
-  if (semver.satisfies(prevVersion, '<=1.0.30')) {
-    console.log('upgrading from version <= 1.0.30 :');
-    updateEncryptionMethod();
-  }
-
-  fs.unlinkSync(installationVariablesFile);
-} catch (e) {
-  console.log('no previous version');
-}
+  try {
+    const installationVarsStr = fs.readFileSync(INSTALLATION_VARIABLES_FILE);
+    const installationVars = JSON.parse(installationVarsStr);
+    const prevVersion = installationVars.prevVer;
 
-//init db
-const options = {
-  env: {
-    'NODE_ENV': 'production',
-    "PATH": process.env.PATH
-  },
-  stdio: [process.stdin, process.stdout, process.stderr]
-};
+    console.log(`previous version - ${prevVersion}`);
+    console.log(`new version - ${currentVersion}`);
 
-execSync('node ./src/main.js init', options);
+    if (semver.satisfies(prevVersion, '<=1.0.0')) {
+      console.log('upgrading from version <= 1.0.0 :');
+      insertSeeds();
+    }
 
-//other functions definitions
+    if (semver.satisfies(prevVersion, '<=1.0.30')) {
+      console.log('upgrading from version <= 1.0.30 :');
+      updateEncryptionMethod();
+    }
 
-function getTempDirLocation() {
-  let tempDir;
-  if (os.type() === 'Linux') {
-    tempDir = '/tmp';
-  } else if (os.type() === 'Darwin') {
-    tempDir = '/tmp';
-  } else if (os.type() === 'Windows_NT') {
-    tempDir = `${process.env.APPDATA}`;
-  } else {
-    throw new Error("Unsupported OS found: " + os.type());
+    fs.unlinkSync(INSTALLATION_VARIABLES_FILE);
+  } catch (e) {
+    console.log('no previous version');
   }
-  return tempDir;
-}
 
-function moveFileIfExists(from, to) {
-  if (fs.existsSync(from)) {
-    fs.renameSync(from, to);
-  }
+//init db
+  const options = {
+    env: {
+      'NODE_ENV': 'production',
+      "PATH": process.env.PATH
+    },
+    stdio: [process.stdin, process.stdout, process.stderr]
+  };
+
+  execSync('node ./src/main.js init', options);
 }
+//other functions definitions
 
 function insertSeeds() {
   console.log('    inserting seeds meta info in db');
@@ -189,4 +149,8 @@ function updateEncryptionMethod() {
   updateEncryptionMethodForEmailService(defConfig, decryptTextVer30);
   updateEncryptionMethodForEmailService(devConfig, decryptTextVer30);
   updateEncryptionMethodForEmailService(prodConfig, decryptTextVer30);
-}
+}
+
+module.exports = {
+  postinstall: postinstall
+};