clever-tools 3.6.1 → 3.8.0

package/src/models/log-v4.js

@@ -4,6 +4,8 @@ const { Deferred } = require('./utils.js');
 const Logger = require('../logger.js');
 const { waitForDeploymentEnd, waitForDeploymentStart } = require('./deployments.js');
 const { ApplicationLogStream } = require('@clevercloud/client/cjs/streams/application-logs.js');
+const { JsonArray } = require('./json-array.js');
+const ExitStrategy = require('../models/exit-strategy-option.js');
 
 // 2000 logs per 100ms maximum
 const THROTTLE_ELEMENTS = 2000;
@@ -90,15 +92,20 @@ async function watchDeploymentAndDisplayLogs (options) {
     commitId,
     knownDeployments,
     quiet,
-    follow,
     redeployDate,
+    exitStrategy,
   } = options;
 
+  ExitStrategy.plotQuietWarning(exitStrategy, quiet);
   // If in quiet mode, we only log start/finished deployment messages
   !quiet && Logger.println('Waiting for deployment to start…');
   const deployment = await waitForDeploymentStart({ ownerId, appId, deploymentId, commitId, knownDeployments });
   Logger.println(colors.bold.blue(`Deployment started (${deployment.uuid})`));
 
+  if (exitStrategy === 'deploy-start') {
+    return;
+  }
+
   const deferred = new Deferred();
   let logsStream;
 
@@ -120,7 +127,7 @@ async function watchDeploymentAndDisplayLogs (options) {
     deferred.promise,
   ]);
 
-  if (!quiet && !follow) {
+  if (!quiet && exitStrategy !== 'never') {
     logsStream.close(quiet ? 'quiet' : 'follow');
   }
 
@@ -166,30 +173,3 @@ function isBuildSucessMessage (log) {
 };
 
 module.exports = { displayLogs, watchDeploymentAndDisplayLogs };
-
-/**
- * Helper to print a real JSON array with starting `[` and ending `]`
- */
-class JsonArray {
-  constructor () {
-    this._isFirst = true;
-  }
-
-  open () {
-    process.stdout.write('[\n');
-  }
-
-  push (log) {
-    if (this._isFirst) {
-      this._isFirst = false;
-    }
-    else {
-      process.stdout.write(',\n');
-    }
-    process.stdout.write(`  ${JSON.stringify(log)}`);
-  }
-
-  close () {
-    process.stdout.write('\n]');
-  }
-}

package/src/models/log.js

@@ -9,6 +9,7 @@ const { getOldLogs } = require('@clevercloud/client/cjs/api/v2/log.js');
 const { LogsStream } = require('@clevercloud/client/cjs/streams/logs.node.js');
 const { sendToApi, getHostAndTokens } = require('./send-to-api.js');
 const { waitForDeploymentEnd, waitForDeploymentStart } = require('./deployments.js');
+const ExitStrategy = require('../models/exit-strategy-option.js');
 
 function isCleverMessage (line) {
   return line._source.syslog_program === '/home/bas/rubydeployer/deployer.rb';
@@ -100,12 +101,18 @@ async function displayLogs ({ appAddonId, until, since, filter, deploymentId })
   return deferred.promise;
 }
 
-async function watchDeploymentAndDisplayLogs ({ ownerId, appId, deploymentId, commitId, knownDeployments, quiet, follow }) {
+async function watchDeploymentAndDisplayLogs ({ ownerId, appId, deploymentId, commitId, knownDeployments, quiet, exitStrategy }) {
 
+  ExitStrategy.plotQuietWarning(exitStrategy, quiet);
+  // If in quiet mode, we only log start/finished deployment messages
   Logger.println('Waiting for deployment to start…');
   const deployment = await waitForDeploymentStart({ ownerId, appId, deploymentId, commitId, knownDeployments });
   Logger.println(colors.bold.blue(`Deployment started (${deployment.uuid})`));
 
+  if (exitStrategy === 'deploy-start') {
+    return;
+  }
+
   const deferred = new Deferred();
   let logsStream;
 
@@ -127,7 +134,7 @@ async function watchDeploymentAndDisplayLogs ({ ownerId, appId, deploymentId, co
     deferred.promise,
   ]);
 
-  if (!quiet && !follow) {
+  if (!quiet && exitStrategy !== 'never') {
     logsStream.close();
   }
 

package/src/models/namespaces.js

@@ -0,0 +1,20 @@
+const Application = require('./application.js');
+const organisation = require('@clevercloud/client/cjs/api/v2/organisation.js');
+const { sendToApi } = require('./send-to-api.js');
+const { autocomplete } = require('cliparse');
+
+async function getNamespaces (ownerId) {
+  return organisation.getNamespaces({ id: ownerId }).then(sendToApi);
+}
+
+async function completeNamespaces () {
+  // Sadly we do not have access to current params in complete as of now
+  const { ownerId } = await Application.resolveId(null, null);
+
+  return getNamespaces(ownerId).then(autocomplete.words);
+}
+
+module.exports = {
+  getNamespaces,
+  completeNamespaces,
+};

package/src/models/organisation.js

@@ -1,11 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const autocomplete = require('cliparse').autocomplete;
 
-const AppConfig = require('./app_configuration.js');
-
-const organisation = require('@clevercloud/client/cjs/api/v2/organisation.js');
 const { getSummary } = require('@clevercloud/client/cjs/api/v2/user.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
@@ -37,22 +33,6 @@ async function getByName (name) {
   return filteredOrgs[0];
 }
 
-async function getNamespaces (params) {
-  const { alias } = params.options;
-  const { ownerId } = await AppConfig.getAppDetails({ alias });
-
-  return organisation.getNamespaces({ id: ownerId }).then(sendToApi);
-}
-
-function completeNamespaces () {
-  // Sadly we do not have access to current params in complete as of now
-  const params = { options: {} };
-
-  return getNamespaces(params).then(autocomplete.words);
-};
-
 module.exports = {
   getId,
-  getNamespaces,
-  completeNamespaces,
 };

package/src/models/utils.js

@@ -15,4 +15,11 @@ class Deferred {
   }
 }
 
-module.exports = { Deferred };
+function truncateWithEllipsis (length, string) {
+  if (string.length > length - 1) {
+    return string.substring(0, length - 1) + '…';
+  }
+  return string;
+}
+
+module.exports = { Deferred, truncateWithEllipsis };

package/src/models/accesslogs.js

@@ -1,54 +0,0 @@
-'use strict';
-
-const clfDate = require('clf-date');
-
-function getFormatter (format, isAddon) {
-  switch (format.toLowerCase()) {
-    // "simple" is the legacy default, "human" is the new one
-    case 'human':
-    case 'simple':
-      return isAddon ? formatSimpleAddon : formatSimple;
-    case 'extended':
-      return isAddon ? formatExtendedAddon : formatExtended;
-    case 'clf':
-      return isAddon ? formatCLFAddon : formatCLF;
-    case 'json':
-      return (l) => JSON.stringify(l);
-  }
-}
-
-function formatSource (l) {
-  if (l.s != null) {
-    const location = l.s.ct ? `${l.s.ct}, ${l.s.co}` : l.s.co;
-    return `${l.ipS} - ${location}`;
-  }
-  else {
-    return l.ipS;
-  }
-}
-
-function formatSimple (l) {
-  return `${new Date(l.t).toISOString()} ${l.ipS} ${l.vb} ${l.path}`;
-}
-
-function formatExtended (l) {
-  return `${new Date(l.t).toISOString()} [ ${formatSource(l)} ] ${l.vb} ${l.h} ${l.path} ${l.sC}`;
-}
-
-function formatCLF (l) {
-  return `${l.ipS} - - [${clfDate(new Date(l.t))}] "${l.vb} ${l.path} -" ${l.sC} ${l.bOut}`;
-}
-
-function formatSimpleAddon (l) {
-  return `${new Date(l.t).toISOString()} ${l.ipS}`;
-}
-
-function formatExtendedAddon (l) {
-  return `${new Date(l.t).toISOString()} [ ${formatSource(l)} ] duration(ms): ${l.sDuration}`;
-}
-
-function formatCLFAddon (l) {
-  return `${l.ipS} - - [${clfDate(new Date(l.t))}] "- - -" - ${l.bOut}`;
-}
-
-module.exports = { getFormatter };

package/vendors/README_VENDORS.md

@@ -1,18 +0,0 @@
-# Why do we have this vendors directory?
-
-We depend on the the [`curlconverter`](https://www.npmjs.com/package/curlconverter) package.
-It's only available as ESM.
-This module format is no problem for a recent version of Node.js but it does not work when we build our auto packaged binary version of the CLI with pkg.
-
-The next steps for this project are:
-
-* find a replacement for pkg to build an auto packaged binary
-* move the whole project to ESM
-* eventually bundle/compile the code to a single file before building the binary
-
-Before doing this, we introduced a quick & simple solution, juste for curlconverter:
-
-* add `rollup` to dev dependencies
-* bundle the only file we need (`node_modules/curlconverter/dist/src/parse.js`) to a single CJS file with rollup
-* version the bundle in the repo (`vendors/curlconverter-parse.js`)
-* add a npm task to build the bundle again if needed