@hotglue/cli 1.0.25 → 1.0.27

package/package.json

@@ -1,28 +1,27 @@
 {
   "name": "@hotglue/cli",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "hotglue CLI tools",
-  "main": "./src/index.js",
-  "module": "./src/index.js",
-  "type": "module",
+  "main": "./lib/mjs/index.js",
+  "module": "./lib/mjs/index.js",
+  "exports": {
+    ".": {
+      "import": "./lib/mjs/index.js",
+      "require": "./lib/cjs/index.js"
+    }
+  },
   "bin": {
-    "hotglue": "./lib/esm/index.js"
+    "hotglue": "./lib/mjs/index.js"
   },
   "files": [
-    "lib"
+    "lib/*"
   ],
+  "type": "module",
   "scripts": {
-    "build": "npm run build-basic && npm run build-bin && npm run build-esbuild",
-    "build-basic": "npm run build-clean && babel src -d lib",
-    "build-clean": "rm -rf ./lib/",
-    "build-bin": "chmod +x ./lib/index.js",
-    "build-bundle": "node scripts/build.js",
-    "build-extra": "npm run build-bin && npm run build-assets",
-    "build-assets": "cp -R ./src/assets ./lib/",
-    "build-esbuild": "esbuild ./src --bundle --platform=node --outfile=./lib/esm/index.js --format=esm --external:./node_modules/*",
+    "build": "rollup -c rollup.config.js && npm run chmodit",
+    "chmodit": "chmod +x ./bin/hotglue",
     "lint": "eslint src",
-    "pretty": "prettier src --write",
-    "auto-build": "nodemon --watch . --ignore lib --exec npm run build"
+    "pretty": "prettier src --write"
   },
   "repository": {
     "type": "git",
@@ -60,17 +59,17 @@
     "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.7",
-    "@babel/core": "^7.16.7",
-    "@babel/preset-env": "^7.16.7",
-    "@babel/register": "^7.16.7",
+    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-terser": "^0.4.4",
     "@types/async": "^3.2.24",
     "esbuild": "^0.14.13",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "nodemon": "^2.0.15",
-    "prettier": "^2.5.1"
+    "prettier": "^2.5.1",
+    "rollup": "^4.24.0"
   },
   "esm": {
     "mode": "auto",

package/lib/commands/config/index.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.config = void 0;
-
-var set = _interopRequireWildcard(require("./set.js"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-const config = [set];
-exports.config = config;

package/lib/commands/config/set.js

@@ -1,82 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handler = exports.desc = exports.command = exports.builder = void 0;
-
-var _debug = _interopRequireDefault(require("../../helpers/debug.js"));
-
-var _yaml = _interopRequireDefault(require("yaml"));
-
-var _cliTable = _interopRequireDefault(require("cli-table"));
-
-var _config = require("../../helpers/config.js");
-
-var _print = require("../../helpers/print.js");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const debug = (0, _debug.default)('commands:config:set');
-const command = 'set <setting> <value>';
-exports.command = command;
-const desc = 'Set configuration key-value pairs';
-exports.desc = desc;
-
-const builder = async yargs => {
-  debug('builder', command, yargs);
-  yargs.option('setting', {
-    describe: 'The configuration parameter you wish to set',
-    type: 'string'
-  }).option('value', {
-    describe: "The configuration parameter's value",
-    type: 'string'
-  });
-  return yargs;
-};
-
-exports.builder = builder;
-
-const handler = async argv => {
-  debug('handler', command, argv);
-  const {
-    json,
-    setting,
-    value
-  } = argv;
-  const allowedSettings = ['apikey'];
-
-  if (!allowedSettings.includes(setting)) {
-    json ? (0, _print.printJSON)({
-      status: 'error',
-      error: 'Invalid settings parameter'
-    }) : console.error('Invalid settings parameter'); // throw new Error('Invalid settings parameter');
-
-    return;
-  }
-
-  try {
-    const profileConfig = await (0, _config.getProfileConfig)();
-    if (profileConfig && profileConfig.config) !json && (0, _print.pp)('Updating profile config file...');else !json && (0, _print.pp)('Creating profile config file...');
-    const data = profileConfig && profileConfig.config ? { ...profileConfig.config,
-      [setting]: value
-    } : {
-      [setting]: value
-    };
-
-    const yamlData = _yaml.default.stringify(data);
-
-    const filePath = profileConfig && profileConfig.filepath ? profileConfig.filepath : (0, _config.getProfileConfigFilePath)();
-    await (0, _config.writeConfigFile)(filePath, yamlData);
-    json ? (0, _print.printJSON)({
-      status: 'success'
-    }) : (0, _print.pp)('Done').pr();
-  } catch (err) {
-    json ? (0, _print.printJSON)({
-      status: 'error',
-      error: err
-    }) : console.log(err);
-  }
-};
-
-exports.handler = handler;

package/lib/commands/config.js

@@ -1,71 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handler = exports.desc = exports.command = exports.builder = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _debug = _interopRequireDefault(require("../helpers/debug.js"));
-
-var _yaml = _interopRequireDefault(require("yaml"));
-
-var _cliTable = _interopRequireDefault(require("cli-table"));
-
-var _config = require("../helpers/config.js");
-
-var _print = require("../helpers/print.js");
-
-var _index = require("./config/index.js");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const debug = (0, _debug.default)('commands:config');
-const command = 'config [action]';
-exports.command = command;
-const desc = 'Configure your hotglue CLI';
-exports.desc = desc;
-
-const builder = async function (yargs) {
-  debug('builder', command);
-  return yargs.command(_index.config);
-};
-
-exports.builder = builder;
-
-const handler = async function (argv) {
-  debug('handler', command, argv);
-  const {
-    action
-  } = argv; // implement using yarg default command
-
-  if (!action) {
-    try {
-      const profileConfig = await (0, _config.getProfileConfig)();
-
-      if (!profileConfig.config || Object.keys(profileConfig.config).length === 0) {
-        (0, _print.pr)('No profile configuration found. Run config set to configure the hotglue CLI.');
-      }
-
-      const table = new _cliTable.default({
-        head: ['Setting', 'Value', 'Config File', 'Type']
-      });
-      if (profileConfig.config) Object.entries(profileConfig.config).forEach(([k, v]) => table.push([k, v, profileConfig.filepath, `Profile`]));
-      const projectConfig = await (0, _config.getProjectConfig)();
-      if (projectConfig.config) Object.entries(projectConfig.config).forEach(([k, v]) => table.push([k, v, _path.default.relative(process.cwd(), projectConfig.filepath), 'Project']));
-
-      if (table.length > 0) {
-        // pr('CURRENT CONTEXT SETTINGS');
-        console.log(table.toString()); // console.log(YAML.stringify(fileConfig.config));
-      } // pr('The configuration file is empty. Run config set to configure the hotglue CLI.');
-
-    } catch (err) {
-      // log elsewhere
-      console.log(err);
-      throw err;
-    }
-  }
-};
-
-exports.handler = handler;

package/lib/commands/env/deploy.js

@@ -1,162 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handler = exports.desc = exports.command = exports.builder = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _promises = require("fs/promises");
-
-var _debug = _interopRequireDefault(require("../../helpers/debug.js"));
-
-var _ora = _interopRequireDefault(require("ora"));
-
-var _axios = _interopRequireDefault(require("axios"));
-
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
-
-var _cliTable = _interopRequireDefault(require("cli-table"));
-
-var _descriptions = _interopRequireDefault(require("../../helpers/descriptions.js"));
-
-var _utils = require("../../helpers/utils.js");
-
-var _print = require("../../helpers/print.js");
-
-var _api = require("../../helpers/api.js");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// import logUpdate from 'log-update';
-const debug = (0, _debug.default)('commands:env:deploy');
-const command = 'deploy';
-exports.command = command;
-const desc = 'Deploy Environment settings';
-exports.desc = desc;
-
-const builder = async yargs => {
-  debug('builder', command);
-  return yargs.option('sourceFolder', _descriptions.default.options['sourceFolder'].config).demandOption('sourceFolder', _descriptions.default.options['sourceFolder'].demandText);
-};
-
-exports.builder = builder;
-
-const handler = async argv => {
-  debug('handler', command, argv);
-  const {
-    hg,
-    json,
-    apikey,
-    env,
-    sourceFolder
-  } = argv;
-  const {
-    clientApiBaseUri
-  } = hg;
-
-  const folderPrefix = _path.default.resolve(process.cwd(), sourceFolder);
-
-  let message;
-  let spinner = (0, _ora.default)();
-
-  try {
-    // 1. build list of deployable files
-    message = (0, _print.themed)(`Scanning ${(0, _print.themed)(folderPrefix, 'info')} for deployable files`);
-    !json && spinner.start((0, _print.themed)(`In progress: ${message}...`, 'secondary'));
-    const deployableFiles = await (0, _utils.getFolderFiles)(folderPrefix, {
-      filter: {
-        pattern: '((**/requirements.txt)|(**/availableSources.json)|(**/availableTargets.json)|(**/availableConnectors.json))'
-      }
-    });
-
-    if (deployableFiles.length === 0) {
-      if (json) {
-        (0, _print.printJSON)({
-          status: 'error',
-          error: 'There are no files to deploy at the specified location!'
-        });
-      } else {
-        spinner.fail((0, _print.themed)(`Error: ${message}.`, 'secondary'));
-        (0, _print.pr)((0, _print.themed)(`Message: ${(0, _print.themed)('There are no files to deploy at the specified location!')}`, 'secondary'));
-      }
-
-      return;
-    }
-
-    !json && spinner.succeed((0, _print.themed)(`Finished: ${message}.`, 'secondary')); // 2. get STS credentials
-
-    message = (0, _print.themed)(`Verifying user and authorizing`);
-    !json && spinner.start((0, _print.themed)(`In progress: ${message}...`, 'secondary'));
-    const {
-      accessKeyId,
-      secretAccessKey,
-      sessionToken
-    } = await (0, _api.genCredentialsOnClientApi)({
-      debug,
-      baseUri: clientApiBaseUri,
-      task: 'env-deploy',
-      env,
-      apikey
-    });
-    !json && spinner.succeed((0, _print.themed)(`Finished: ${message}.`, 'secondary')); // create authenticated S3 instance
-
-    const s3 = new _awsSdk.default.S3({
-      accessKeyId,
-      secretAccessKey,
-      sessionToken
-    }); // 3. upload new files
-
-    message = (0, _print.themed)(`Deploying environment files`);
-    !json && spinner.info((0, _print.themed)(`Info: ${message}.`, 'secondary'));
-    const rootKey = `config/`;
-    const table = new _cliTable.default({
-      head: ['File', 'Status']
-    });
-
-    for await (const file of deployableFiles) {
-      const filename = _path.default.basename(file);
-
-      message = (0, _print.themed)(`Pushing file: ${(0, _print.themed)(filename, 'info')}`);
-      !json && spinner.start((0, _print.themed)(`In progress: ${message}...`, 'secondary'));
-      const readBuffer = await (0, _promises.readFile)(file);
-      const params = {
-        Bucket: env,
-        Key: `${rootKey}${filename}`,
-        Body: readBuffer
-      };
-      const res = await s3.putObject(params).promise();
-      !json && spinner.succeed((0, _print.themed)(`Finished: ${message}.`, 'secondary'));
-      debug('s3-put-res', res);
-      table.push([filename, 'Deployed']); // handling redis change
-
-      await (0, _api.resetAvailableEntities)({
-        debug,
-        baseUri: clientApiBaseUri,
-        env,
-        apiKey: apikey
-      });
-    }
-
-    if (json) {
-      (0, _print.printJSON)({
-        status: 'success',
-        deployedFiles: deployableFiles
-      });
-    } else {
-      // print results
-      (0, _print.cl)(table.toString());
-    }
-  } catch (err) {
-    !json && spinner.fail((0, _print.themed)(`Error: ${message}.`, 'secondary'));
-    (0, _print.pr)((0, _print.themed)(`Message: ${(0, _print.themed)(err.message)}`, 'secondary'));
-    debug(err);
-
-    if (err && err.response && err.response.data) {
-      debug('response', err.response.data);
-    }
-  }
-};
-
-exports.handler = handler;

package/lib/commands/env/download.js

@@ -1,169 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handler = exports.desc = exports.command = exports.builder = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _promises = require("fs/promises");
-
-var _debug = _interopRequireDefault(require("../../helpers/debug.js"));
-
-var _ora = _interopRequireDefault(require("ora"));
-
-var _axios = _interopRequireDefault(require("axios"));
-
-var _cliTable = _interopRequireDefault(require("cli-table"));
-
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
-
-var _descriptions = _interopRequireDefault(require("../../helpers/descriptions.js"));
-
-var _print = require("../../helpers/print.js");
-
-var _utils = require("../../helpers/utils.js");
-
-var _api = require("../../helpers/api.js");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const debug = (0, _debug.default)('commands:env:download');
-const command = 'download';
-exports.command = command;
-const desc = 'Download Environment settings';
-exports.desc = desc;
-
-const builder = async yargs => {
-  debug('builder', command); // hotglue environment download -e <env> -o -d downloads
-
-  return yargs.option('downloadTo', _descriptions.default.options['downloadTo'].config); // .option('overwrite', descriptions.options['overwrite'].config);
-};
-
-exports.builder = builder;
-
-const handler = async argv => {
-  debug('handler', command, argv);
-  const {
-    hg,
-    json,
-    apikey,
-    env,
-    downloadTo
-  } = argv;
-  const {
-    clientApiBaseUri
-  } = hg;
-
-  const folderPrefix = _path.default.resolve(process.cwd(), downloadTo);
-
-  let message;
-  let spinner = (0, _ora.default)();
-
-  try {
-    // 1. get STS credentials
-    message = (0, _print.themed)(`Verifying user and authorizing`);
-    !json && spinner.start((0, _print.themed)(`In progress: ${message}...`, 'secondary'));
-    const {
-      accessKeyId,
-      secretAccessKey,
-      sessionToken
-    } = await (0, _api.genCredentialsOnClientApi)({
-      debug,
-      baseUri: clientApiBaseUri,
-      task: 'env-download',
-      env,
-      apikey
-    });
-    !json && spinner.succeed((0, _print.themed)(`Finished: ${message}.`, 'secondary')); // create authenticated S3 instance
-
-    const s3 = new _awsSdk.default.S3({
-      accessKeyId,
-      secretAccessKey,
-      sessionToken
-    }); // 2. get list of files from AWS bucket
-
-    message = (0, _print.themed)(`Scanning environment ${(0, _print.themed)(env, 'info')}`);
-    !json && spinner.start((0, _print.themed)(`In progress: ${message}...`, 'secondary'));
-    const params = {
-      Bucket: env,
-      Prefix: `config/`
-    };
-    const {
-      Contents: s3Files
-    } = await s3.listObjectsV2(params).promise();
-    !json && spinner.succeed((0, _print.themed)(`Finished: ${message}.`, 'secondary'));
-    debug('s3-files', s3Files); // 3. filter only downloadable files
-
-    const filesToDownload = s3Files ? (0, _utils.filterFiles)(s3Files.map(item => item.Key), {
-      pattern: '((*/requirements.txt)|(*/availableSources.json)|(*/availableTargets.json)|(*/availableConnectors.json))'
-    }) : [];
-
-    if (!filesToDownload || filesToDownload.length === 0) {
-      json ? (0, _print.printJSON)({
-        status: 'success',
-        downloadedFiles: []
-      }) : spinner.warn((0, _print.themed)(`Warning: ${(0, _print.themed)('Nothing to download!')}`, 'secondary'));
-      return;
-    } // 4. download environment config files
-
-
-    message = (0, _print.themed)(`Downloading to ${(0, _print.themed)(folderPrefix, 'info')}`);
-    !json && spinner.info((0, _print.themed)(`Info: ${message}.`, 'secondary'));
-    const table = new _cliTable.default({
-      head: ['File', 'Status']
-    });
-
-    for await (const item of filesToDownload) {
-      // create destination folder
-      const filename = _path.default.basename(item);
-
-      const fullPath = _path.default.resolve(folderPrefix, filename);
-
-      debug('local-file', fullPath); // ensure destination folder exists
-
-      await (0, _promises.mkdir)(_path.default.dirname(fullPath), {
-        recursive: true
-      }); // download s3 object into destination folder
-
-      message = (0, _print.themed)(`Downloading file: ${(0, _print.themed)(filename, 'info')}`);
-      !json && spinner.start((0, _print.themed)(`In progress: ${message}...`, 'secondary'));
-      const fileStream = s3.getObject({
-        Bucket: env,
-        Key: item
-      }).createReadStream();
-      await (0, _promises.writeFile)(fullPath, await (0, _utils.streamToString)(fileStream));
-      !json && spinner.succeed((0, _print.themed)(`Finished: ${message}.`, 'secondary')); // debug('downloaded', env + item);
-
-      table.push([filename, 'Downloaded']);
-    }
-
-    if (json) {
-      (0, _print.printJSON)({
-        status: 'success',
-        downloadedFiles: filesToDownload
-      });
-    } else {
-      // print results
-      (0, _print.cl)(table.toString());
-    }
-  } catch (err) {
-    if (json) {
-      (0, _print.printJSON)({
-        status: 'error',
-        error: err
-      });
-    } else {
-      spinner.fail((0, _print.themed)(`Error: ${message}.`, 'secondary'));
-      (0, _print.pr)((0, _print.themed)(`Message: ${(0, _print.themed)(err.message)}`, 'secondary'));
-      debug(err);
-
-      if (err && err.response && err.response.data) {
-        debug('response', err.response.data);
-      }
-    }
-  }
-};
-
-exports.handler = handler;

package/lib/commands/env/index.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.env = void 0;
-
-var deploy = _interopRequireWildcard(require("./deploy.js"));
-
-var download = _interopRequireWildcard(require("./download.js"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-const env = [deploy, download];
-exports.env = env;

package/lib/commands/env.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handler = exports.desc = exports.command = exports.builder = void 0;
-
-var _debug = _interopRequireDefault(require("../helpers/debug.js"));
-
-var _baseBuilder = require("../helpers/baseBuilder.js");
-
-var _index = require("./env/index.js");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const debug = (0, _debug.default)('commands:env');
-const command = 'env <action>';
-exports.command = command;
-const desc = 'Manage environment settings';
-exports.desc = desc;
-
-const builder = async function (yargs) {
-  debug('builder', command);
-  const base = await (0, _baseBuilder.baseApiBuilder)(yargs);
-  return base.command(_index.env);
-};
-
-exports.builder = builder;
-
-const handler = async function (argv) {
-  debug('handler', command, argv);
-};
-
-exports.handler = handler;