clever-tools 3.0.2 → 3.2.0

package/bin/clever.js

@@ -21,7 +21,8 @@ const git = require('../src/models/git.js');
 const Parsers = require('../src/parsers.js');
 const handleCommandPromise = require('../src/command-promise-handler.js');
 const Formatter = require('../src/models/format-string.js');
-const { getOutputFormatOption } = require('../src/get-output-format-option.js');
+const { AVAILABLE_ZONES } = require('../src/models/application.js');
+const { getOutputFormatOption, getSameCommitPolicyOption } = require('../src/command-options.js');
 
 // Exit cleanly if the program we pipe to exits abruptly
 process.stdout.on('error', (error) => {
@@ -98,7 +99,7 @@ function run () {
       complete: Drain('listDrainTypes'),
     }),
     drainUrl: cliparse.argument('drain-url', { description: 'Drain URL' }),
-    fqdn: cliparse.argument('fqdn', { description: 'Domain name of the Clever Cloud application' }),
+    fqdn: cliparse.argument('fqdn', { description: 'Domain name of the application' }),
     notificationName: cliparse.argument('name', { description: 'Notification name' }),
     notificationId: cliparse.argument('notification-id', { description: 'Notification ID' }),
     webhookUrl: cliparse.argument('url', { description: 'Webhook URL' }),
@@ -119,7 +120,7 @@ function run () {
       },
     }),
     configurationValue: cliparse.argument('configuration-value', { description: 'The new value of the configuration' }),
-    ngId: cliparse.argument('ng-id', { description: 'The Network Group id' }),
+    ngId: cliparse.argument('ng-id', { description: 'The Network Group ID' }),
     ngIdOrLabel: cliparse.argument('ng', {
       description: 'Network Group ID or label',
       parser: Parsers.ngIdOrLabel,
@@ -136,14 +137,14 @@ function run () {
       description: 'Display access logs continuously (ignores before/until, after/since)',
     }),
     importAsJson: cliparse.flag('json', {
-      description: 'Import variables as JSON (an array of { "name": "THE_NAME", "value": "the value" } objects)',
+      description: 'Import variables as JSON (an array of { "name": "THE_NAME", "value": "THE_VALUE" } objects)',
     }),
     addonId: cliparse.option('addon', { metavar: 'addon_id', description: 'Addon ID' }),
     after: cliparse.option('after', {
       metavar: 'after',
       aliases: ['since'],
       parser: Parsers.date,
-      description: 'Fetch logs after this date (ISO8601)',
+      description: 'Fetch logs after this date/time (ISO8601)',
     }),
     aliasCreation: cliparse.option('alias', {
       aliases: ['a'],
@@ -158,13 +159,13 @@ function run () {
     }),
     naturalName: cliparse.flag('natural-name', {
       aliases: ['n'],
-      description: 'Show application names or aliases if possible',
+      description: 'Show the application names or aliases if possible',
     }),
     before: cliparse.option('before', {
       metavar: 'before',
       aliases: ['until'],
       parser: Parsers.date,
-      description: 'Fetch logs before this date (ISO8601)',
+      description: 'Fetch logs before this date/time (ISO8601)',
     }),
     branch: cliparse.option('branch', {
       aliases: ['b'],
@@ -177,11 +178,11 @@ function run () {
     }),
     commit: cliparse.option('commit', {
       metavar: 'commit id',
-      description: 'Restart the application with a specific commit id',
+      description: 'Restart the application with a specific commit ID',
     }),
     databaseId: cliparse.option('database-id', {
       metavar: 'database_id',
-      description: 'The Database ID (postgresql_xxx)',
+      description: 'The Database ID (e.g.: postgresql_xxx)',
     }),
     deploymentId: cliparse.option('deployment-id', {
       metavar: 'deployment_id',
@@ -189,7 +190,7 @@ function run () {
     }),
     namespace: cliparse.option('namespace', {
       metavar: 'namespace',
-      description: 'namespace in which the TCP redirection should be',
+      description: 'Namespace in which the TCP redirection should be',
       required: true,
       complete: Organisation('completeNamespaces'),
     }),
@@ -202,7 +203,7 @@ function run () {
     flavor: cliparse.option('flavor', {
       metavar: 'flavor',
       parser: Parsers.flavor,
-      description: 'The scale of your application',
+      description: 'The instance size of your application',
       complete () {
         return cliparse.autocomplete.words(Application('listAvailableFlavors')());
       },
@@ -215,6 +216,7 @@ function run () {
       aliases: ['f'],
       description: 'Force deploy even if it\'s not fast-forwardable',
     }),
+    sameCommitPolicy: getSameCommitPolicyOption(),
     webhookFormat: cliparse.option('format', {
       metavar: 'format',
       default: 'raw',
@@ -222,17 +224,17 @@ function run () {
     }),
     github: cliparse.option('github', {
       metavar: 'OWNER/REPO',
-      description: 'Github application to use for deployments',
+      description: 'GitHub application to use for deployments',
     }),
     sshIdentityFile: cliparse.option('identity-file', {
       aliases: ['i'],
       metavar: 'identity-file',
-      description: 'SSH Identity file',
+      description: 'SSH identity file',
     }),
     instances: cliparse.option('instances', {
       metavar: 'instances',
       parser: Parsers.instances,
-      description: 'The number of parallels instances',
+      description: 'The number of parallel instances',
     }),
     linkAddon: cliparse.option('link', {
       aliases: ['l'],
@@ -240,11 +242,11 @@ function run () {
       description: 'Link the created addon to the app with the specified alias',
       complete: Application('listAvailableAliases'),
     }),
-    listAllNotifications: cliparse.flag('list-all', { description: 'List all notifications for your user or for an organisation with the `--org` option' }),
+    listAllNotifications: cliparse.flag('list-all', { description: 'List all notifications for your user or for an organisation with the \'--org\' option' }),
     maxFlavor: cliparse.option('max-flavor', {
       metavar: 'maxflavor',
       parser: Parsers.flavor,
-      description: 'The maximum scale for your application',
+      description: 'The maximum instance size of your application',
       complete () {
         return cliparse.autocomplete.words(Application('listAvailableFlavors')());
       },
@@ -252,17 +254,17 @@ function run () {
     buildFlavor: cliparse.option('build-flavor', {
       metavar: 'buildflavor',
       parser: Parsers.buildFlavor,
-      description: 'The size of the build instance, or `disabled` if you want to disable dedicated build instances',
+      description: 'The size of the build instance, or \'disabled\' if you want to disable dedicated build instances',
     }),
     maxInstances: cliparse.option('max-instances', {
       metavar: 'maxinstances',
       parser: Parsers.instances,
-      description: 'The maximum number of parallels instances',
+      description: 'The maximum number of parallel instances',
     }),
     minFlavor: cliparse.option('min-flavor', {
       metavar: 'minflavor',
       parser: Parsers.flavor,
-      description: 'The minimum scale for your application',
+      description: 'The minimum scale size of your application',
       complete () {
         return cliparse.autocomplete.words(Application('listAvailableFlavors')());
       },
@@ -270,7 +272,7 @@ function run () {
     minInstances: cliparse.option('min-instances', {
       metavar: 'mininstances',
       parser: Parsers.instances,
-      description: 'The minimum number of parallels instances',
+      description: 'The minimum number of parallel instances',
     }),
     noUpdateNotifier: cliparse.flag('no-update-notifier', { description: 'Don\'t notify available updates for clever-tools' }),
     emailNotificationTarget: cliparse.option('notify', {
@@ -289,7 +291,7 @@ function run () {
     }),
     output: cliparse.option('output', {
       aliases: ['out'],
-      description: 'redirect the output of the command in a file',
+      description: 'Redirect the output of the command in a file',
     }),
     drainPassword: cliparse.option('password', {
       aliases: ['p'],
@@ -316,17 +318,17 @@ function run () {
     }),
     addonVersion: cliparse.option('addon-version', {
       metavar: 'addon-version',
-      description: 'The version to use for the add-on',
+      description: 'The version to use for the addon',
     }),
     addonOptions: cliparse.option('option', {
       metavar: 'option',
-      description: 'Option to enable for the add-on. Multiple --option argument can be passed to enable multiple options',
+      description: 'Option to enable for the addon. Multiple --option argument can be passed to enable multiple options',
     }),
     region: cliparse.option('region', {
       aliases: ['r'],
       default: 'par',
       metavar: 'zone',
-      description: 'Region, can be \'par\' for Paris or \'mtl\' for Montreal',
+      description: `Region, can be ${AVAILABLE_ZONES.map((name) => `'${name}'`).join(', ')}`,
       complete: Application('listAvailableZones'),
     }),
     search: cliparse.option('search', {
@@ -386,7 +388,7 @@ function run () {
     ngLabel: cliparse.option('label', {
       required: true,
       metavar: 'ng_label',
-      description: 'Network Group label, also used for dns context',
+      description: 'Network Group label, also used for DNS context',
     }),
     ngIdOrLabel: cliparse.option('ng', {
       required: true,
@@ -404,7 +406,7 @@ function run () {
       aliases: ['m'],
       required: true,
       metavar: 'member_id',
-      description: `The member ID: an app ID (i.e. ${Formatter.formatCode('app_xxx')}), add-on ID (i.e. ${Formatter.formatCode('addon_xxx')}) or external node category ID`,
+      description: `The member ID: an app ID (e.g.: ${Formatter.formatCode('app_xxx')}), addon ID (e.g.: ${Formatter.formatCode('addon_xxx')}) or external node category ID`,
       // complete: NetworkGroup('xxx'),
     }),
     ngMemberDomainName: cliparse.option('domain-name', {
@@ -492,7 +494,7 @@ function run () {
     optNgSearchAppId: cliparse.option('app-id', {
       required: false,
       metavar: 'app_id',
-      description: 'The app id to search',
+      description: 'The app ID to search',
       // complete: NetworkGroup('xxx'),
     }),
     wgPublicKey: cliparse.option('public-key', {
@@ -516,12 +518,12 @@ function run () {
     tags: cliparse.option('tags', {
       required: true,
       metavar: 'tags',
-      description: 'List of tags separated by a comma',
+      description: 'List of tags, separated by a comma',
       parser: Parsers.tags,
     }),
     optTags: cliparse.option('tags', {
       metavar: 'tags',
-      description: 'List of tags separated by a comma',
+      description: 'List of tags, separated by a comma',
       parser: Parsers.tags,
     }),
     optIpAddress: cliparse.option('ip', {
@@ -548,7 +550,7 @@ function run () {
   // ACTIVITY COMMAND
   const activity = lazyRequirePromiseModule('../src/commands/activity.js');
   const activityCommand = cliparse.command('activity', {
-    description: 'Show last deployments of a Clever Cloud application',
+    description: 'Show last deployments of an application',
     options: [opts.alias, opts.follow, opts.showAllActivity],
   }, activity('activity'));
 
@@ -577,7 +579,7 @@ function run () {
     commands: [addonShowProviderCommand],
   }, addon('listProviders'));
   const addonEnvCommand = cliparse.command('env', {
-    description: 'List the environment variables for an add-on',
+    description: 'List the environment variables for an addon',
     options: [opts.addonEnvFormat],
     args: [opts.addonId],
   }, addon('env'));
@@ -598,7 +600,7 @@ function run () {
   // CANCEL DEPLOY COMMAND
   const cancelDeploy = lazyRequirePromiseModule('../src/commands/cancel-deploy.js');
   const cancelDeployCommand = cliparse.command('cancel-deploy', {
-    description: 'Cancel an ongoing deployment on Clever Cloud',
+    description: 'Cancel an ongoing deployment',
     options: [opts.alias],
   }, cancelDeploy('cancelDeploy'));
 
@@ -625,7 +627,7 @@ function run () {
   // CREATE COMMAND
   const create = lazyRequirePromiseModule('../src/commands/create.js');
   const appCreateCommand = cliparse.command('create', {
-    description: 'Create a Clever Cloud application',
+    description: 'Create an application',
     args: [args.appNameCreation],
     options: [opts.instanceType, opts.orgaIdOrName, opts.aliasCreation, opts.region, opts.github, opts.humanJsonOutputFormat],
   }, create('create'));
@@ -633,15 +635,15 @@ function run () {
   // DELETE COMMAND
   const deleteCommandModule = lazyRequirePromiseModule('../src/commands/delete.js');
   const deleteCommand = cliparse.command('delete', {
-    description: 'Delete a Clever Cloud application',
+    description: 'Delete an application',
     options: [opts.alias, opts.confirmApplicationDeletion],
   }, deleteCommandModule('deleteApp'));
 
   // DEPLOY COMMAND
   const deploy = lazyRequirePromiseModule('../src/commands/deploy.js');
   const deployCommand = cliparse.command('deploy', {
-    description: 'Deploy an application to Clever Cloud',
-    options: [opts.alias, opts.branch, opts.quiet, opts.forceDeploy, opts.followDeployLogs],
+    description: 'Deploy an application',
+    options: [opts.alias, opts.branch, opts.quiet, opts.forceDeploy, opts.followDeployLogs, opts.sameCommitPolicy],
   }, deploy('deploy'));
 
   // DIAG COMMAND
@@ -654,26 +656,26 @@ function run () {
   // DOMAIN COMMANDS
   const domain = lazyRequirePromiseModule('../src/commands/domain.js');
   const domainCreateCommand = cliparse.command('add', {
-    description: 'Add a domain name to a Clever Cloud application',
+    description: 'Add a domain name to an application',
     args: [args.fqdn],
   }, domain('add'));
   const domainRemoveCommand = cliparse.command('rm', {
-    description: 'Remove a domain name from a Clever Cloud application',
+    description: 'Remove a domain name from an application',
     args: [args.fqdn],
   }, domain('rm'));
   const domainSetFavouriteCommand = cliparse.command('set', {
-    description: 'Set the favourite domain for a Clever Cloud application',
+    description: 'Set the favourite domain for an application',
     args: [args.fqdn],
   }, domain('setFavourite'));
   const domainUnsetFavouriteCommand = cliparse.command('unset', {
-    description: 'Unset the favourite domain for a Clever Cloud application',
+    description: 'Unset the favourite domain for an application',
   }, domain('unsetFavourite'));
   const domainFavouriteCommands = cliparse.command('favourite', {
-    description: 'Manage Clever Cloud application favourite domain name',
+    description: 'Manage the favourite domain name for an application',
     commands: [domainSetFavouriteCommand, domainUnsetFavouriteCommand],
   }, domain('getFavourite'));
   const domainCommands = cliparse.command('domain', {
-    description: 'Manage Clever Cloud application domain names',
+    description: 'Manage domain names for an application',
     options: [opts.alias],
     commands: [domainCreateCommand, domainFavouriteCommands, domainRemoveCommand],
   }, domain('list'));
@@ -710,7 +712,7 @@ function run () {
     args: [args.envVariableName, args.envVariableValue],
   }, env('set'));
   const envRemoveCommand = cliparse.command('rm', {
-    description: 'Remove an environment variable from a Clever Cloud application',
+    description: 'Remove an environment variable from an application',
     args: [args.envVariableName],
   }, env('rm'));
   const envImportCommand = cliparse.command('import', {
@@ -718,11 +720,11 @@ function run () {
     options: [opts.importAsJson],
   }, env('importEnv'));
   const envImportVarsFromLocalEnvCommand = cliparse.command('import-vars', {
-    description: 'Add or update environment variables named <variable-names> (comma separated), taking their values from the current environment',
+    description: 'Add or update environment variables named <variable-names> (comma-separated), taking their values from the current environment',
     args: [args.envVariableNames],
   }, env('importVarsFromLocalEnv'));
   const envCommands = cliparse.command('env', {
-    description: 'Manage Clever Cloud application environment',
+    description: 'Manage environment variables of an application',
     options: [opts.alias, opts.sourceableEnvVarsList],
     commands: [envSetCommand, envRemoveCommand, envImportCommand, envImportVarsFromLocalEnvCommand],
   }, env('list'));
@@ -730,7 +732,7 @@ function run () {
   // LINK COMMAND
   const link = lazyRequirePromiseModule('../src/commands/link.js');
   const appLinkCommand = cliparse.command('link', {
-    description: 'Link this repo to an existing Clever Cloud application',
+    description: 'Link this repo to an existing application',
     args: [args.appIdOrName],
     options: [opts.aliasCreation, opts.orgaIdOrName],
   }, link('link'));
@@ -787,7 +789,7 @@ function run () {
     options: [opts.ngIdOrLabel, opts.naturalName, opts.jsonFormat],
   }, networkgroups('listMembers'));
   const networkGroupsMemberGetCommand = cliparse.command('get', {
-    description: 'Get a Network Group member details',
+    description: 'Get a Network Group member\'s details',
     options: [opts.ngIdOrLabel, opts.ngMemberId, opts.naturalName, opts.jsonFormat],
   }, networkgroups('getMember'));
   const networkGroupsMemberAddCommand = cliparse.command('add', {
@@ -811,7 +813,7 @@ function run () {
     options: [opts.ngIdOrLabel, opts.jsonFormat],
   }, networkgroups('listPeers'));
   const networkGroupsPeerGetCommand = cliparse.command('get', {
-    description: 'Get a Network Group peer details',
+    description: 'Get a Network Group peer\'s details',
     options: [opts.ngIdOrLabel, opts.ngPeerId, opts.jsonFormat],
   }, networkgroups('getPeer'));
   const networkGroupsPeerAddCommand = cliparse.command('add-external', {
@@ -862,14 +864,14 @@ function run () {
   // OPEN COMMAND
   const open = lazyRequirePromiseModule('../src/commands/open.js');
   const openCommand = cliparse.command('open', {
-    description: 'Open an application in the browser',
+    description: 'Open an application in your browser',
     options: [opts.alias],
   }, open('open'));
 
   // CONSOLE COMMAND
   const consoleModule = lazyRequirePromiseModule('../src/commands/console.js');
   const consoleCommand = cliparse.command('console', {
-    description: 'Open an application in the console',
+    description: 'Open an application in the Console',
     options: [opts.alias],
   }, consoleModule('openConsole'));
 
@@ -886,7 +888,7 @@ function run () {
     args: [args.envVariableName, args.envVariableValue],
   }, publishedConfig('set'));
   const publishedConfigRemoveCommand = cliparse.command('rm', {
-    description: 'Remove a published configuration variable from a Clever Cloud application',
+    description: 'Remove a published configuration variable from an application',
     args: [args.envVariableName],
   }, publishedConfig('rm'));
   const publishedConfigImportCommand = cliparse.command('import', {
@@ -902,7 +904,7 @@ function run () {
   // RESTART COMMAND
   const restart = lazyRequirePromiseModule('../src/commands/restart.js');
   const restartCommand = cliparse.command('restart', {
-    description: 'Start or restart a Clever Cloud application',
+    description: 'Start or restart an application',
     options: [opts.alias, opts.commit, opts.withoutCache, opts.quiet, opts.followDeployLogs],
   }, restart('restart'));
 
@@ -947,14 +949,14 @@ function run () {
   // STATUS COMMAND
   const status = lazyRequirePromiseModule('../src/commands/status.js');
   const statusCommand = cliparse.command('status', {
-    description: 'See the status of an application on Clever Cloud',
+    description: 'See the status of an application',
     options: [opts.alias],
   }, status('status'));
 
   // STOP COMMAND
   const stop = lazyRequirePromiseModule('../src/commands/stop.js');
   const stopCommand = cliparse.command('stop', {
-    description: 'Stop a running application on Clever Cloud',
+    description: 'Stop a running application',
     options: [opts.alias],
   }, stop('stop'));
 
@@ -981,14 +983,14 @@ function run () {
   // UNLINK COMMAND
   const unlink = lazyRequirePromiseModule('../src/commands/unlink.js');
   const appUnlinkCommand = cliparse.command('unlink', {
-    description: 'Unlink this repo from an existing Clever Cloud application',
+    description: 'Unlink this repo from an existing application',
     args: [args.alias],
   }, unlink('unlink'));
 
   // VERSION COMMAND
   const version = lazyRequirePromiseModule('../src/commands/version.js');
   const versionCommand = cliparse.command('version', {
-    description: 'Display the version',
+    description: 'Display the clever-tools version',
     args: [],
   }, version('version'));
 
@@ -1077,7 +1079,7 @@ function run () {
   // CLI PARSER
   const cliParser = cliparse.cli({
     name: 'clever',
-    description: 'CLI tool to manage Clever Cloud data and products',
+    description: 'CLI tool to manage Clever Cloud\'s data and products',
     version: pkg.version,
     options: [opts.verbose, opts.noUpdateNotifier],
     helpCommand: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "3.0.2",
+  "version": "3.2.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -25,14 +25,14 @@
     "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "^8.0.2",
+    "@clevercloud/client": "^8.1.0",
     "clf-date": "^0.2.0",
     "cliparse": "^0.3.3",
     "colors": "1.4.0",
     "common-env": "^6.4.0",
     "curlconverter": "^3.21.0",
     "eventsource": "^1.1.0",
-    "isomorphic-git": "^1.8.2",
+    "isomorphic-git": "^1.25.0",
     "linux-release-info": "^3.0.0",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
@@ -48,6 +48,8 @@
     "xdg": "^0.1.1"
   },
   "devDependencies": {
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
     "aws-sdk": "^2.919.0",
     "chai": "^4.3.4",
     "del": "^6.0.0",
@@ -63,9 +65,11 @@
     "grunt-cli": "^1.4.3",
     "grunt-http": "^2.3.3",
     "grunt-mocha-test": "^0.13.3",
+    "mime-types": "^2.1.35",
     "mocha": "^8.4.0",
     "pkg": "^5.8.1",
-    "semver": "^7.3.5"
+    "semver": "^7.3.5",
+    "text-table": "^0.2.0"
   },
   "overrides": {
     "pkg-fetch": "3.5.2"

package/src/command-options.js

@@ -0,0 +1,42 @@
+const cliparse = require('cliparse');
+
+function getOutputFormatOption (formats = []) {
+  const availableFormats = ['human', 'json', ...formats];
+  return cliparse.option('format', {
+    aliases: ['F'],
+    metavar: 'format',
+    parser: (format) => {
+      return availableFormats.includes(format)
+        ? cliparse.parsers.success(format)
+        : cliparse.parsers.error('The output format must be one of ' + availableFormats.join(', '));
+    },
+    default: 'human',
+    description: `Output format (${availableFormats.join(', ')})`,
+    complete () {
+      return cliparse.autocomplete.words(availableFormats);
+    },
+  });
+}
+
+function getSameCommitPolicyOption () {
+  const availablePolicies = ['error', 'ignore', 'restart', 'rebuild'];
+  return cliparse.option('same-commit-policy', {
+    aliases: ['p'],
+    metavar: 'same-commit-policy',
+    parser: (policy) => {
+      return availablePolicies.includes(policy)
+        ? cliparse.parsers.success(policy)
+        : cliparse.parsers.error(`The output policy must be one of ${availablePolicies.join(', ')}`);
+    },
+    default: 'error',
+    description: `Which policy to apply when the local commit is the same as the remote one. Available policies are (${availablePolicies.join(', ')})`,
+    complete () {
+      return cliparse.autocomplete.words(availablePolicies);
+    },
+  });
+}
+
+module.exports = {
+  getOutputFormatOption,
+  getSameCommitPolicyOption,
+};

package/src/commands/applications.js

@@ -28,13 +28,16 @@ function formatApps (apps, onlyAliases, json) {
     }
     else {
       return apps
-        .map((app) =>
-          [
+        .map((app) => {
+          const sshUrl = app.git_ssh_url ?? app.deploy_url.replace('https://', 'git+ssh://git@');
+          return [
             `Application ${app.name}`,
             `  alias: ${colors.bold(app.alias)}`,
-            `  id: ${app.app_id}`,
-            `  deployment url: ${app.deploy_url}`].join('\n'),
-        )
+            `  ID: ${app.app_id}`,
+            `  deployment URL: ${app.deploy_url}`,
+            `  git+ssh URL: ${sshUrl}`,
+          ].join('\n');
+        })
         .join('\n\n');
     }
   }

package/src/commands/create.js

@@ -3,14 +3,16 @@
 const Application = require('../models/application.js');
 const AppConfig = require('../models/app_configuration.js');
 const Logger = require('../logger.js');
-const { toNameEqualsValueString } = require('@clevercloud/client/cjs/utils/env-vars.js');
 
 async function create (params) {
   const { type: typeName } = params.options;
   const [name] = params.args;
   const { org: orgaIdOrName, alias, region, github: githubOwnerRepo, format } = params.options;
-  const github = getGithubDetails(githubOwnerRepo);
+  const { apps } = await AppConfig.loadApplicationConf();
+
+  AppConfig.checkAlreadyLinked(apps, name, alias);
 
+  const github = getGithubDetails(githubOwnerRepo);
   const app = await Application.create(name, typeName, region, orgaIdOrName, github);
   await AppConfig.addLinkedApplication(app, alias);
 

package/src/commands/deploy.js

@@ -13,7 +13,7 @@ const { sendToApi } = require('../models/send-to-api.js');
 // Once the API call to redeploy() has been triggered successfully,
 // the rest (waiting for deployment state to evolve and displaying logs) is done with auto retry (resilient to network failures)
 async function deploy (params) {
-  const { alias, branch: branchName, quiet, force, follow } = params.options;
+  const { alias, branch: branchName, quiet, force, follow, 'same-commit-policy': sameCommitPolicy } = params.options;
 
   const appData = await AppConfig.getAppDetails({ alias });
   const { ownerId, appId } = appData;
@@ -26,12 +26,29 @@ async function deploy (params) {
 
   await git.addRemote(appData.alias, appData.deployUrl);
 
+  Logger.println(colors.bold.blue(`Remote application is app_id=${appId}, alias=${appData.alias}, name=${appData.name}`));
+
+  Logger.println(colors.bold.blue(`Remote application belongs to ${ownerId}`));
+
   if (commitIdToPush === remoteHeadCommitId) {
-    const upToDateMessage = `The clever-cloud application is up-to-date (${remoteHeadCommitId}). Try this command to restart the application:`;
-    if (commitIdToPush !== deployedCommitId) {
-      throw new Error(`${upToDateMessage}\nclever restart --commit ${commitIdToPush}`);
+    switch (sameCommitPolicy) {
+      case 'ignore':
+        Logger.println(`The clever-cloud application is up-to-date (${colors.green(remoteHeadCommitId)})`);
+        return;
+      case 'restart':
+        return restartOnSameCommit(ownerId, appId, commitIdToPush, quiet, follow, false);
+      case 'rebuild':
+        return restartOnSameCommit(ownerId, appId, commitIdToPush, quiet, follow, true);
+      case 'error':
+      default: {
+        const upToDateMessage = `The clever-cloud application is up-to-date (${colors.green(remoteHeadCommitId)}).\nYou can set a policy with 'same-commit-policy' to handle differently when remote HEAD has the same commit as the one to push.\nOr try this command to restart the application:`;
+        if (commitIdToPush !== deployedCommitId) {
+          const restartWithId = `clever restart --commit ${commitIdToPush}`;
+          throw new Error(`${upToDateMessage}\n${colors.yellow(restartWithId)}`);
+        }
+        throw new Error(`${upToDateMessage}\n${colors.yellow('clever restart')}`);
+      }
     }
-    throw new Error(`${upToDateMessage}\nclever restart`);
   }
 
   if (remoteHeadCommitId == null || deployedCommitId == null) {
@@ -64,4 +81,9 @@ async function deploy (params) {
   return Log.watchDeploymentAndDisplayLogs({ ownerId, appId, commitId: commitIdToPush, knownDeployments, quiet, follow });
 }
 
+async function restartOnSameCommit (ownerId, appId, commitIdToPush, quiet, follow, withoutCache) {
+  const restart = await Application.redeploy(ownerId, appId, commitIdToPush, withoutCache);
+  return Log.watchDeploymentAndDisplayLogs({ ownerId, appId, deploymentId: restart.deploymentId, quiet, follow });
+}
+
 module.exports = { deploy };

package/src/models/addon.js

@@ -109,7 +109,7 @@ function validateAddonVersionAndOptions (region, version, addonOptions, provider
           const optionNames = availableOptions.map(({ name }) => name).join(',');
           let availableOptionsError = null;
           if (optionNames.length > 0) {
-            availableOptionsError = `Avalailble options are: ${optionNames}.`;
+            availableOptionsError = `Available options are: ${optionNames}.`;
           }
           else {
             availableOptionsError = 'No options are available for this plan.';