clever-tools 2.10.1 → 3.0.0

package/CHANGELOG.md

@@ -1,11 +1,34 @@
 # clever-tools changelog
 
-## Unrelease (????-??-??)
+## Unreleased (????-??-??)
+
+...
+
+## 3.0.0 (2023-10-19)
+
+### ⚠ BREAKING CHANGES
+
+* Move from Node.js v12.22.8 to v18.5.0
+
+### Features
+
+* add config file and auth source to `clever diag`
+* add shell to `clever diag`
+* improve `clever diag`, display (color and details) for oAuth token and user ID
+* `clever deploy`: use new logs API (faster, longer, order)
+* `clever restart`: use new logs API (faster, longer, order)
+* `clever logs`: use new logs API (faster, longer, order), only for applications for now
+
+## 2.11.0 (2023-07-25)
+
+* skip preorder step on addon creation
+* add `clever addon env` command
+* improve implicit ID params (owner and add-on ID / real ID) for `clever database`
 
 ## 2.10.1 (2023-02-20)
 
 * `clever database` command
-  * Improve output when trying 
+  * Improve output when trying
 * `clever database backups` command
   * Improve output when there are no backups yet
   * Fix command with personal orga
@@ -13,8 +36,8 @@
 
 ## 2.10.0 (2023-02-16)
 
-* add `clever database backups DATABASE-ID` command to list backups of a database 
-* add `clever database backups download DATABASE-ID BACKUP-IP` command to download a backup 
+* add `clever database backups DATABASE-ID` command to list backups of a database
+* add `clever database backups download DATABASE-ID BACKUP-IP` command to download a backup
 * add `clever curl` so we can prefix any `curl` command with `clever` and benefit from the local oAuth v1 auth
 
 ## 2.10.0-beta.2 (2022-09-13)
@@ -55,7 +78,7 @@
 
 * Fix linux-release-info usage in `clever diag`
 
-## 2.7.0 (2020-08-20) 
+## 2.7.0 (2020-08-20)
 
 * Improve `clever deploy` perfs in several cases (partial push, force push...)
   * NOTE: Pushing a brand new repo is still slow in some situations
@@ -64,8 +87,8 @@
   * `clever domain favourite` just displays the favourite domain (no prefix)
   * `clever domain favourite set example.com` sets the favourite domain to `example.com`
   * `clever domain favourite unset` unsets the favourite domain for this app
-* Add a message while waiting for deploy to start `clever deploy` and `clever restart` 
-* Add shallow detection with appropriate error message for `clever deploy` 
+* Add a message while waiting for deploy to start `clever deploy` and `clever restart`
+* Add shallow detection with appropriate error message for `clever deploy`
 * Fix `clever status` typo in output (Clément Delafargue)
 * Fix `clever env` error message when JSON input is incorrect (Jean Baptiste Noblot)
 * Update dependencies
@@ -86,7 +109,7 @@ This is the one with the latest isomorphic-git!!!
 * Add `clever config` command to configure application options
   * Existing supported options: `name`, `description`, `zero-downtime`, `sticky-sessions` and `cancel-on-push`
   * New supported option: `force-https`
-* Add `--follow` to `clever deploy` and `clever restart` so you can continue to follow logs after the deployment is finished 
+* Add `--follow` to `clever deploy` and `clever restart` so you can continue to follow logs after the deployment is finished
 * Fix #318 where `clever deploy` and `clever restart` would sometimes never exit
    * We changed the way we detect when a deployment is finished
 * Fix #304 where `clever logs` would run endlessly even when using `--before/--until`
@@ -94,7 +117,7 @@ This is the one with the latest isomorphic-git!!!
 ### Internals
 
 * We completely removed our dependency to Bacon.js, goodbye old friend 😘
-* `@clevercloud/client` was updated to `6.0.0` so we can use the new event based API for logs and events 
+* `@clevercloud/client` was updated to `6.0.0` so we can use the new event based API for logs and events
 
 ## 2.4.0 (2020-04-16)
 
@@ -249,7 +272,7 @@ These release were only created for some tests on our CI pipeline.
 
 - Log error trace in --verbose mode
 - Update deps (rename opn => open)
-- Fix logs with `clever deploy` (update @clevercloud/client to 2.0.0-beta.1) 
+- Fix logs with `clever deploy` (update @clevercloud/client to 2.0.0-beta.1)
 - Fix typo "connexion" => "connection" in logs and README
 
 ## 1.5.0-beta.5 (2019-08-01)
@@ -279,7 +302,7 @@ These release were only created for some tests on our CI pipeline.
 - Ease testing for preprod with comments in config
 - Update @clevercloud/client to 2.0.0-beta.0
 
-## 1.5.0-beta.4 (2019-07-25) 
+## 1.5.0-beta.4 (2019-07-25)
 
 - Fix --add-export option for `clever env`
 
@@ -381,7 +404,7 @@ These release were only created for some tests on our CI pipeline.
 
 - Replace [nodegit](https://github.com/nodegit/nodegit) with [isomorphic-git](https://github.com/isomorphic-git/isomorphic-git)
 - Add ESLint config with a big refactoring to go along
-- Always use the npm `colors` package in safe mode: no global `String` pollution 
+- Always use the npm `colors` package in safe mode: no global `String` pollution
 - Build, package and publish with a multibranch pipeline project on Jenkins
 
 ### Packaging & distribution

package/README.md

@@ -39,7 +39,7 @@ If you are using a GNU/Linux distribution that uses `.deb` packages like Debian
 
 ```sh
 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
+echo "deb [arch=$(dpkg --print-architecture) 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
 ```
@@ -51,7 +51,7 @@ NOTES:
 * If you want access to the beta channel, you can use this in your `sources.list`:
 
 ```sh
-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
+echo "deb [arch=$(dpkg --print-architecture) 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)
@@ -252,7 +252,7 @@ Where `type` is one of:
 - `php`: for PHP applications
 - `play1`: for Play1 applications
 - `play2`: for Play2 applications
-- `python`: for python27 applications
+- `python`: for python27 and python3 applications
 - `ruby`: for ruby applications
 - `rust`: for rust applications
 - `sbt`: for applications launched with SBT
@@ -334,9 +334,12 @@ ElasticSearch drains use the Elastic bulk API. To match this endpoint, specify `
 
 Datadog has two zones, EU and COM. An account on one zone is not available on the other, make sure to target the good EU or COM intake endpoint.
 
-To create a [Datadog](https://docs.datadoghq.com/api/?lang=python#send-logs-over-http) drain, you just need to use:
+To create a [Datadog](https://docs.datadoghq.com/api/?lang=python#send-logs-over-http) drain, you just need to use one of the following command depending on your zone:
 
 ```sh
+# EU
+clever drain create DatadogHTTP "https://http-intake.logs.datadoghq.eu/v1/input/<API_KEY>?ddsource=clevercloud&service=<SERVICE>&host=<HOST>"
+# US
 clever drain create DatadogHTTP "https://http-intake.logs.datadoghq.com/v1/input/<API_KEY>?ddsource=clevercloud&service=<SERVICE>&host=<HOST>"
 ```
 

package/bin/clever.js

@@ -13,12 +13,15 @@ if (process.argv.includes('--autocomplete-index')) {
 }
 
 const cliparse = require('cliparse');
+const cliparseCommands = require('cliparse/src/command.js');
 const updateNotifier = require('update-notifier');
+const _sortBy = require('lodash/sortBy.js');
 
 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');
 
 // Exit cleanly if the program we pipe to exits abruptly
 process.stdout.on('error', (error) => {
@@ -63,7 +66,6 @@ function lazyRequire (modulePath) {
   };
 }
 
-const AccessLogs = lazyRequire('../src/models/accesslogs.js');
 const Addon = lazyRequire('../src/models/addon.js');
 const Application = lazyRequire('../src/models/application.js');
 const ApplicationConfiguration = lazyRequire('../src/models/application_configuration.js');
@@ -89,7 +91,7 @@ function run () {
     }),
     appNameCreation: cliparse.argument('app-name', { description: 'Application name' }),
     backupId: cliparse.argument('backup-id', { description: 'A Database backup ID (format: UUID)' }),
-    databaseId: cliparse.argument('database-id', { description: 'A database ID (format: postgresql_UUID, mysql_UUID, ...)' }),
+    databaseId: cliparse.argument('database-id', { description: 'Any database ID (format: addon_UUID, postgresql_UUID, mysql_UUID, ...)' }),
     drainId: cliparse.argument('drain-id', { description: 'Drain ID' }),
     drainType: cliparse.argument('drain-type', {
       description: 'Drain type',
@@ -127,16 +129,8 @@ function run () {
   // OPTIONS
   const opts = {
     sourceableEnvVarsList: cliparse.flag('add-export', { description: 'Display sourceable env variables setting' }),
-    accesslogsFormat: cliparse.option('format', {
-      aliases: ['F'],
-      metavar: 'format',
-      parser: Parsers.accessLogsFormat,
-      default: 'simple',
-      description: 'Output format (one of simple, extended, clf or json)',
-      complete () {
-        return cliparse.autocomplete.words(AccessLogs('listAvailableFormats')());
-      },
-    }),
+    accesslogsFormat: getOutputFormatOption(['simple', 'extended', 'clf']),
+    addonEnvFormat: getOutputFormatOption(['shell']),
     accesslogsFollow: cliparse.flag('follow', {
       aliases: ['f'],
       description: 'Display access logs continuously (ignores before/until, after/since)',
@@ -512,6 +506,7 @@ function run () {
       description: 'A WireGuard® private key',
     }),
     jsonFormat: cliparse.flag('json', { aliases: ['j'], description: 'Show result in JSON format' }),
+    humanJsonOutputFormat: getOutputFormatOption(),
     tag: cliparse.option('tag', {
       required: true,
       metavar: 'tag',
@@ -581,10 +576,16 @@ function run () {
     description: 'List available addon providers',
     commands: [addonShowProviderCommand],
   }, addon('listProviders'));
+  const addonEnvCommand = cliparse.command('env', {
+    description: 'List the environment variables for an add-on',
+    options: [opts.addonEnvFormat],
+    args: [opts.addonId],
+  }, addon('env'));
+
   const addonCommands = cliparse.command('addon', {
     description: 'Manage addons',
     options: [opts.orgaIdOrName],
-    commands: [addonCreateCommand, addonDeleteCommand, addonRenameCommand, addonProvidersCommand],
+    commands: [addonCreateCommand, addonDeleteCommand, addonRenameCommand, addonProvidersCommand, addonEnvCommand],
   }, addon('list'));
 
   // APPLICATIONS COMMAND
@@ -626,7 +627,7 @@ function run () {
   const appCreateCommand = cliparse.command('create', {
     description: 'Create a Clever Cloud application',
     args: [args.appNameCreation],
-    options: [opts.instanceType, opts.orgaIdOrName, opts.aliasCreation, opts.region, opts.github],
+    options: [opts.instanceType, opts.orgaIdOrName, opts.aliasCreation, opts.region, opts.github, opts.humanJsonOutputFormat],
   }, create('create'));
 
   // DELETE COMMAND
@@ -828,11 +829,13 @@ function run () {
   });
   // peer category - end
 
+  // eslint-disable-next-line no-unused-vars
   const networkGroupsCommand = cliparse.command('networkgroups', {
     description: 'List Network Group commands',
     options: [opts.orgaIdOrName, opts.alias],
     commands: [networkGroupsListCommand, networkGroupsCreateCommand, networkGroupsDeleteCommand, networkGroupsMembersCategoryCommand, networkGroupsPeersCategoryCommand],
   });
+  // eslint-disable-next-line no-unused-vars
   const ngCommand = cliparse.command('ng', {
     description: `Alias for ${Formatter.formatCommand('clever networkgroups')}`,
     options: [opts.orgaIdOrName, opts.alias],
@@ -1011,7 +1014,7 @@ function run () {
   const downloadBackupCommand = cliparse.command('download', {
     description: 'Download a database backup',
     args: [args.databaseId, args.backupId],
-    options: [opts.orgaIdOrName, opts.output],
+    options: [opts.output],
   }, database('downloadBackups'));
   const backupsCommand = cliparse.command('backups', {
     description: 'List available database backups',
@@ -1030,51 +1033,55 @@ function run () {
     console.info('clever database backups download');
   });
 
+  const commands = _sortBy([
+    accesslogsCommand,
+    activityCommand,
+    addonCommands,
+    appCreateCommand,
+    applicationsCommand,
+    appLinkCommand,
+    appUnlinkCommand,
+    cancelDeployCommand,
+    configCommands,
+    databaseCommand,
+    deleteCommand,
+    deployCommand,
+    diagCommand,
+    domainCommands,
+    drainCommands,
+    emailNotificationsCommand,
+    envCommands,
+    cliparseCommands.helpCommand,
+    loginCommand,
+    logoutCommand,
+    logsCommand,
+    makeDefaultCommand,
+    // Not ready for stable release yet
+    // networkGroupsCommand,
+    // ngCommand,
+    openCommand,
+    consoleCommand,
+    profileCommand,
+    publishedConfigCommands,
+    restartCommand,
+    scaleCommand,
+    serviceCommands,
+    sshCommand,
+    statusCommand,
+    stopCommand,
+    tcpRedirsCommands,
+    versionCommand,
+    webhooksCommand,
+  ], 'name');
+
   // CLI PARSER
   const cliParser = cliparse.cli({
     name: 'clever',
     description: 'CLI tool to manage Clever Cloud data and products',
     version: pkg.version,
     options: [opts.verbose, opts.noUpdateNotifier],
-    commands: [
-      accesslogsCommand,
-      activityCommand,
-      addonCommands,
-      appCreateCommand,
-      applicationsCommand,
-      appLinkCommand,
-      appUnlinkCommand,
-      cancelDeployCommand,
-      configCommands,
-      databaseCommand,
-      deleteCommand,
-      deployCommand,
-      diagCommand,
-      domainCommands,
-      drainCommands,
-      emailNotificationsCommand,
-      envCommands,
-      loginCommand,
-      logoutCommand,
-      logsCommand,
-      makeDefaultCommand,
-      // Not ready for stable release yet
-      // networkGroupsCommand,
-      // ngCommand,
-      openCommand,
-      consoleCommand,
-      profileCommand,
-      publishedConfigCommands,
-      restartCommand,
-      scaleCommand,
-      serviceCommands,
-      sshCommand,
-      statusCommand,
-      stopCommand,
-      tcpRedirsCommands,
-      versionCommand,
-      webhooksCommand,
-    ],
+    helpCommand: false,
+    commands,
   });
 
   // Make sure argv[0] is always "node"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "2.10.1",
+  "version": "3.0.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -9,9 +9,9 @@
     "clever cloud"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=18"
   },
-  "pkg-node-version": "12",
+  "pkg-node-version": "18",
   "author": "Clever Cloud <ci@clever-cloud.com>",
   "license": "Apache-2.0",
   "bin": {
@@ -25,7 +25,7 @@
     "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "7.9.0",
+    "@clevercloud/client": "^8.0.1",
     "clf-date": "^0.2.0",
     "cliparse": "^0.3.3",
     "colors": "1.4.0",
@@ -64,7 +64,7 @@
     "grunt-http": "^2.3.3",
     "grunt-mocha-test": "^0.13.3",
     "mocha": "^8.4.0",
-    "pkg": "^5.2.1",
+    "pkg": "^5.8.1",
     "semver": "^7.3.5"
   },
   "scripts": {
@@ -87,7 +87,6 @@
     ]
   },
   "volta": {
-    "node": "12.22.8",
-    "npm": "6.14.15"
+    "node": "18.5.0"
   }
 }

package/src/commands/addon.js

@@ -9,7 +9,11 @@ const formatTable = require('../format-table')();
 const Logger = require('../logger.js');
 const Organisation = require('../models/organisation.js');
 const User = require('../models/user.js');
-const { parseAddonOptions } = require('../models/addon.js');
+const { parseAddonOptions, findOwnerId } = require('../models/addon.js');
+const { getAllEnvVars } = require('@clevercloud/client/cjs/api/v2/addon.js');
+const { sendToApi } = require('../models/send-to-api.js');
+const { toNameEqualsValueString } = require('@clevercloud/client/cjs/utils/env-vars.js');
+const { resolveAddonId } = require('../models/ids-resolver.js');
 
 async function list (params) {
   const { org: orgaIdOrName } = params.options;
@@ -57,7 +61,16 @@ async function create (params) {
     Logger.println(`Addon ${name} (id: ${newAddon.id}) successfully created and linked to the application`);
   }
   else {
-    const newAddon = await Addon.create({ ownerId, name, providerName, planName, region, skipConfirmation, version, addonOptions });
+    const newAddon = await Addon.create({
+      ownerId,
+      name,
+      providerName,
+      planName,
+      region,
+      skipConfirmation,
+      version,
+      addonOptions,
+    });
     Logger.println(`Addon ${name} (id: ${newAddon.id}) successfully created`);
   }
 }
@@ -142,6 +155,36 @@ async function showProvider (params) {
   });
 }
 
+async function env (params) {
+
+  const { org, format } = params.options;
+  const [addonIdOrRealId] = params.args;
+
+  const addonId = await resolveAddonId(addonIdOrRealId);
+  const ownerId = await findOwnerId(org, addonId);
+
+  const envFromAddon = await getAllEnvVars({ id: ownerId, addonId }).then(sendToApi);
+
+  switch (format) {
+
+    case 'json': {
+      const envFromAddonJson = Object.fromEntries(
+        envFromAddon.map(({ name, value }) => [name, value]),
+      );
+      Logger.println(JSON.stringify(envFromAddonJson, null, 2));
+      break;
+    }
+
+    case 'shell':
+      Logger.println(toNameEqualsValueString(envFromAddon, { addExports: true }));
+      break;
+
+    case 'human':
+    default:
+      Logger.println(toNameEqualsValueString(envFromAddon, { addExports: false }));
+  }
+}
+
 module.exports = {
   list,
   create,
@@ -149,4 +192,5 @@ module.exports = {
   rename,
   listProviders,
   showProvider,
+  env,
 };

package/src/commands/create.js

@@ -3,17 +3,28 @@
 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 } = params.options;
+  const { org: orgaIdOrName, alias, region, github: githubOwnerRepo, format } = params.options;
   const github = getGithubDetails(githubOwnerRepo);
 
   const app = await Application.create(name, typeName, region, orgaIdOrName, github);
   await AppConfig.addLinkedApplication(app, alias);
 
-  Logger.println('Your application has been successfully created!');
+  switch (format) {
+
+    case 'json': {
+      console.log(JSON.stringify(app, null, 2));
+      break;
+    }
+
+    case 'human':
+    default:
+      Logger.println('Your application has been successfully created!');
+  }
 };
 
 function getGithubDetails (githubOwnerRepo) {

package/src/commands/curl.js

@@ -3,7 +3,7 @@
 const { parseCurlCommand } = require('curlconverter/util.js');
 const { spawn } = require('child_process');
 const { loadOAuthConf, conf } = require('../models/configuration.js');
-const { addOauthHeader } = require('@clevercloud/client/cjs/oauth.node.js');
+const { addOauthHeader } = require('@clevercloud/client/cjs/oauth.js');
 
 async function loadTokens () {
   const tokens = await loadOAuthConf();

package/src/commands/database.js

@@ -5,20 +5,19 @@ const { getBackups } = require('@clevercloud/client/cjs/api/v2/backups.js');
 const { println } = require('../logger.js');
 const formatTable = require('../format-table')();
 const superagent = require('superagent');
-const { getSummary } = require('@clevercloud/client/cjs/api/v2/user.js');
 const fs = require('fs');
+const { findOwnerId } = require('../models/addon.js');
+const { resolveRealId } = require('../models/ids-resolver.js');
 
 async function listBackups (params) {
 
-  const [databaseId] = params.args;
   const { org } = params.options;
+  const [addonIdOrRealId] = params.args;
 
-  const ownerId = await resolveOwnerId(org, databaseId);
-  if (ownerId == null) {
-    throw new Error('organisation ID is mandatory');
-  }
+  const addonId = await resolveRealId(addonIdOrRealId);
+  const ownerId = await findOwnerId(org, addonId);
 
-  const backups = await getBackups({ ownerId, ref: databaseId }).then(sendToApi);
+  const backups = await getBackups({ ownerId, ref: addonId }).then(sendToApi);
 
   if (backups.length === 0) {
     println('There are no backups yet');
@@ -47,15 +46,13 @@ async function listBackups (params) {
 
 async function downloadBackups (params) {
 
-  const [databaseId, backupId] = params.args;
   const { org, output } = params.options;
+  const [addonIdOrRealId, backupId] = params.args;
 
-  const ownerId = await resolveOwnerId(org, databaseId);
-  if (ownerId == null) {
-    throw new Error('organisation ID is mandatory');
-  }
+  const addonId = await resolveRealId(addonIdOrRealId);
+  const ownerId = await findOwnerId(org, addonId);
 
-  const backups = await getBackups({ ownerId, ref: databaseId }).then(sendToApi);
+  const backups = await getBackups({ ownerId, ref: addonId }).then(sendToApi);
   const backup = backups.find((backup) => backup.backup_id === backupId);
 
   if (backup == null) {
@@ -74,33 +71,4 @@ async function downloadBackups (params) {
   process.stdout.write(res.body);
 }
 
-/**
- * Try to get an ownerId from the API
- * @param {*} org cliparse param's option for orga
- * @param {String} databaseId the resource which belong to the owner we are looking for
- * @returns the owner ID (or null if cannot be found)
- */
-async function resolveOwnerId (org, databaseId) {
-
-  if (org != null && org.orga_name != null) {
-    return org.orga_name;
-  }
-
-  const summary = await getSummary().then(sendToApi);
-
-  const userHasAddon = summary.user.addons.some((addon) => addon.realId === databaseId);
-  if (userHasAddon) {
-    return summary.user.id;
-  }
-
-  for (const orga of summary.organisations) {
-    const orgaHasAddon = orga.addons.some((addon) => addon.realId === databaseId);
-    if (orgaHasAddon) {
-      return orga.id;
-    }
-  }
-
-  return null;
-}
-
 module.exports = { listBackups, downloadBackups };

package/src/commands/deploy.js

@@ -5,7 +5,7 @@ const colors = require('colors/safe');
 const AppConfig = require('../models/app_configuration.js');
 const Application = require('../models/application.js');
 const git = require('../models/git.js');
-const Log = require('../models/log.js');
+const Log = require('../models/log-v4.js');
 const Logger = require('../logger.js');
 const { getAllDeployments } = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('../models/send-to-api.js');

package/src/commands/diag.js

@@ -8,12 +8,12 @@ const colors = require('colors/safe');
 const Logger = require('../logger.js');
 const pkg = require('../../package.json');
 const User = require('../models/user.js');
-const { loadOAuthConf } = require('../models/configuration.js');
+const { conf, loadOAuthConf } = require('../models/configuration.js');
 
 async function diag () {
 
-  const userId = await User.getCurrentId().catch(() => 'Not connected');
-  const oauthToken = await loadOAuthConf().then((o) => o.token).catch(() => 'Not connected');
+  const userId = await User.getCurrentId().catch(() => null);
+  const authDetails = await loadOAuthConf();
 
   Logger.println('clever-tools  ' + colors.green(pkg.version));
   Logger.println('Node.js       ' + colors.green(process.version));
@@ -28,12 +28,30 @@ async function diag () {
     Logger.println('Linux         ' + colors.green(linuxInfos));
   }
 
+  Logger.println('Shell         ' + colors.green(process.env.SHELL));
+
   const isPackaged = (process.pkg != null);
   Logger.println('Packaged      ' + colors.green(isPackaged));
   Logger.println('Exec path     ' + colors.green(process.execPath));
-
-  Logger.println('User id       ' + colors.green(userId || 'Not connected'));
-  Logger.println('oAuth token   ' + colors.green(oauthToken));
+  Logger.println('Config file   ' + colors.green(conf.CONFIGURATION_FILE));
+  Logger.println('Auth source   ' + colors.green(authDetails.source));
+
+  const oauthToken = (authDetails.token != null)
+    ? colors.green(authDetails.token)
+    : colors.red('(none)');
+  Logger.println('oAuth token   ' + oauthToken);
+
+  if (authDetails.token != null) {
+    if (userId != null) {
+      Logger.println('User ID       ' + colors.green(userId));
+    }
+    else {
+      Logger.println('User ID       ' + colors.red('Authentication failed'));
+    }
+  }
+  else {
+    Logger.println('User ID       ' + colors.red('Not connected'));
+  }
 }
 
 module.exports = { diag };

package/src/commands/logs.js

@@ -1,20 +1,31 @@
 'use strict';
 
 const AppConfig = require('../models/app_configuration.js');
-const Log = require('../models/log.js');
+const LogV2 = require('../models/log.js');
+const Log = require('../models/log-v4.js');
 const Logger = require('../logger.js');
+const { Deferred } = require('../models/utils.js');
 
 async function appLogs (params) {
   const { alias, after: since, before: until, search, 'deployment-id': deploymentId } = params.options;
-  const { addon: addonId } = params.options;
 
   // ignore --search ""
   const filter = (search !== '') ? search : null;
-  const appAddonId = addonId || await AppConfig.getAppDetails({ alias }).then(({ appId }) => appId);
+
+  const { appId, ownerId } = await AppConfig.getAppDetails({ alias });
 
   Logger.println('Waiting for application logs…');
 
-  return Log.displayLogs({ appAddonId, since, until, filter, deploymentId });
+  // TODO: drop when addons are migrated to the v4 API
+  if (params.addon) {
+    const { addon: addonId } = params.options;
+    const appAddonId = addonId || await AppConfig.getAppDetails({ alias }).then(({ appId }) => appId);
+    return LogV2.displayLogs({ appAddonId, since, until, filter, deploymentId });
+  }
+
+  const deferred = new Deferred();
+  await Log.displayLogs({ ownerId, appId, since, until, filter, deploymentId, deferred });
+  return deferred.promise;
 }
 
 module.exports = { appLogs };

package/src/commands/restart.js

@@ -5,7 +5,7 @@ const colors = require('colors/safe');
 const AppConfig = require('../models/app_configuration.js');
 const Application = require('../models/application.js');
 const git = require('../models/git.js');
-const Log = require('../models/log.js');
+const Log = require('../models/log-v4.js');
 const Logger = require('../logger.js');
 
 // Once the API call to redeploy() has been triggerred successfully,
@@ -24,9 +24,19 @@ async function restart (params) {
     Logger.println(`Restarting ${appName} on commit ${colors.green(commitId)}${cacheSuffix}`);
   }
 
+  // This should be handled by the API when a deployment ID is set but we'll do this for now
+  const redeployDate = new Date();
+
   const redeploy = await Application.redeploy(ownerId, appId, fullCommitId, withoutCache);
 
-  return Log.watchDeploymentAndDisplayLogs({ ownerId, appId, deploymentId: redeploy.deploymentId, quiet, follow });
+  return Log.watchDeploymentAndDisplayLogs({
+    ownerId,
+    appId,
+    deploymentId: redeploy.deploymentId,
+    quiet,
+    follow,
+    redeployDate,
+  });
 }
 
 module.exports = { restart };

package/src/get-output-format-option.js

@@ -0,0 +1,23 @@
+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);
+    },
+  });
+}
+
+module.exports = {
+  getOutputFormatOption,
+};

package/src/models/accesslogs.js

@@ -2,12 +2,10 @@
 
 const clfDate = require('clf-date');
 
-function listAvailableFormats () {
-  return ['simple', 'extended', 'clf', 'json'];
-}
-
 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':
@@ -53,4 +51,4 @@ function formatCLFAddon (l) {
   return `${l.ipS} - - [${clfDate(new Date(l.t))}] "- - -" - ${l.bOut}`;
 }
 
-module.exports = { listAvailableFormats, getFormatter };
+module.exports = { getFormatter };

package/src/models/addon.js

@@ -2,8 +2,13 @@
 
 const application = require('@clevercloud/client/cjs/api/v2/application.js');
 const autocomplete = require('cliparse').autocomplete;
-const colors = require('colors/safe');
-const { get: getAddon, getAll: getAllAddons, remove: removeAddon, create: createAddon, preorder: preorderAddon, update: updateAddon } = require('@clevercloud/client/cjs/api/v2/addon.js');
+const {
+  get: getAddon,
+  getAll: getAllAddons,
+  remove: removeAddon,
+  create: createAddon,
+  update: updateAddon,
+} = require('@clevercloud/client/cjs/api/v2/addon.js');
 const { getAllAddonProviders } = require('@clevercloud/client/cjs/api/v2/product.js');
 const { getSummary } = require('@clevercloud/client/cjs/api/v2/user.js');
 const { getAddonProvider } = require('@clevercloud/client/cjs/api/v4/addon-providers.js');
@@ -11,6 +16,7 @@ const { getAddonProvider } = require('@clevercloud/client/cjs/api/v4/addon-provi
 const Interact = require('./interact.js');
 const Logger = require('../logger.js');
 const { sendToApi } = require('../models/send-to-api.js');
+const { resolveOwnerId } = require('./ids-resolver.js');
 
 function listProviders () {
   return getAllAddonProviders({}).then(sendToApi);
@@ -167,19 +173,6 @@ async function create ({ ownerId, name, providerName, planName, region, skipConf
     options: createOptions,
   };
 
-  const result = await preorderAddon({ id: ownerId }, addonToCreate).then(sendToApi);
-
-  if (result.totalTTC > 0 && !skipConfirmation) {
-    result.lines.forEach(({ description, VAT, price }) => Logger.println(`${description}\tVAT: ${VAT}%\tPrice: ${price}€`));
-    Logger.println(`Total (without taxes): ${result.totalHT}€`);
-    Logger.println(colors.bold(`Total (with taxes): ${result.totalTTC}€`));
-
-    await Interact.confirm(
-      `You're about to pay ${result.totalTTC}€, confirm? (yes or no) `,
-      'No confirmation, aborting addon creation',
-    );
-  }
-
   return createAddon({ id: ownerId }, addonToCreate).then(sendToApi);
 }
 
@@ -255,6 +248,20 @@ async function findById (addonId) {
   throw new Error(`Could not find add-on with ID: ${addonId}`);
 }
 
+async function findOwnerId (org, addonId) {
+
+  if (org != null && org.orga_id != null) {
+    return org.orga_id;
+  }
+
+  const ownerId = await resolveOwnerId(addonId);
+  if (ownerId != null) {
+    return ownerId;
+  }
+
+  throw new Error(`Add-on ${addonId} does not exist`);
+}
+
 function parseAddonOptions (options) {
   if (options == null) {
     return {};
@@ -288,6 +295,7 @@ module.exports = {
   create,
   delete: deleteAddon,
   findById,
+  findOwnerId,
   getProvider,
   getProviderInfos,
   link,

package/src/models/configuration.js

@@ -10,63 +10,42 @@ const xdg = require('xdg');
 const Logger = require('../logger.js');
 const env = commonEnv(Logger);
 
-function getConfigDir () {
-  if (process.platform === 'win32') {
-    return path.resolve(process.env.APPDATA, 'clever-cloud');
-  }
-  else {
-    return xdg.basedir.configPath('clever-cloud');
-  }
-}
+const CONFIG_FILES = {
+  MAIN: 'clever-tools.json',
+  IDS_CACHE: 'ids-cache.json',
+};
 
-function getConfigPath () {
-  const configDir = getConfigDir();
-  return path.resolve(configDir, 'clever-tools.json');
-}
-
-async function isFile (path) {
-  try {
-    const pathStat = await fs.stat(path);
-    return pathStat.isFile();
-  }
-  catch (e) {
-    return false;
-  }
-}
-
-async function maybeMigrateFromLegacyConfigurationPath () {
-  // This used to be a file
-  const configDir = getConfigDir();
-  const legacyConfig = await isFile(configDir);
-  // If it is still a file, we replace it with a dir and move it inside
-  if (legacyConfig) {
-    const tmpConfigFile = `${configDir}.tmp`;
-    const configFile = getConfigPath();
-
-    // Rename so that we can create the directory
-    await fs.rename(configDir, tmpConfigFile);
-    await mkdirp(configDir, { mode: 0o700 });
-    await fs.rename(tmpConfigFile, configFile);
-  }
+function getConfigPath (configFile) {
+  const configDir = (process.platform === 'win32')
+    ? path.resolve(process.env.APPDATA, 'clever-cloud')
+    : xdg.basedir.configPath('clever-cloud');
+  return path.resolve(configDir, configFile);
 }
 
 async function loadOAuthConf () {
   Logger.debug('Load configuration from environment variables');
   if (process.env.CLEVER_TOKEN != null && process.env.CLEVER_SECRET != null) {
     return {
+      source: 'environment variables',
       token: process.env.CLEVER_TOKEN,
       secret: process.env.CLEVER_SECRET,
     };
   }
   Logger.debug('Load configuration from ' + conf.CONFIGURATION_FILE);
-  await maybeMigrateFromLegacyConfigurationPath();
   try {
     const rawFile = await fs.readFile(conf.CONFIGURATION_FILE);
-    return JSON.parse(rawFile);
+    const { token, secret } = JSON.parse(rawFile);
+    return {
+      source: 'configuration file',
+      token,
+      secret,
+    };
   }
   catch (error) {
     Logger.info(`Cannot load configuration from ${conf.CONFIGURATION_FILE}\n${error.message}`);
-    return {};
+    return {
+      source: 'none',
+    };
   }
 }
 
@@ -82,6 +61,32 @@ async function writeOAuthConf (oauthData) {
   }
 }
 
+async function loadIdsCache () {
+  const cachePath = getConfigPath(CONFIG_FILES.IDS_CACHE);
+  try {
+    const rawFile = await fs.readFile(cachePath);
+    return JSON.parse(rawFile);
+  }
+  catch (error) {
+    Logger.info(`Cannot load IDs cache from ${cachePath}\n${error.message}`);
+    return {
+      owners: {},
+      addons: {},
+    };
+  }
+}
+
+async function writeIdsCache (ids) {
+  const cachePath = getConfigPath(CONFIG_FILES.IDS_CACHE);
+  const idsJson = JSON.stringify(ids);
+  try {
+    await fs.writeFile(cachePath, idsJson);
+  }
+  catch (error) {
+    throw new Error(`Cannot write IDs cache to ${cachePath}\n${error.message}`);
+  }
+}
+
 const conf = env.getOrElseAll({
   API_HOST: 'https://api.clever-cloud.com',
   // API_HOST: 'https://ccapi-preprod.cleverapps.io',
@@ -94,7 +99,7 @@ const conf = env.getOrElseAll({
   OAUTH_CONSUMER_SECRET: 'MgVMqTr6fWlf2M0tkC2MXOnhfqBWDT',
   SSH_GATEWAY: 'ssh@sshgateway-clevercloud-customers.services.clever-cloud.com',
 
-  CONFIGURATION_FILE: getConfigPath(),
+  CONFIGURATION_FILE: getConfigPath(CONFIG_FILES.MAIN),
   CONSOLE_TOKEN_URL: 'https://console.clever-cloud.com/cli-oauth',
   // CONSOLE_TOKEN_URL: 'https://next-console.cleverapps.io/cli-oauth',
 
@@ -102,4 +107,4 @@ const conf = env.getOrElseAll({
   APP_CONFIGURATION_FILE: path.resolve('.', '.clever.json'),
 });
 
-module.exports = { conf, loadOAuthConf, writeOAuthConf };
+module.exports = { conf, loadOAuthConf, writeOAuthConf, loadIdsCache, writeIdsCache };

package/src/models/format-ng-table.js

@@ -42,7 +42,7 @@ const membersTableColumnLengths = [
   48, /* id length */
   12, /* type length */
   48, /* label length */
-  24, /* domain-name length */
+  110, /* domain-name length */
 ];
 const formatMembersTable = formatNgTable(membersTableColumnLengths);
 async function formatMembersLine (member, showAliases = false) {
@@ -71,23 +71,23 @@ async function printMembersTableHeader (naturalName = false) {
 
 const peersTableColumnLengths = [
   45, /* id length */
+  15, /* ip */
+  36, /* hostname */
   12, /* type length */
   14, /* endpoint type length */
-  48, /* label length */
-  24, /* hostname */
-  15, /* ip */
+  36, /* label length */
 ];
 const formatPeersTable = formatNgTable(peersTableColumnLengths);
 function formatPeersLine (peer) {
-  const ip = (peer.endpoint.type === 'ServerEndpoint') ? peer.endpoint.ng_term.ip : peer.endpoint.ng_ip;
+  const ip = (peer.endpoint.type === 'ServerEndpoint') ? peer.endpoint.ng_term.host : peer.endpoint.ng_ip;
   return formatPeersTable([
     [
       Formatter.formatId(peer.id),
+      Formatter.formatIp(ip),
+      Formatter.formatString(peer.hostname, false),
       Formatter.formatString(peer.type, false),
       Formatter.formatString(peer.endpoint.type, false),
       Formatter.formatString(peer.label, false),
-      Formatter.formatString(peer.hostname, false),
-      Formatter.formatIp(ip),
     ],
   ]);
 };
@@ -95,11 +95,11 @@ function printPeersTableHeader () {
   Logger.println(colors.bold(formatPeersTable([
     [
       'Peer ID',
+      'IP Address',
+      'Hostname',
       'Peer Type',
       'Endpoint Type',
       'Label',
-      'Hostname',
-      'IP Address',
     ],
   ])));
   printSeparator(peersTableColumnLengths);

package/src/models/ids-resolver.js

@@ -0,0 +1,110 @@
+const { getSummary } = require('@clevercloud/client/cjs/api/v2/user.js');
+const { sendToApi } = require('./send-to-api.js');
+const { loadIdsCache, writeIdsCache } = require('./configuration.js');
+
+/*
+This system uses a simplified representation of the summary to expose IDs links:
+
+* app ID => owner ID
+* add-on ID => owner ID
+* real add-on ID => owner ID
+* add-on ID => real add-on ID
+* real add-on ID => add-on ID
+
+{
+  owners: {
+    [appid]: [ownerId],
+    [addonId]: [ownerId],
+    [realId]: [ownerId],
+  },
+  addons: {
+    [addonId]: { realId: [realId], addonId: [addonId] },
+    [realId]: { realId: [realId], addonId: [addonId] },
+  },
+}
+ */
+
+async function resolveOwnerId (id) {
+  return getIdFromCacheOrSummary((ids) => ids.owners[id]);
+}
+
+async function resolveAddonId (id) {
+
+  const addonId = await getIdFromCacheOrSummary((ids) => {
+    return (ids.addons[id] != null) ? ids.addons[id].addonId : null;
+  });
+
+  if (addonId != null) {
+    return addonId;
+  }
+
+  throw new Error(`Add-on ${id} does not exist`);
+}
+
+async function resolveRealId (id) {
+
+  const realId = await getIdFromCacheOrSummary((ids) => {
+    return (ids.addons[id] != null) ? ids.addons[id].realId : null;
+  });
+
+  if (realId != null) {
+    return realId;
+  }
+
+  throw new Error(`Add-on ${id} does not exist foo`);
+}
+
+async function getIdFromCacheOrSummary (callback) {
+
+  const idsFromCache = await loadIdsCache();
+  const idFromCache = callback(idsFromCache);
+  if (idFromCache != null) {
+    return idFromCache;
+  }
+
+  const idsFromSummary = await getIdsFromSummary();
+  await writeIdsCache(idsFromSummary);
+
+  const idFromSummary = callback(idsFromSummary);
+  if (idFromSummary != null) {
+    return idFromSummary;
+  }
+
+  return null;
+}
+
+async function getIdsFromSummary () {
+
+  const ids = {
+    owners: {},
+    addons: {},
+  };
+
+  const summary = await getSummary().then(sendToApi);
+
+  const owners = [
+    summary.user,
+    ...summary.organisations,
+  ];
+
+  for (const owner of owners) {
+    for (const app of owner.applications) {
+      ids.owners[app.id] = owner.id;
+    }
+    for (const addon of owner.addons) {
+      ids.owners[addon.id] = owner.id;
+      ids.owners[addon.realId] = owner.id;
+      const addonIds = { addonId: addon.id, realId: addon.realId };
+      ids.addons[addon.id] = addonIds;
+      ids.addons[addon.realId] = addonIds;
+    }
+  }
+
+  return ids;
+}
+
+module.exports = {
+  resolveOwnerId,
+  resolveAddonId,
+  resolveRealId,
+};

package/src/models/log-v4.js

@@ -0,0 +1,136 @@
+const { getHostAndTokens } = require('./send-to-api.js');
+const colors = require('colors/safe');
+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');
+
+// 2000 logs per 100ms maximum
+const THROTTLE_ELEMENTS = 2000;
+const THROTTLE_PER_IN_MILLISECONDS = 100;
+
+async function displayLogs (params) {
+
+  const deferred = params.deferred || new Deferred();
+  const { apiHost, tokens } = await getHostAndTokens();
+  const { ownerId, appId, filter, since, until, deploymentId } = params;
+
+  const logStream = new ApplicationLogStream({
+    apiHost,
+    tokens,
+    ownerId,
+    appId,
+    since,
+    until,
+    deploymentId,
+    filter,
+    throttleElements: THROTTLE_ELEMENTS,
+    throttlePerInMilliseconds: THROTTLE_PER_IN_MILLISECONDS,
+  });
+
+  // Properly close the stream
+  process.once('SIGINT', (signal) => logStream.close(signal));
+
+  logStream
+    .on('open', (event) => {
+      Logger.debug(`stream opened! ${JSON.stringify({ appId, filter, deploymentId })}`);
+    })
+    .on('error', (event) => {
+      Logger.error(`an error occured: ${event.detail}`);
+    })
+    .onLog((log) => {
+      Logger.println(formatLogLine(log));
+    });
+
+  // start() is blocking until end of stream
+  logStream.start()
+    .then((reason) => deferred.resolve())
+    .catch((error) => deferred.reject(error));
+
+  return logStream;
+}
+
+async function watchDeploymentAndDisplayLogs (options) {
+
+  const {
+    ownerId,
+    appId,
+    deploymentId,
+    commitId,
+    knownDeployments,
+    quiet,
+    follow,
+    redeployDate,
+  } = options;
+
+  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})`));
+
+  const deferred = new Deferred();
+  let logsStream;
+
+  if (!quiet) {
+    // About the deferred…
+    // If displayLogs() throws an error,
+    // the async function we're in (watchDeploymentAndDisplayLogs) will stop here and the error will be passed to the parent.
+    // displayLogs() defines callback listeners so if it catches error in those callbacks,
+    // it has no proper way to bubble up the error here.
+    // Using the deferred enables this.
+    logsStream = await displayLogs({ ownerId, appId, deploymentId: deployment.uuid, since: redeployDate, deferred });
+  }
+
+  Logger.println('Waiting for application logs…');
+
+  // Wait for deployment end (or an error thrown by logs with the deferred)
+  const deploymentEnded = await Promise.race([
+    waitForDeploymentEnd({ ownerId, appId, deploymentId: deployment.uuid }),
+    deferred.promise,
+  ]);
+
+  if (!quiet && !follow) {
+    logsStream.close(quiet ? 'quiet' : 'follow');
+  }
+
+  if (deploymentEnded.state === 'OK') {
+    Logger.println(colors.bold.green('Deployment successful'));
+  }
+  else if (deploymentEnded.state === 'CANCELLED') {
+    throw new Error('Deployment was cancelled. Please check the activity');
+  }
+  else {
+    throw new Error('Deployment failed. Please check the logs');
+  }
+}
+
+function formatLogLine (log) {
+  const { date, message } = log;
+  if (isDeploymentSuccessMessage(log)) {
+    return `${date.toISOString()}: ${colors.bold.green(message)}`;
+  }
+  else if (isDeploymentFailedMessage(log)) {
+    return `${date.toISOString()}: ${colors.bold.red(message)}`;
+  }
+  else if (isBuildSucessMessage(log)) {
+    return `${date.toISOString()}: ${colors.bold.blue(message)}`;
+  }
+  return `${date.toISOString()}: ${message}`;
+}
+
+function isCleverMessage (log) {
+  return log.service !== 'bas-deploy.service';
+};
+
+function isDeploymentSuccessMessage (log) {
+  return isCleverMessage(log) && log.message.toLowerCase().startsWith('successfully deployed in');
+};
+
+function isDeploymentFailedMessage (log) {
+  return isCleverMessage(log) && log.message.toLowerCase().startsWith('deploy failed in');
+};
+
+function isBuildSucessMessage (log) {
+  return isCleverMessage(log) && log.message.toLowerCase().startsWith('build succeeded in');
+};
+
+module.exports = { displayLogs, watchDeploymentAndDisplayLogs };

package/src/models/send-to-api.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const Logger = require('../logger.js');
-const { addOauthHeader } = require('@clevercloud/client/cjs/oauth.node.js');
+const { addOauthHeader } = require('@clevercloud/client/cjs/oauth.js');
 const { conf, loadOAuthConf } = require('../models/configuration.js');
 const { execWarpscript } = require('@clevercloud/client/cjs/request-warp10.superagent.js');
 const { prefixUrl } = require('@clevercloud/client/cjs/prefix-url.js');
-const { request } = require('@clevercloud/client/cjs/request.superagent.js');
+const { request } = require('@clevercloud/client/cjs/request.fetch.js');
 
 async function loadTokens () {
   const tokens = await loadOAuthConf();

package/src/parsers.js

@@ -2,7 +2,6 @@
 
 const cliparse = require('cliparse');
 
-const AccessLogs = require('./models/accesslogs.js');
 const Application = require('./models/application.js');
 
 function flavor (flavor) {
@@ -79,14 +78,6 @@ function commaSeparated (string) {
   return cliparse.parsers.success(string.split(','));
 }
 
-function accessLogsFormat (format) {
-  const availableFormats = AccessLogs.listAvailableFormats();
-  if (availableFormats.includes(format)) {
-    return cliparse.parsers.success(format);
-  }
-  return cliparse.parsers.error('The format must be one of ' + availableFormats.join(', '));
-}
-
 function integer (string) {
   const integer = parseInt(string);
   if (isNaN(integer)) {
@@ -162,7 +153,6 @@ module.exports = {
   addonIdOrName,
   ngIdOrLabel,
   commaSeparated,
-  accessLogsFormat,
   integer,
   tag,
   tags,