clever-tools 2.9.0 → 2.10.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # clever-tools changelog
 
+## Unrelease (????-??-??)
+
+## 2.10.0-beta.0 (2022-09-06)
+
+* Add NetworkGroups commands `clever ng --help`
+
+## 2.9.1 (2022-02-28)
+
+* Upgrade opn to open
+
 ## 2.9.0 (2022-01-12)
 
 * Add NewRelic support in `clever drains`

package/README.md

@@ -6,7 +6,7 @@ Command Line Interface for Clever Cloud.
 
 ## Installation
 
-The clever-tools CLI can be installed through many different channels depending on your system setup.
+The clever-tools CLI can be installed through many channels depending on your system setup.
 
 ### Via npm
 
@@ -30,26 +30,28 @@ npm install -g clever-tools@beta
 
 ##### Warning
 
-Bintray is ending on May 1st 2021, we will migrate hosting as soon as possible. Please refer to the dedicated [issue](https://github.com/CleverCloud/clever-tools/issues/454) to track the migration.
+We recently moved from Bintray to a self-hosted Nexus repository available at [https://nexus.clever-cloud.com](https://nexus.clever-cloud.com).
+If you were using Bintray to install our `.deb` packages, you will need to edit your `/etc/apt/sources.list` and remove the old entry with `https://dl.bintray.com/clevercloud/deb` before going further.
 
 ---
 
 If you are using a GNU/Linux distribution that uses `.deb` packages like Debian or Ubuntu, you can run:
 
 ```sh
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "379CE192D401AB61"
-echo "deb https://dl.bintray.com/clevercloud/deb stable main" | tee -a /etc/apt/sources.list
+curl -fsSL https://clever-tools.clever-cloud.com/gpg/cc-nexus-deb.public.gpg.key | gpg --dearmor -o /usr/share/keyrings/cc-nexus-deb.gpg
+echo "deb [signed-by=/usr/share/keyrings/cc-nexus-deb.gpg] https://nexus.clever-cloud.com/repository/deb stable main" | tee -a /etc/apt/sources.list
 apt-get update
 apt-get install clever-tools
 ```
 
 NOTES:
 
-* The `.deb` packages are hosted on Bintray (their GPG key is required to trust their signed packages).
+* The `.deb` packages are hosted on Clever Cloud's public Nexus instance available at [https://nexus.clever-cloud.com](https://nexus.clever-cloud.com).
+* Our PGP key is required to trust the repository.
 * If you want access to the beta channel, you can use this in your `sources.list`:
 
 ```sh
-echo "deb https://dl.bintray.com/clevercloud/deb unstable beta" | tee -a /etc/apt/sources.list
+echo "deb [signed-by=/usr/share/keyrings/cc-nexus-deb.gpg] https://nexus.clever-cloud.com/repository/deb-beta beta main" | tee -a /etc/apt/sources.list
 ```
 
 #### CentOS/Fedora (.rpm)
@@ -58,22 +60,23 @@ echo "deb https://dl.bintray.com/clevercloud/deb unstable beta" | tee -a /etc/ap
 
 ##### Warning
 
-Bintray is ending on May 1st 2021, we will migrate hosting as soon as possible. Please refer to the dedicated [issue](https://github.com/CleverCloud/clever-tools/issues/454) to track the migration.
+We recently moved from Bintray to a self-hosted Nexus repository available at [https://nexus.clever-cloud.com](https://nexus.clever-cloud.com).
+If you were using Bintray to install our `.rpm` packages, you will need to remove the old `/etc/yum.repos.d/bintray-clevercloud-rpm.repo` before going further.
 
 ---
 
 If you are using a GNU/Linux distribution that uses `.rpm` packages like CentOS or Fedora, you can run:
 
 ```sh
-curl https://bintray.com/clevercloud/rpm/rpm > /etc/yum.repos.d/bintray-clevercloud-rpm.repo
-echo "exclude=*beta*" >> /etc/yum.repos.d/bintray-clevercloud-rpm.repo
+curl -s https://clever-tools.clever-cloud.com/repos/cc-nexus-rpm.repo > /etc/yum.repos.d/cc-nexus-rpm.repo
+yum update
 yum install clever-tools
 ```
 
 NOTES:
 
-* The `.rpm` packages are hosted on Bintray.
-* If you want access to the beta channel, you can omit the second line which contains an exclude option.
+* The `.rpm` packages are hosted on Clever Cloud's public Nexus instance available at [https://nexus.clever-cloud.com](https://nexus.clever-cloud.com).
+* If you want access to the beta channel, you will need to edit `/etc/yum.repos.d/cc-nexus-rpm.repo` and set `enabled=1` for the `[clever-tools-beta]`.
 
 #### Arch Linux
 
@@ -114,11 +117,11 @@ NOTES:
 * The packages are available on Clever Cloud's Cellar bucket: [clever-tools-latest_linux.tar.gz](https://clever-tools.clever-cloud.com/releases/latest/clever-tools-latest_linux.tar.gz).
 * You can also retrieve any release (including beta) on this Cellar bucket by replacing `latest` (path and filename) with the version number you need.
 
-### On MacOS
+### On macOS
 
 #### Using homebrew
 
-If you are using MacOS and you have [homebrew](https://brew.sh) installed, you can run:
+If you are using macOS and you have [homebrew](https://brew.sh) installed, you can run:
 
 ```sh
 brew install CleverCloud/homebrew-tap/clever-tools
@@ -130,7 +133,7 @@ NOTES:
 
 #### Using the `.tar.gz` archive
 
-If you are using MacOS but you don't have [homebrew](https://brew.sh) installed, you can download a `.tar.gz` archive and extract the binary in your `PATH`:
+If you are using macOS, but you don't have [homebrew](https://brew.sh) installed, you can download a `.tar.gz` archive and extract the binary in your `PATH`:
 
 ```sh
 curl -O https://clever-tools.clever-cloud.com/releases/latest/clever-tools-latest_macos.tar.gz
@@ -151,24 +154,25 @@ NOTES:
 
 ##### Warning
 
-Bintray is ending on May 1st 2021, we will migrate hosting as soon as possible. Please refer to the dedicated [issue](https://github.com/CleverCloud/clever-tools/issues/454) to track the migration.
+We recently moved from Bintray to a self-hosted Nexus repository available at [https://nexus.clever-cloud.com](https://nexus.clever-cloud.com).
+If you were using Bintray to install our `.nupkg` packages, you will need to remove the old source.
 
 ---
 
 If you are using Windows and you have [chocolatey](https://chocolatey.org) installed, you can run:
 
 ```bash
-choco sources add -n=clevercloud -s='https://api.bintray.com/nuget/clevercloud/nupkg'
+choco sources add -n=clevercloud -s='https://nexus.clever-cloud.com/repository/nupkg/'
 choco install clever-tools
 ```
 
 NOTES:
 
-* If you want access to the beta channel, you can use `choco install --pre clever-tools` instead.
+* If you want access to the beta channel, you can use `choco sources add -n=clevercloud -s='https://nexus.clever-cloud.com/repository/nupkg-beta/'` instead.
 
 #### Using the `.zip` archive
 
-If you are using Windows but you don't have [chocolatey](https://chocolatey.org) installed, you can download a `.zip` archive and extract the binary in your `PATH`.
+If you are using Windows, but you don't have [chocolatey](https://chocolatey.org) installed, you can download a `.zip` archive and extract the binary in your `PATH`.
 
 NOTES:
 
@@ -194,7 +198,7 @@ COPY --from=clevercloud/clever-tools /bin/clever /usr/local/bin/clever
 
 ### Via Nix
 
-If you are using Nix, you will find a Nix derivation on Fretlink's Github repository: https://github.com/fretlink/clever-tools-nix
+If you are using Nix, you will find a Nix derivation on Fretlink's GitHub repository: https://github.com/fretlink/clever-tools-nix
 
 ## Enabling autocompletion
 
@@ -225,7 +229,7 @@ clever login
 It will open the Web console in your browser and reuse your existing session if you're already logged in.
 
 `clever login` tries to open a browser through `xdg-open` on GNU/Linux systems (and in bash for windows).
-Make sure you have `xdg-utils` available as well as a default browser set (or you can copy and paste the URL displayed in the console.
+Make sure you have `xdg-utils` available as well as a default browser set, or you can copy and paste the URL displayed in the console.
 
 ### Create an application
 

package/bin/clever.js

@@ -18,6 +18,7 @@ const updateNotifier = require('update-notifier');
 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');
 
 // Exit cleanly if the program we pipe to exits abruptly
 process.stdout.on('error', (error) => {
@@ -69,6 +70,7 @@ const ApplicationConfiguration = lazyRequire('../src/models/application_configur
 const Drain = lazyRequire('../src/models/drain.js');
 const Notification = lazyRequire('../src/models/notification.js');
 const Organisation = lazyRequire('../src/models/organisation.js');
+const NetworkGroup = lazyRequire('../src/models/networkgroup.js');
 
 function run () {
 
@@ -113,6 +115,11 @@ function run () {
       },
     }),
     configurationValue: cliparse.argument('configuration-value', { description: 'The new value of the configuration' }),
+    ngId: cliparse.argument('ng-id', { description: 'The Network Group id' }),
+    ngIdOrLabel: cliparse.argument('ng', {
+      description: 'Network Group ID or label',
+      parser: Parsers.ngIdOrLabel,
+    }),
   };
 
   // OPTIONS
@@ -132,7 +139,9 @@ function run () {
       aliases: ['f'],
       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)' }),
+    importAsJson: cliparse.flag('json', {
+      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',
@@ -151,6 +160,10 @@ function run () {
       description: 'Short name for the application',
       complete: Application('listAvailableAliases'),
     }),
+    naturalName: cliparse.flag('natural-name', {
+      aliases: ['n'],
+      description: 'Show application names or aliases if possible',
+    }),
     before: cliparse.option('before', {
       metavar: 'before',
       aliases: ['until'],
@@ -270,7 +283,7 @@ function run () {
     onlyAliases: cliparse.flag('only-aliases', { description: 'List only application aliases' }),
     onlyApps: cliparse.flag('only-apps', { description: 'Only show app dependencies' }),
     orgaIdOrName: cliparse.option('org', {
-      aliases: ['o'],
+      aliases: ['o', 'owner'],
       description: 'Organisation ID (or name, if unambiguous)',
       parser: Parsers.orgaIdOrName,
     }),
@@ -366,6 +379,158 @@ function run () {
       aliases: ['y'],
       description: 'Skip confirmation even if the TCP redirection is not free',
     }),
+    ngLabel: cliparse.option('label', {
+      required: true,
+      metavar: 'ng_label',
+      description: 'Network Group label, also used for dns context',
+    }),
+    ngIdOrLabel: cliparse.option('ng', {
+      required: true,
+      metavar: 'ng',
+      description: 'Network Group ID or label',
+      parser: Parsers.ngIdOrLabel,
+      // complete: NetworkGroup('xxx'),
+    }),
+    ngDescription: cliparse.option('description', {
+      required: true,
+      metavar: 'ng_description',
+      description: 'Network Group description',
+    }),
+    ngMemberId: cliparse.option('member-id', {
+      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`,
+      // complete: NetworkGroup('xxx'),
+    }),
+    ngMemberDomainName: cliparse.option('domain-name', {
+      required: true,
+      metavar: 'domain_name',
+      description: `Member name used in the ${Formatter.formatUrl('<memberName>.m.<ngID>.ng.clever-cloud.com', false)} domain name alias`,
+    }),
+    ngPeerId: cliparse.option('peer-id', {
+      required: true,
+      metavar: 'peer_id',
+      description: 'The peer ID',
+      // complete: NetworkGroup('xxx'),
+    }),
+    ngPeerRole: cliparse.option('role', {
+      required: true,
+      metavar: 'peer_role',
+      description: `The peer role, (${Formatter.formatString('client')} or ${Formatter.formatString('server')})`,
+      parser: Parsers.ngPeerRole,
+      complete: NetworkGroup('listAvailablePeerRoles'),
+    }),
+    // FIXME: Add "internal" member type
+    ngMemberType: cliparse.option('type', {
+      required: true,
+      metavar: 'member_type',
+      description: `The member type (${Formatter.formatString('application')}, ${Formatter.formatString('addon')} or ${Formatter.formatString('external')})`,
+      parser: Parsers.ngMemberType,
+      complete: NetworkGroup('listAvailableMemberTypes'),
+    }),
+    ngMemberLabel: cliparse.option('label', {
+      required: true,
+      metavar: 'member_label',
+      description: 'Network Group member label',
+    }),
+    ngNodeCategoryId: cliparse.option('node-category-id', {
+      required: true,
+      aliases: ['c'],
+      metavar: 'node_category_id',
+      description: 'The external node category ID',
+      // complete: NetworkGroup('xxx'),
+    }),
+    ngPeerLabel: cliparse.option('label', {
+      required: true,
+      metavar: 'peer_label',
+      description: 'Network Group peer label',
+    }),
+    ngPeerParentMemberId: cliparse.option('parent', {
+      required: true,
+      metavar: 'member_id',
+      description: 'Network Group peer category ID (parent member ID)',
+      // complete: NetworkGroup('xxx'),
+    }),
+    optNgIdOrLabel: cliparse.option('ng', {
+      required: false,
+      metavar: 'ng',
+      description: 'Network Group ID or label',
+      parser: Parsers.ngIdOrLabel,
+      // complete: NetworkGroup('xxx'),
+    }),
+    optNgMemberLabel: cliparse.option('label', {
+      required: false,
+      metavar: 'member_label',
+      description: 'The member label',
+    }),
+    optNgNodeCategoryId: cliparse.option('node-category-id', {
+      required: false,
+      aliases: ['c'],
+      metavar: 'node_category_id',
+      description: 'The external node category ID',
+      // complete: NetworkGroup('xxx'),
+    }),
+    optNgPeerId: cliparse.option('peer-id', {
+      required: false,
+      metavar: 'peer_id',
+      description: 'The peer ID',
+      // complete: NetworkGroup('xxx'),
+    }),
+    optNgPeerRole: cliparse.option('role', {
+      required: false,
+      default: 'client',
+      metavar: 'peer_role',
+      description: `The peer role, (${Formatter.formatString('client')} or ${Formatter.formatString('server')})`,
+      parser: Parsers.ngPeerRole,
+      complete: NetworkGroup('listAvailablePeerRoles'),
+    }),
+    optNgSearchAppId: cliparse.option('app-id', {
+      required: false,
+      metavar: 'app_id',
+      description: 'The app id to search',
+      // complete: NetworkGroup('xxx'),
+    }),
+    wgPublicKey: cliparse.option('public-key', {
+      required: true,
+      metavar: 'public_key',
+      description: 'A WireGuard® public key',
+    }),
+    optWgPrivateKey: cliparse.option('private-key', {
+      required: false,
+      metavar: 'private_key',
+      description: 'A WireGuard® private key',
+    }),
+    jsonFormat: cliparse.flag('json', { aliases: ['j'], description: 'Show result in JSON format' }),
+    tag: cliparse.option('tag', {
+      required: true,
+      metavar: 'tag',
+      description: 'A tag',
+      parser: Parsers.tag,
+    }),
+    tags: cliparse.option('tags', {
+      required: true,
+      metavar: 'tags',
+      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',
+      parser: Parsers.tags,
+    }),
+    optIpAddress: cliparse.option('ip', {
+      required: false,
+      metavar: 'ip_address',
+      description: 'An IP address',
+      parser: Parsers.ipAddress,
+    }),
+    optPortNumber: cliparse.option('port', {
+      required: false,
+      metavar: 'port_number',
+      description: 'A port number',
+      parser: Parsers.portNumber,
+    }),
   };
 
   // ACCESSLOGS COMMAND
@@ -416,7 +581,7 @@ function run () {
   const applications = lazyRequirePromiseModule('../src/commands/applications.js');
   const applicationsCommand = cliparse.command('applications', {
     description: 'List linked applications',
-    options: [opts.onlyAliases],
+    options: [opts.onlyAliases, opts.jsonFormat],
   }, applications('list'));
 
   // CANCEL DEPLOY COMMAND
@@ -586,6 +751,84 @@ function run () {
     args: [args.alias],
   }, makeDefault('makeDefault'));
 
+  // NETWORK GROUPS COMMANDS
+  const networkgroups = lazyRequirePromiseModule('../src/commands/networkgroups/commands.js');
+
+  // network group category - start
+  const networkGroupsListCommand = cliparse.command('list', {
+    description: 'List Network Groups with their labels',
+    options: [opts.jsonFormat],
+  }, networkgroups('listNetworkGroups'));
+  const networkGroupsCreateCommand = cliparse.command('create', {
+    description: 'Create a Network Group',
+    options: [opts.ngLabel, opts.ngDescription, opts.optTags, opts.jsonFormat],
+  }, networkgroups('createNg'));
+  const networkGroupsDeleteCommand = cliparse.command('delete', {
+    description: 'Delete a Network Group',
+    options: [opts.ngIdOrLabel],
+  }, networkgroups('deleteNg'));
+  // network group category - end
+
+  // member category - start
+  const networkGroupsMemberListCommand = cliparse.command('list', {
+    description: 'List members of a Network Group',
+    // Add option opts.optNgSearchAppId ?
+    options: [opts.ngIdOrLabel, opts.naturalName, opts.jsonFormat],
+  }, networkgroups('listMembers'));
+  const networkGroupsMemberGetCommand = cliparse.command('get', {
+    description: 'Get a Network Group member details',
+    options: [opts.ngIdOrLabel, opts.ngMemberId, opts.naturalName, opts.jsonFormat],
+  }, networkgroups('getMember'));
+  const networkGroupsMemberAddCommand = cliparse.command('add', {
+    description: 'Add an app or addon as a Network Group member',
+    options: [opts.ngIdOrLabel, opts.ngMemberId, opts.ngMemberType, opts.ngMemberDomainName, opts.optNgMemberLabel],
+  }, networkgroups('addMember'));
+  const networkGroupsMemberRemoveCommand = cliparse.command('remove', {
+    description: 'Remove an app or addon from a Network Group',
+    options: [opts.ngIdOrLabel, opts.ngMemberId],
+  }, networkgroups('removeMember'));
+
+  const networkGroupsMembersCategoryCommand = cliparse.command('members', {
+    description: 'List commands for interacting with Network Group members',
+    commands: [networkGroupsMemberListCommand, networkGroupsMemberGetCommand, networkGroupsMemberAddCommand, networkGroupsMemberRemoveCommand],
+  });
+  // member category - end
+
+  // peer category - start
+  const networkGroupsPeerListCommand = cliparse.command('list', {
+    description: 'List peers of a Network Group',
+    options: [opts.ngIdOrLabel, opts.jsonFormat],
+  }, networkgroups('listPeers'));
+  const networkGroupsPeerGetCommand = cliparse.command('get', {
+    description: 'Get a Network Group peer details',
+    options: [opts.ngIdOrLabel, opts.ngPeerId, opts.jsonFormat],
+  }, networkgroups('getPeer'));
+  const networkGroupsPeerAddCommand = cliparse.command('add-external', {
+    description: 'Add an external node as a Network Group peer',
+    options: [opts.ngIdOrLabel, opts.ngPeerRole, opts.wgPublicKey, opts.ngPeerLabel, opts.ngPeerParentMemberId],
+  }, networkgroups('addExternalPeer'));
+  const networkGroupsPeerRemoveExternalCommand = cliparse.command('remove-external', {
+    description: 'Remove an external node from a Network Group',
+    options: [opts.ngIdOrLabel, opts.ngPeerId],
+  }, networkgroups('removeExternalPeer'));
+
+  const networkGroupsPeersCategoryCommand = cliparse.command('peers', {
+    description: 'List commands for interacting with Network Group peers',
+    commands: [networkGroupsPeerListCommand, networkGroupsPeerGetCommand, networkGroupsPeerAddCommand, networkGroupsPeerRemoveExternalCommand],
+  });
+  // peer category - end
+
+  const networkGroupsCommand = cliparse.command('networkgroups', {
+    description: 'List Network Group commands',
+    options: [opts.orgaIdOrName, opts.alias],
+    commands: [networkGroupsListCommand, networkGroupsCreateCommand, networkGroupsDeleteCommand, networkGroupsMembersCategoryCommand, networkGroupsPeersCategoryCommand],
+  });
+  const ngCommand = cliparse.command('ng', {
+    description: `Alias for ${Formatter.formatCommand('clever networkgroups')}`,
+    options: [opts.orgaIdOrName, opts.alias],
+    commands: [networkGroupsListCommand, networkGroupsCreateCommand, networkGroupsDeleteCommand, networkGroupsMembersCategoryCommand, networkGroupsPeersCategoryCommand],
+  });
+
   // NOTIFY-EMAIL COMMAND
   const notifyEmail = lazyRequirePromiseModule('../src/commands/notify-email.js');
   const addEmailNotificationCommand = cliparse.command('add', {
@@ -780,6 +1023,8 @@ function run () {
       logoutCommand,
       logsCommand,
       makeDefaultCommand,
+      networkGroupsCommand,
+      ngCommand,
       openCommand,
       consoleCommand,
       profileCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "2.9.0",
+  "version": "2.10.0-beta.1",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -15,9 +15,9 @@
   "author": "Clever Cloud <ci@clever-cloud.com>",
   "license": "Apache-2.0",
   "bin": {
-    "clever": "./bin/clever.js",
-    "install-clever-completion": "./scripts/install-autocomplete.sh",
-    "uninstall-clever-completion": "./scripts/uninstall-autocomplete.sh"
+    "clever": "bin/clever.js",
+    "install-clever-completion": "scripts/install-autocomplete.sh",
+    "uninstall-clever-completion": "scripts/uninstall-autocomplete.sh"
   },
   "files": [
     "bin",
@@ -25,7 +25,7 @@
     "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "^7.4.0",
+    "@clevercloud/client": "7.9.0",
     "clf-date": "^0.2.0",
     "cliparse": "^0.3.3",
     "colors": "1.4.0",
@@ -36,12 +36,13 @@
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
     "moment": "^2.29.1",
-    "opn": "^6.0.0",
+    "open": "^8.4.0",
     "slugify": "^1.5.3",
     "string-length": "^4.0.2",
     "superagent": "^6.1.0",
     "text-table": "^0.2.0",
     "update-notifier": "^5.1.0",
+    "uuid": "^8.3.2",
     "ws": "^7.4.6",
     "xdg": "^0.1.1"
   },

package/src/commands/applications.js

@@ -6,29 +6,38 @@ const AppConfig = require('../models/app_configuration.js');
 const Logger = require('../logger.js');
 
 async function list (params) {
-  const { 'only-aliases': onlyAliases } = params.options;
+  const { 'only-aliases': onlyAliases, json } = params.options;
 
   const { apps } = await AppConfig.loadApplicationConf();
 
-  const formattedApps = formatApps(apps, onlyAliases);
+  const formattedApps = formatApps(apps, onlyAliases, json);
   Logger.println(formattedApps);
 };
 
-function formatApps (apps, onlyAliases) {
+function formatApps (apps, onlyAliases, json) {
 
-  if (onlyAliases) {
-    return apps.map((a) => a.alis).join('\n');
+  if (json) {
+    if (onlyAliases) {
+      apps = apps.map((a) => a.alias);
+    }
+    return JSON.stringify(apps, null, 2);
+  }
+  else {
+    if (onlyAliases) {
+      return apps.map((a) => a.alias).join('\n');
+    }
+    else {
+      return apps
+        .map((app) =>
+          [
+            `Application ${app.name}`,
+            `  alias: ${colors.bold(app.alias)}`,
+            `  id: ${app.app_id}`,
+            `  deployment url: ${app.deploy_url}`].join('\n'),
+        )
+        .join('\n\n');
+    }
   }
-
-  return apps
-    .map((app) => {
-      return [
-        `Application ${app.name}`,
-        `  alias: ${colors.bold(app.alias)}`,
-        `  id: ${app.app_id}`,
-        `  deployment url: ${app.deploy_url}`].join('\n');
-    })
-    .join('\n\n');
 }
 
 module.exports = { list };

package/src/commands/console.js

@@ -2,7 +2,7 @@
 
 const AppConfig = require('../models/app_configuration.js');
 const Logger = require('../logger.js');
-const openPage = require('opn');
+const openPage = require('open');
 
 async function openConsole (params) {
   const { alias } = params.options;

package/src/commands/login.js

@@ -6,7 +6,7 @@ const util = require('util');
 const delay = util.promisify(setTimeout);
 
 const colors = require('colors/safe');
-const open = require('opn');
+const open = require('open');
 const superagent = require('superagent');
 
 const Logger = require('../logger.js');

package/src/commands/networkgroups/commands.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  ...require('./index.js'),
+  ...require('./members.js'),
+  ...require('./peers.js'),
+};

package/src/commands/networkgroups/index.js

@@ -0,0 +1,67 @@
+'use strict';
+
+const ngApi = require('@clevercloud/client/cjs/api/v4/network-group.js');
+
+const { sendToApi } = require('../../models/send-to-api.js');
+
+const Logger = require('../../logger.js');
+const NetworkGroup = require('../../models/networkgroup.js');
+const Formatter = require('../../models/format-string.js');
+const TableFormatter = require('../../models/format-ng-table.js');
+
+async function listNetworkGroups(params) {
+  const { org: orgaIdOrName, alias, json } = params.options;
+  const ownerId = await NetworkGroup.getOwnerId(orgaIdOrName, alias);
+
+  Logger.info(`Listing Network Groups from owner ${Formatter.formatString(ownerId)}`);
+  const result = await ngApi.listNetworkGroups({ ownerId }).then(sendToApi);
+
+  if (json) {
+    Logger.println(JSON.stringify(result, null, 2));
+  }
+  else {
+    if (result.length === 0) {
+      Logger.println(`No Network Group found for ${ownerId}. You can create one with ${Formatter.formatCommand('clever networkgroups create')}.`);
+    }
+    else {
+      TableFormatter.printNetworkGroupsTableHeader();
+      result
+        .map((ng) => TableFormatter.formatNetworkGroupsLine(ng))
+        .forEach((ng) => Logger.println(ng));
+    }
+  }
+}
+
+async function createNg(params) {
+  const { org: orgaIdOrName, alias, label, description, tags, json } = params.options;
+  const ownerId = await NetworkGroup.getOwnerId(orgaIdOrName, alias);
+
+  Logger.info(`Creating Network Group from owner ${Formatter.formatString(ownerId)}`);
+  const body = { ownerId: ownerId, label, description, tags };
+  Logger.debug('Sending body: ' + JSON.stringify(body, null, 2));
+  const result = await ngApi.createNetworkGroup({ ownerId }, body).then(sendToApi);
+
+  if (json) {
+    Logger.println(JSON.stringify(result, null, 2));
+  }
+  else {
+    Logger.println(`Network Group ${Formatter.formatString(label)} creation will be performed asynchronously.`);
+  }
+}
+
+async function deleteNg(params) {
+  const { org: orgaIdOrName, alias, ng: networkGroupIdOrLabel } = params.options;
+  const ownerId = await NetworkGroup.getOwnerId(orgaIdOrName, alias);
+  const networkGroupId = await NetworkGroup.getId(ownerId, networkGroupIdOrLabel);
+
+  Logger.info(`Deleting Network Group ${Formatter.formatString(networkGroupId)} from owner ${Formatter.formatString(ownerId)}`);
+  await ngApi.deleteNetworkGroup({ ownerId, networkGroupId }).then(sendToApi);
+
+  Logger.println(`Network Group ${Formatter.formatString(networkGroupId)} deletion will be performed asynchronously.`);
+}
+
+module.exports = {
+  listNetworkGroups,
+  createNg,
+  deleteNg,
+};