WiP: feat(fs/glob): basic glob implementation

fix(xo-server-logs): explicit appDir
May fix #4576
2019-10-06 23:15:04 +02:00 · 2019-10-03 16:02:10 +02:00 · 2019-10-02 15:52:51 +02:00 · 2019-10-02 15:45:32 +02:00 · 2019-10-02 15:24:45 +02:00 · 2019-10-01 17:21:00 +02:00
43 changed files with 300 additions and 127 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -40,6 +40,13 @@ module.exports = {

    'react/jsx-handler-names': 'off',

+    // disabled because not always relevant, we might reconsider in the future
+    //
+    // enabled by https://github.com/standard/eslint-config-standard/commit/319b177750899d4525eb1210686f6aca96190b2f
+    //
+    // example: https://github.com/vatesfr/xen-orchestra/blob/31ed3767c67044ca445658eb6b560718972402f2/packages/xen-api/src/index.js#L156-L157
+    'lines-between-class-members': 'off',
+
    'no-console': ['error', { allow: ['warn', 'error'] }],
    'no-var': 'error',
    'node/no-extraneous-import': 'error',
--- a/@xen-orchestra/cr-seed-cli/package.json
+++ b/@xen-orchestra/cr-seed-cli/package.json
@@ -16,7 +16,7 @@
  },
  "dependencies": {
    "golike-defer": "^0.4.1",
-    "xen-api": "^0.27.1"
+    "xen-api": "^0.27.2"
  },
  "scripts": {
    "postversion": "npm publish"
--- a/@xen-orchestra/fs/src/_parseGlob.js
+++ b/@xen-orchestra/fs/src/_parseGlob.js
@@ -0,0 +1,38 @@
+import escapeRegExp from 'lodash/escapeRegExp'
+
+const compileFragment = pattern =>
+  new RegExp(
+    `^${pattern
+      .split('*')
+      .map(escapeRegExp)
+      .join('[^]*')}$`
+  )
+
+export function parseGlob(pattern) {
+  const parts = []
+  while (pattern.length !== 0) {
+    const i = pattern.indexOf('*')
+    if (i === -1) {
+      parts.push(pattern)
+      break
+    }
+
+    let fragmentStart = pattern.lastIndexOf('/', i)
+    if (fragmentStart === -1) {
+      fragmentStart = 0
+    } else {
+      parts.push(pattern.slice(0, fragmentStart))
+      ++fragmentStart
+    }
+
+    let fragmentEnd = pattern.indexOf('/', i)
+    if (fragmentEnd === -1) {
+      fragmentEnd = pattern.length
+    }
+
+    parts.push(compileFragment(pattern.slice(fragmentStart, fragmentEnd)))
+
+    pattern = pattern.slice(fragmentEnd + 1)
+  }
+  return parts
+}
--- a/@xen-orchestra/fs/src/_parseGlob.spec.js
+++ b/@xen-orchestra/fs/src/_parseGlob.spec.js
@@ -0,0 +1,12 @@
+/* eslint-env jest */
+
+import { parseGlob } from './_parseGlob'
+
+describe('parseGlob', () => {
+  it.each([['foo/*/bar*baz/qux', ['foo', /^[^]*$/, /^bar[^]*baz$/, 'qux']]])(
+    'parse %j correctly',
+    (pattern, result) => {
+      expect(parseGlob(pattern)).toEqual(result)
+    }
+  )
+})
--- a/@xen-orchestra/fs/src/abstract.js
+++ b/@xen-orchestra/fs/src/abstract.js
@@ -14,6 +14,7 @@ import { type Readable, type Writable } from 'stream'

 import normalizePath from './_normalizePath'
 import { createChecksumStream, validChecksumOfReadStream } from './checksum'
+import { parseGlob } from './_parseGlob'

 const { dirname } = path.posix

@@ -258,6 +259,12 @@ export default class RemoteHandlerAbstract {
    )
  }

+  // basic glob support, only `*` is supported
+  async glob(pattern) {
+    const parts = parseGlob(pattern)
+    // TODO
+  }
+
  async list(
    dir: string,
    {
--- a/@xen-orchestra/log/package.json
+++ b/@xen-orchestra/log/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@xen-orchestra/log",
-  "version": "0.1.4",
+  "version": "0.2.0",
  "license": "ISC",
  "description": "",
  "keywords": [],
--- a/@xen-orchestra/log/src/configure.js
+++ b/@xen-orchestra/log/src/configure.js
@@ -19,7 +19,8 @@ const createTransport = config => {
    }
  }

-  let { filter, transport } = config
+  let { filter } = config
+  let transport = createTransport(config.transport)
  const level = resolve(config.level)

  if (filter !== undefined) {
@@ -51,11 +52,12 @@ const symbol =
    ? Symbol.for('@xen-orchestra/log')
    : '@@@xen-orchestra/log'

+const { env } = process
 global[symbol] = createTransport({
  // display warnings or above, and all that are enabled via DEBUG or
  // NODE_DEBUG env
-  filter: process.env.DEBUG || process.env.NODE_DEBUG,
-  level: LEVELS.INFO,
+  filter: [env.DEBUG, env.NODE_DEBUG].filter(Boolean).join(','),
+  level: resolve(env.LOG_LEVEL, LEVELS.INFO),

  transport: createConsoleTransport(),
 })
--- a/@xen-orchestra/log/src/index.js
+++ b/@xen-orchestra/log/src/index.js
@@ -1,5 +1,5 @@
 import createTransport from './transports/console'
-import LEVELS from './levels'
+import LEVELS, { resolve } from './levels'

 const symbol =
  typeof Symbol !== 'undefined'
@@ -9,7 +9,8 @@ if (!(symbol in global)) {
  // the default behavior, without requiring `configure` is to avoid
  // logging anything unless it's a real error
  const transport = createTransport()
-  global[symbol] = log => log.level > LEVELS.WARN && transport(log)
+  const level = resolve(process.env.LOG_LEVEL, LEVELS.WARN)
+  global[symbol] = log => log.level >= level && transport(log)
 }

 // -------------------------------------------------------------------
@@ -72,5 +73,5 @@ prototype.wrap = function(message, fn) {
  }
 }

-const createLogger = namespace => new Logger(namespace)
+export const createLogger = namespace => new Logger(namespace)
 export { createLogger as default }
--- a/@xen-orchestra/log/src/levels.js
+++ b/@xen-orchestra/log/src/levels.js
@@ -13,11 +13,22 @@ for (const name in LEVELS) {
  NAMES[LEVELS[name]] = name
 }

-export const resolve = level => {
-  if (typeof level === 'string') {
-    level = LEVELS[level.toUpperCase()]
+// resolves to the number representation of a level
+//
+// returns `defaultLevel` if invalid
+export const resolve = (level, defaultLevel) => {
+  const type = typeof level
+  if (type === 'number') {
+    if (level in NAMES) {
+      return level
+    }
+  } else if (type === 'string') {
+    const nLevel = LEVELS[level.toUpperCase()]
+    if (nLevel !== undefined) {
+      return nLevel
+    }
  }
-  return level
+  return defaultLevel
 }

 Object.freeze(LEVELS)
--- a/@xen-orchestra/log/src/transports/console.js
+++ b/@xen-orchestra/log/src/transports/console.js
@@ -1,26 +1,23 @@
 import LEVELS, { NAMES } from '../levels'

-// Bind console methods (necessary for browsers)
-/* eslint-disable no-console */
-const debugConsole = console.log.bind(console)
-const infoConsole = console.info.bind(console)
-const warnConsole = console.warn.bind(console)
-const errorConsole = console.error.bind(console)
-/* eslint-enable no-console */
-
 const { ERROR, INFO, WARN } = LEVELS

 const consoleTransport = ({ data, level, namespace, message, time }) => {
  const fn =
+    /* eslint-disable no-console */
    level < INFO
-      ? debugConsole
+      ? console.log
      : level < WARN
-      ? infoConsole
+      ? console.info
      : level < ERROR
-      ? warnConsole
-      : errorConsole
+      ? console.warn
+      : console.error
+  /* eslint-enable no-console */

-  fn('%s - %s - [%s] %s', time.toISOString(), namespace, NAMES[level], message)
-  data != null && fn(data)
+  const args = [time.toISOString(), namespace, NAMES[level], message]
+  if (data != null) {
+    args.push(data)
+  }
+  fn.apply(console, args)
 }
 export default () => consoleTransport
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,37 @@

 ### Enhancements

+### Bug fixes
+
+### Released packages
+
+- xo-server v5.51.0
+- xo-web v5.51.0
+
+
+## **5.39.0** (2019-09-30)
+
+![Channel: latest](https://badgen.net/badge/channel/latest/yellow)
+
+### Highlights
+
+- [VM/console] Add a button to connect to the VM via the local SSH client (PR [#4415](https://github.com/vatesfr/xen-orchestra/pull/4415))
+- [SDN Controller] Add possibility to encrypt private networks (PR [#4441](https://github.com/vatesfr/xen-orchestra/pull/4441))
+- [Backups] Improve performance by caching VM backups listing (PR [#4509](https://github.com/vatesfr/xen-orchestra/pull/4509))
+- [HUB] VM template store [#1918](https://github.com/vatesfr/xen-orchestra/issues/1918) (PR [#4442](https://github.com/vatesfr/xen-orchestra/pull/4442))
+
+### Enhancements
+
 - [SR/new] Clarify address formats [#4450](https://github.com/vatesfr/xen-orchestra/issues/4450) (PR [#4460](https://github.com/vatesfr/xen-orchestra/pull/4460))
 - [Backup NG/New] Show warning if zstd compression is not supported on a VM [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PRs [#4411](https://github.com/vatesfr/xen-orchestra/pull/4411))
 - [VM/disks] Don't hide disks that are attached to the same VM twice [#4400](https://github.com/vatesfr/xen-orchestra/issues/4400) (PR [#4414](https://github.com/vatesfr/xen-orchestra/pull/4414))
- [VM/console] Add a button to connect to the VM via the local SSH client (PR [#4415](https://github.com/vatesfr/xen-orchestra/pull/4415))
- [SDN Controller] Add possibility to encrypt private networks (PR [#4441](https://github.com/vatesfr/xen-orchestra/pull/4441))
 - [SDN Controller] Ability to configure MTU for private networks (PR [#4491](https://github.com/vatesfr/xen-orchestra/pull/4491))
 - [VM Export] Filenames are now prefixed with datetime [#4503](https://github.com/vatesfr/xen-orchestra/issues/4503)
- [Backups] Improve performance by caching VM backups listing (PR [#4509](https://github.com/vatesfr/xen-orchestra/pull/4509))
+- [Settings/Logs] Differenciate XS/XCP-ng errors from XO errors [#4101](https://github.com/vatesfr/xen-orchestra/issues/4101) (PR [#4385](https://github.com/vatesfr/xen-orchestra/pull/4385))
+- [Backups] Improve performance by caching logs consolidation (PR [#4541](https://github.com/vatesfr/xen-orchestra/pull/4541))
+- [New VM] Cloud Init available for all plans (PR [#4543](https://github.com/vatesfr/xen-orchestra/pull/4543))
+- [Servers] IPv6 addresses can be used [#4520](https://github.com/vatesfr/xen-orchestra/issues/4520) (PR [#4521](https://github.com/vatesfr/xen-orchestra/pull/4521)) \
+  Note: They must enclosed in brackets to differentiate with the port, e.g.: `[2001:db8::7334]` or `[ 2001:db8::7334]:4343`

 ### Bug fixes

@@ -30,20 +53,23 @@
 - [XOA] Remove "Updates" and "Licenses" tabs for non admin users (PR [#4526](https://github.com/vatesfr/xen-orchestra/pull/4526))
 - [New VM] Ability to escape [cloud config template](https://xen-orchestra.com/blog/xen-orchestra-5-21/#cloudconfigtemplates) variables [#4486](https://github.com/vatesfr/xen-orchestra/issues/4486) (PR [#4501](https://github.com/vatesfr/xen-orchestra/pull/4501))
 - [Backup NG] Properly log and report if job is already running [#4497](https://github.com/vatesfr/xen-orchestra/issues/4497) (PR [4534](https://github.com/vatesfr/xen-orchestra/pull/4534))
+- [Host] Fix an issue where host was wrongly reporting time inconsistency (PR [#4540](https://github.com/vatesfr/xen-orchestra/pull/4540))


 ### Released packages

+- xen-api v0.27.2
+- xo-server-cloud v0.3.0
 - @xen-orchestra/cron v1.0.4
 - xo-server-sdn-controller v0.3.0
 - @xen-orchestra/template v0.1.0
- xo-server v5.50.0
- xo-web v5.50.0
+- xo-server v5.50.1
+- xo-web v5.50.2


 ## **5.38.0** (2019-08-29)

-![Channel: latest](https://badgen.net/badge/channel/latest/yellow)
+![Channel: stable](https://badgen.net/badge/channel/stable/green)

 ### Enhancements

@@ -71,8 +97,6 @@

 ## **5.37.1** (2019-08-06)

-![Channel: stable](https://badgen.net/badge/channel/stable/green)
-
 ### Enhancements

 - [SDN Controller] Let the user choose on which PIF to create a private network (PR [#4379](https://github.com/vatesfr/xen-orchestra/pull/4379))
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -7,18 +7,11 @@

 > Users must be able to say: “Nice enhancement, I'm eager to test it”

- [Settings/Logs] Differenciate XS/XCP-ng errors from XO errors [#4101](https://github.com/vatesfr/xen-orchestra/issues/4101) (PR [#4385](https://github.com/vatesfr/xen-orchestra/pull/4385))
- [Backups] Improve performance by caching logs consolidation (PR [#4541](https://github.com/vatesfr/xen-orchestra/pull/4541))
- [New VM] Cloud Init available for all plans (PR [#4543](https://github.com/vatesfr/xen-orchestra/pull/4543))
- [Servers] IPv6 addresses can be used [#4520](https://github.com/vatesfr/xen-orchestra/issues/4520) (PR [#4521](https://github.com/vatesfr/xen-orchestra/pull/4521)) \
-  Note: They must enclosed in brackets to differentiate with the port, e.g.: `[2001:db8::7334]` or `[ 2001:db8::7334]:4343`
- [HUB] VM template store [#1918](https://github.com/vatesfr/xen-orchestra/issues/1918) (PR [#4442](https://github.com/vatesfr/xen-orchestra/pull/4442))
-
 ### Bug fixes

 > Users must be able to say: “I had this issue, happy to know it's fixed”

- [Host] Fix an issue where host was wrongly reporting time inconsistency (PR [#4540](https://github.com/vatesfr/xen-orchestra/pull/4540))
+- [VM/new-vm] Fix template selection on creating new VM for resource sets [#4565](https://github.com/vatesfr/xen-orchestra/issues/4565) (PR [#4568](https://github.com/vatesfr/xen-orchestra/pull/4568))

 ### Released packages

@@ -27,7 +20,5 @@
 >
 > Rule of thumb: add packages on top.

- xen-api v0.27.2
- xo-server-cloud v0.3.0
 - xo-server v5.51.0
 - xo-web v5.51.0
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,19 @@
 ### Check list

-> Check items when done or if not relevant
+> Check if done.
+>
+> Strikethrough if not relevant: ~~example~~ ([doc](https://help.github.com/en/articles/basic-writing-and-formatting-syntax)).

- [ ] PR reference the relevant issue (e.g. `Fixes #007`)
+- [ ] PR reference the relevant issue (e.g. `Fixes #007` or `See xoa-support#42`)
 - [ ] if UI changes, a screenshot has been added to the PR
- [ ] if `xo-server` API changes, the corresponding test has been added to/updated on [`xo-server-test`](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server-test)
- [ ] `CHANGELOG.unreleased.md`:
-   - enhancement/bug fix entry added
-   - list of packages to release updated (`${name} v${new version}`)
 - [ ] documentation updated
- [ ] **I have tested added/updated features** (and impacted code)
+- `CHANGELOG.unreleased.md`:
+  - [ ] enhancement/bug fix entry added
+  - [ ] list of packages to release updated (`${name} v${new version}`)
+- **I have tested added/updated features** (and impacted code)
+  - [ ] unit tests (e.g. [`cron/parse.spec.js`](https://github.com/vatesfr/xen-orchestra/blob/b24400b21de1ebafa1099c56bac1de5c988d9202/%40xen-orchestra/cron/src/parse.spec.js))
+  - [ ] if `xo-server` API changes, the corresponding test has been added to/updated on [`xo-server-test`](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server-test)
+  - [ ] at least manual testing

 ### Process

@@ -17,3 +21,10 @@
 1. mark it as `WiP:` (Work in Progress) if not ready to be merged
 1. when you want a review, add a reviewer (and only one)
 1. if necessary, update your PR, and re- add a reviewer
+
+From [_the Four Agreements_](https://en.wikipedia.org/wiki/Don_Miguel_Ruiz#The_Four_Agreements):
+
+1. Be impeccable with your word.
+1. Don't take anything personally.
+1. Don't make assumptions.
+1. Always do your best.
--- a/docs/assets/release-channels.png
+++ b/docs/assets/release-channels.png
--- a/docs/updater.md
+++ b/docs/updater.md
@@ -41,6 +41,20 @@ However, if you want to start a manual check, you can do it by clicking on the "

 ![](./assets/xo5updatebutton.png)

+#### Release channel
+In Xen Orchestra, you can make a choice between two different release channels.
+
+##### Stable
+The stable channel is intended to be a version of Xen Orchestra that is already **one month old** (and therefore will benefit from one month of community feedback and various fixes). This way, users more concerned with the stability of their appliance will have the option to stay on a slightly older (and tested) version of XO (still supported by our pro support).
+
+##### Latest
+
+The latest channel will include all the latest improvements available in Xen Orchestra. The version available in latest has already been QA'd by our team, but issues may still occur once deployed in vastly varying environments, such as our user base has.
+
+> To select the release channel of your choice, go to the XOA > Updates view.
+
+![](./assets/release-channels.png)
+
 #### Upgrade

 If a new version is found, you'll have an upgrade button and its tooltip displayed:
--- a/packages/xapi-explore-sr/package.json
+++ b/packages/xapi-explore-sr/package.json
@@ -41,7 +41,7 @@
    "human-format": "^0.10.0",
    "lodash": "^4.17.4",
    "pw": "^0.0.4",
-    "xen-api": "^0.27.1"
+    "xen-api": "^0.27.2"
  },
  "devDependencies": {
    "@babel/cli": "^7.1.5",
--- a/packages/xen-api/package.json
+++ b/packages/xen-api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "xen-api",
-  "version": "0.27.1",
+  "version": "0.27.2",
  "license": "ISC",
  "description": "Connector to the Xen API",
  "keywords": [
--- a/packages/xo-server-backup-reports/package.json
+++ b/packages/xo-server-backup-reports/package.json
@@ -36,7 +36,7 @@
    "node": ">=6"
  },
  "dependencies": {
-    "@xen-orchestra/log": "^0.1.4",
+    "@xen-orchestra/log": "^0.2.0",
    "human-format": "^0.10.0",
    "lodash": "^4.13.1",
    "moment-timezone": "^0.5.13"
--- a/packages/xo-server-cloud/package.json
+++ b/packages/xo-server-cloud/package.json
@@ -1,6 +1,6 @@
 {
  "name": "xo-server-cloud",
-  "version": "0.2.4",
+  "version": "0.3.0",
  "license": "ISC",
  "description": "",
  "keywords": [
--- a/packages/xo-server-perf-alert/src/index.js
+++ b/packages/xo-server-perf-alert/src/index.js
@@ -680,7 +680,7 @@ ${entry.listItem}
      },
    }
    if (xapiObject.$type === 'VM') {
-      payload['vm_uuid'] = xapiObject.uuid
+      payload.vm_uuid = xapiObject.uuid
    }
    // JSON is not well formed, can't use the default node parser
    return JSON5.parse(
--- a/packages/xo-server-sdn-controller/package.json
+++ b/packages/xo-server-sdn-controller/package.json
@@ -28,7 +28,7 @@
    "cross-env": "^5.2.0"
  },
  "dependencies": {
-    "@xen-orchestra/log": "^0.1.4",
+    "@xen-orchestra/log": "^0.2.0",
    "lodash": "^4.17.11",
    "node-openssl-cert": "^0.0.97",
    "promise-toolbox": "^0.13.0",
--- a/packages/xo-server-test/src/_xoConnection.js
+++ b/packages/xo-server-test/src/_xoConnection.js
@@ -210,6 +210,10 @@ class XoConnection extends Xo {
    return backups
  }

+  getBackupLogs(filter) {
+    return this.call('backupNg.getLogs', { _forceRefresh: true, ...filter })
+  }
+
  async _cleanDisposers(disposers) {
    for (let n = disposers.length - 1; n > 0; ) {
      const params = disposers[n--]
--- a/packages/xo-server-test/src/backupNg/backupNg.spec.js
+++ b/packages/xo-server-test/src/backupNg/backupNg.spec.js
@@ -221,7 +221,7 @@ describe('backupNg', () => {
      expect(typeof schedule).toBe('object')

      await xo.call('backupNg.runJob', { id: jobId, schedule: schedule.id })
-      const [log] = await xo.call('backupNg.getLogs', {
+      const [log] = await xo.getBackupLogs({
        scheduleId: schedule.id,
      })
      expect(log.warnings).toMatchSnapshot()
@@ -260,7 +260,7 @@ describe('backupNg', () => {
          tasks: [vmTask],
          ...log
        },
-      ] = await xo.call('backupNg.getLogs', {
+      ] = await xo.getBackupLogs({
        jobId,
        scheduleId: schedule.id,
      })
@@ -319,7 +319,7 @@ describe('backupNg', () => {
          tasks: [task],
          ...log
        },
-      ] = await xo.call('backupNg.getLogs', {
+      ] = await xo.getBackupLogs({
        jobId,
        scheduleId: schedule.id,
      })
@@ -415,7 +415,7 @@ describe('backupNg', () => {
        tasks: [{ tasks: subTasks, ...vmTask }],
        ...log
      },
-    ] = await xo.call('backupNg.getLogs', {
+    ] = await xo.getBackupLogs({
      jobId,
      scheduleId: schedule.id,
    })
@@ -506,7 +506,7 @@ describe('backupNg', () => {
      expect(backups.length).toBe(exportRetention)
    )

-    const backupLogs = await xo.call('backupNg.getLogs', {
+    const backupLogs = await xo.getBackupLogs({
      jobId,
      scheduleId: schedule.id,
    })
--- a/packages/xo-server-usage-report/package.json
+++ b/packages/xo-server-usage-report/package.json
@@ -37,7 +37,7 @@
  "dependencies": {
    "@xen-orchestra/async-map": "^0.0.0",
    "@xen-orchestra/cron": "^1.0.4",
-    "@xen-orchestra/log": "^0.1.4",
+    "@xen-orchestra/log": "^0.2.0",
    "handlebars": "^4.0.6",
    "html-minifier": "^4.0.0",
    "human-format": "^0.10.0",
--- a/packages/xo-server/package.json
+++ b/packages/xo-server/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "xo-server",
-  "version": "5.50.0",
+  "version": "5.50.1",
  "license": "AGPL-3.0",
  "description": "Server part of Xen-Orchestra",
  "keywords": [
@@ -39,7 +39,7 @@
    "@xen-orchestra/defined": "^0.0.0",
    "@xen-orchestra/emit-async": "^0.0.0",
    "@xen-orchestra/fs": "^0.10.1",
-    "@xen-orchestra/log": "^0.1.4",
+    "@xen-orchestra/log": "^0.2.0",
    "@xen-orchestra/mixin": "^0.0.0",
    "ajv": "^6.1.1",
    "app-conf": "^0.7.0",
@@ -124,7 +124,7 @@
    "value-matcher": "^0.2.0",
    "vhd-lib": "^0.7.0",
    "ws": "^6.0.0",
-    "xen-api": "^0.27.1",
+    "xen-api": "^0.27.2",
    "xml2js": "^0.4.19",
    "xo-acl-resolver": "^0.4.1",
    "xo-collection": "^0.4.1",
--- a/packages/xo-server/src/_pDebounceWithKey.js
+++ b/packages/xo-server/src/_pDebounceWithKey.js
@@ -16,6 +16,10 @@ function scheduleRemoveCacheEntry(keys, expires) {

 const defaultKeyFn = () => []

+const { slice } = Array.prototype
+
+export const REMOVE_CACHE_ENTRY = {}
+
 // debounce an async function so that all subsequent calls in a delay receive
 // the same result
 //
@@ -26,7 +30,14 @@ const defaultKeyFn = () => []
 export const debounceWithKey = (fn, delay, keyFn = defaultKeyFn) => {
  const cache = new MultiKeyMap()
  const delayFn = typeof delay === 'number' ? () => delay : delay
-  return function() {
+  return function(arg) {
+    if (arg === REMOVE_CACHE_ENTRY) {
+      return removeCacheEntry(
+        cache,
+        ensureArray(keyFn.apply(this, slice.call(arguments, 1)))
+      )
+    }
+
    const keys = ensureArray(keyFn.apply(this, arguments))
    let promise = cache.get(keys)
    if (promise === undefined) {
--- a/packages/xo-server/src/_pDebounceWithKey.spec.js
+++ b/packages/xo-server/src/_pDebounceWithKey.spec.js
@@ -0,0 +1,29 @@
+/* eslint-env jest */
+
+import { debounceWithKey, REMOVE_CACHE_ENTRY } from './_pDebounceWithKey'
+
+describe('REMOVE_CACHE_ENTRY', () => {
+  it('clears the cache', async () => {
+    let i = 0
+    const debouncedFn = debounceWithKey(
+      function() {
+        return Promise.resolve(++i)
+      },
+      Infinity,
+      id => id
+    )
+
+    // not cached accross keys
+    expect(await debouncedFn(1)).toBe(1)
+    expect(await debouncedFn(2)).toBe(2)
+
+    // retrieve the already cached values
+    expect(await debouncedFn(1)).toBe(1)
+    expect(await debouncedFn(2)).toBe(2)
+
+    // an entry for a specific key can be removed
+    debouncedFn(REMOVE_CACHE_ENTRY, 1)
+    expect(await debouncedFn(1)).toBe(3)
+    expect(await debouncedFn(2)).toBe(2)
+  })
+})
--- a/packages/xo-server/src/api/backup-ng.js
+++ b/packages/xo-server/src/api/backup-ng.js
@@ -3,6 +3,7 @@ import { fromCallback } from 'promise-toolbox'
 import { pipeline } from 'readable-stream'

 import createNdJsonStream from '../_createNdJsonStream'
+import { REMOVE_CACHE_ENTRY } from '../_pDebounceWithKey'
 import { safeDateFormat } from '../utils'

 export function createJob({ schedules, ...job }) {
@@ -184,7 +185,20 @@ getAllLogs.params = {
  ndjson: { type: 'boolean', optional: true },
 }

-export function getLogs({ after, before, limit, ...filter }) {
+export function getLogs({
+  after,
+  before,
+  limit,
+
+  // TODO: it's a temporary work-around which should be removed
+  // when the consolidated logs will be stored in the DB
+  _forceRefresh = false,
+
+  ...filter
+}) {
+  if (_forceRefresh) {
+    this.getBackupNgLogs(REMOVE_CACHE_ENTRY)
+  }
  return this.getBackupNgLogsSorted({ after, before, limit, filter })
 }

--- a/packages/xo-server/src/api/sr.js
+++ b/packages/xo-server/src/api/sr.js
@@ -777,7 +777,7 @@ export async function probeIscsiExists({
  )

  const srs = []
-  forEach(ensureArray(xml['SRlist'].SR), sr => {
+  forEach(ensureArray(xml.SRlist.SR), sr => {
    // get the UUID of SR connected to this LUN
    srs.push({ uuid: sr.UUID.trim() })
  })
@@ -845,7 +845,7 @@ export async function probeNfsExists({ host, server, serverPath }) {

  const srs = []

-  forEach(ensureArray(xml['SRlist'].SR), sr => {
+  forEach(ensureArray(xml.SRlist.SR), sr => {
    // get the UUID of SR connected to this LUN
    srs.push({ uuid: sr.UUID.trim() })
  })
--- a/packages/xo-server/src/api/xosan.js
+++ b/packages/xo-server/src/api/xosan.js
@@ -85,7 +85,7 @@ async function rateLimitedRetry(action, shouldRetry, retryCount = 20) {
 function createVolumeInfoTypes() {
  function parseHeal(parsed) {
    const bricks = []
-    parsed['healInfo']['bricks']['brick'].forEach(brick => {
+    parsed.healInfo.bricks.brick.forEach(brick => {
      bricks.push(brick)
      if (brick.file) {
        brick.file = ensureArray(brick.file)
@@ -96,21 +96,21 @@ function createVolumeInfoTypes() {

  function parseStatus(parsed) {
    const brickDictByUuid = {}
-    const volume = parsed['volStatus']['volumes']['volume']
-    volume['node'].forEach(node => {
+    const volume = parsed.volStatus.volumes.volume
+    volume.node.forEach(node => {
      brickDictByUuid[node.peerid] = brickDictByUuid[node.peerid] || []
      brickDictByUuid[node.peerid].push(node)
    })
    return {
      commandStatus: true,
-      result: { nodes: brickDictByUuid, tasks: volume['tasks'] },
+      result: { nodes: brickDictByUuid, tasks: volume.tasks },
    }
  }

  async function parseInfo(parsed) {
-    const volume = parsed['volInfo']['volumes']['volume']
-    volume['bricks'] = volume['bricks']['brick']
-    volume['options'] = volume['options']['option']
+    const volume = parsed.volInfo.volumes.volume
+    volume.bricks = volume.bricks.brick
+    volume.options = volume.options.option
    return { commandStatus: true, result: volume }
  }

@@ -118,23 +118,23 @@ function createVolumeInfoTypes() {
    return async function(sr) {
      const glusterEndpoint = this::_getGlusterEndpoint(sr)
      const cmdShouldRetry = result =>
-        !result['commandStatus'] &&
-        ((result.parsed && result.parsed['cliOutput']['opErrno'] === '30802') ||
+        !result.commandStatus &&
+        ((result.parsed && result.parsed.cliOutput.opErrno === '30802') ||
          result.stderr.match(/Another transaction is in progress/))
      const runCmd = async () =>
        glusterCmd(glusterEndpoint, 'volume ' + command, true)
      const commandResult = await rateLimitedRetry(runCmd, cmdShouldRetry, 30)
-      return commandResult['commandStatus']
-        ? this::handler(commandResult.parsed['cliOutput'], sr)
+      return commandResult.commandStatus
+        ? this::handler(commandResult.parsed.cliOutput, sr)
        : commandResult
    }
  }

  async function profileType(sr) {
    async function parseProfile(parsed) {
-      const volume = parsed['volProfile']
-      volume['bricks'] = ensureArray(volume['brick'])
-      delete volume['brick']
+      const volume = parsed.volProfile
+      volume.bricks = ensureArray(volume.brick)
+      delete volume.brick
      return { commandStatus: true, result: volume }
    }

@@ -143,9 +143,9 @@ function createVolumeInfoTypes() {

  async function profileTopType(sr) {
    async function parseTop(parsed) {
-      const volume = parsed['volTop']
-      volume['bricks'] = ensureArray(volume['brick'])
-      delete volume['brick']
+      const volume = parsed.volTop
+      volume.bricks = ensureArray(volume.brick)
+      delete volume.brick
      return { commandStatus: true, result: volume }
    }

@@ -326,7 +326,7 @@ async function remoteSsh(glusterEndpoint, cmd, ignoreError = false) {
      }
      messageArray.push(`${key}: ${result[key]}`)
    }
-    messageArray.push('command: ' + result['command'].join(' '))
+    messageArray.push('command: ' + result.command.join(' '))
    messageKeys.splice(messageKeys.indexOf('command'), 1)
    for (const key of messageKeys) {
      messageArray.push(`${key}: ${JSON.stringify(result[key])}`)
@@ -343,7 +343,7 @@ async function remoteSsh(glusterEndpoint, cmd, ignoreError = false) {
        })
        break
      } catch (exception) {
-        if (exception['code'] !== 'HOST_OFFLINE') {
+        if (exception.code !== 'HOST_OFFLINE') {
          throw exception
        }
      }
@@ -370,19 +370,17 @@ async function remoteSsh(glusterEndpoint, cmd, ignoreError = false) {
 }

 function findErrorMessage(commandResut) {
-  if (commandResut['exit'] === 0 && commandResut.parsed) {
-    const cliOut = commandResut.parsed['cliOutput']
-    if (cliOut['opErrstr'] && cliOut['opErrstr'].length) {
-      return cliOut['opErrstr']
+  if (commandResut.exit === 0 && commandResut.parsed) {
+    const cliOut = commandResut.parsed.cliOutput
+    if (cliOut.opErrstr && cliOut.opErrstr.length) {
+      return cliOut.opErrstr
    }
    // "peer probe" returns it's "already in peer" error in cliOutput/output
-    if (cliOut['output'] && cliOut['output'].length) {
-      return cliOut['output']
+    if (cliOut.output && cliOut.output.length) {
+      return cliOut.output
    }
  }
-  return commandResut['stderr'].length
-    ? commandResut['stderr']
-    : commandResut['stdout']
+  return commandResut.stderr.length ? commandResut.stderr : commandResut.stdout
 }

 async function glusterCmd(glusterEndpoint, cmd, ignoreError = false) {
@@ -392,15 +390,15 @@ async function glusterCmd(glusterEndpoint, cmd, ignoreError = false) {
    true
  )
  try {
-    result.parsed = parseXml(result['stdout'])
+    result.parsed = parseXml(result.stdout)
  } catch (e) {
    // pass, we never know if a message can be parsed or not, so we just try
  }
-  if (result['exit'] === 0) {
-    const cliOut = result.parsed['cliOutput']
+  if (result.exit === 0) {
+    const cliOut = result.parsed.cliOutput
    // we have found cases where opErrno is !=0 and opRet was 0, albeit the operation was an error.
    result.commandStatus =
-      cliOut['opRet'].trim() === '0' && cliOut['opErrno'].trim() === '0'
+      cliOut.opRet.trim() === '0' && cliOut.opErrno.trim() === '0'
    result.error = findErrorMessage(result)
  } else {
    result.commandStatus = false
@@ -793,7 +791,7 @@ export const createSR = defer(async function(
      host: param.host.$id,
      vm: { id: param.vm.$id, ip: param.address },
      underlyingSr: param.underlyingSr.$id,
-      arbiter: !!param['arbiter'],
+      arbiter: !!param.arbiter,
    }))
    await xapi.xo.setData(xosanSrRef, 'xosan_config', {
      version: 'beta2',
@@ -1300,7 +1298,7 @@ export const addBricks = defer(async function(
        underlyingSr: newSr,
      })
    }
-    const arbiterNode = data.nodes.find(n => n['arbiter'])
+    const arbiterNode = data.nodes.find(n => n.arbiter)
    if (arbiterNode) {
      await glusterCmd(
        glusterEndpoint,
--- a/packages/xo-server/src/logs-cli.js
+++ b/packages/xo-server/src/logs-cli.js
@@ -6,6 +6,7 @@ import ndjson from 'ndjson'
 import parseArgs from 'minimist'
 import sublevel from 'level-sublevel'
 import util from 'util'
+import { join as joinPath } from 'path'
 import { repair as repairDb } from 'level'

 import { forEach } from './utils'
@@ -174,6 +175,7 @@ export default async function main() {
  }

  const config = await appConf.load('xo-server', {
+    appDir: joinPath(__dirname, '..'),
    ignoreUnknownFormats: true,
  })

--- a/packages/xo-server/src/xapi/index.js
+++ b/packages/xo-server/src/xapi/index.js
@@ -1576,7 +1576,7 @@ export default class Xapi extends XapiBase {
      }
    } else {
      // Find the original template by name (*sigh*).
-      const templateNameLabel = vm.other_config['base_template_name']
+      const templateNameLabel = vm.other_config.base_template_name
      const template =
        templateNameLabel &&
        find(
--- a/packages/xo-vmdk-to-vhd/src/vmdk-read.integ.spec.js
+++ b/packages/xo-vmdk-to-vhd/src/vmdk-read.integ.spec.js
@@ -43,6 +43,6 @@ test('VMDKDirectParser reads OK', async () => {
  }
  expect(harvested.length).toEqual(2)
  expect(harvested[0].offsetBytes).toEqual(0)
-  expect(harvested[0].data.length).toEqual(header['grainSizeSectors'] * 512)
-  expect(harvested[1].offsetBytes).toEqual(header['grainSizeSectors'] * 512)
+  expect(harvested[0].data.length).toEqual(header.grainSizeSectors * 512)
+  expect(harvested[1].offsetBytes).toEqual(header.grainSizeSectors * 512)
 })
--- a/packages/xo-web/package.json
+++ b/packages/xo-web/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "xo-web",
-  "version": "5.50.0",
+  "version": "5.50.2",
  "license": "AGPL-3.0",
  "description": "Web interface client for Xen-Orchestra",
  "keywords": [
--- a/packages/xo-web/src/common/scheduling.js
+++ b/packages/xo-web/src/common/scheduling.js
@@ -468,14 +468,14 @@ export default class Scheduler extends Component {
              optionRenderer={getMonthName}
              options={MONTHS}
              onChange={this._monthChange}
-              value={cronPatternArr[PICKTIME_TO_ID['month']]}
+              value={cronPatternArr[PICKTIME_TO_ID.month]}
            />
          </Col>
          <Col largeSize={6}>
            <DayPicker
              onChange={this._dayChange}
-              monthDayPattern={cronPatternArr[PICKTIME_TO_ID['monthDay']]}
-              weekDayPattern={cronPatternArr[PICKTIME_TO_ID['weekDay']]}
+              monthDayPattern={cronPatternArr[PICKTIME_TO_ID.monthDay]}
+              weekDayPattern={cronPatternArr[PICKTIME_TO_ID.weekDay]}
            />
          </Col>
        </Row>
@@ -485,7 +485,7 @@ export default class Scheduler extends Component {
              labelId='Hour'
              options={HOURS}
              onChange={this._hourChange}
-              value={cronPatternArr[PICKTIME_TO_ID['hour']]}
+              value={cronPatternArr[PICKTIME_TO_ID.hour]}
            />
          </Col>
          <Col largeSize={6}>
@@ -493,7 +493,7 @@ export default class Scheduler extends Component {
              labelId='Minute'
              options={MINS}
              onChange={this._minuteChange}
-              value={cronPatternArr[PICKTIME_TO_ID['minute']]}
+              value={cronPatternArr[PICKTIME_TO_ID.minute]}
            />
          </Col>
        </Row>
--- a/packages/xo-web/src/common/select-objects.js
+++ b/packages/xo-web/src/common/select-objects.js
@@ -916,7 +916,7 @@ export class SelectResourceSetsVdi extends React.PureComponent {
    () => this.props.resourceSet,
    ({ objectsByType }) => {
      const { srPredicate } = this.props
-      const srs = objectsByType['SR']
+      const srs = objectsByType.SR
      return srPredicate ? filter(srs, srPredicate) : srs
    }
  )
--- a/packages/xo-web/src/common/utils.js
+++ b/packages/xo-web/src/common/utils.js
@@ -252,7 +252,7 @@ export const parseSize = size => {

 // -------------------------------------------------------------------

-const _NotFound = () => <h1>{_('errorPageNotFound')}</h1>
+const NotFound = () => <h1>{_('errorPageNotFound')}</h1>

 // Decorator to declare routes on a component.
 //
@@ -286,7 +286,7 @@ export const routes = (indexRoute, childRoutes) => target => {
  }

  if (childRoutes) {
-    childRoutes.push({ component: _NotFound, path: '*' })
+    childRoutes.push({ component: NotFound, path: '*' })
  }

  target.route = {
@@ -629,7 +629,7 @@ export const adminOnly = Component =>
  connectStore({
    _isAdmin: isAdmin,
  })(({ _isAdmin, ...props }) =>
-    _isAdmin ? <Component {...props} /> : <_NotFound />
+    _isAdmin ? <Component {...props} /> : <NotFound />
  )

 // ===================================================================
--- a/packages/xo-web/src/xo-app/hub/index.js
+++ b/packages/xo-web/src/xo-app/hub/index.js
@@ -51,7 +51,7 @@ export default decorate([
            </Col>
          ) : (
            resources.map(data => (
-              <Col key={data.namespace} mediumSize={3}>
+              <Col key={data.namespace} mediumSize={6} largeSize={4}>
                <Resource {...data} />
              </Col>
            ))
--- a/packages/xo-web/src/xo-app/hub/resource.js
+++ b/packages/xo-web/src/xo-app/hub/resource.js
@@ -54,7 +54,7 @@ export default decorate([
          version,
        } = this.props
        const { isTemplateInstalled } = this.state
-        if (getXoaPlan(+process.env.XOA_PLAN) === 'Community') {
+        if (getXoaPlan() === 'Community') {
          subscribeAlert()
          return
        }
@@ -96,7 +96,7 @@ export default decorate([
      async create() {
        const { isPoolCreated, installedTemplates } = this.state
        const { name } = this.props
-        if (getXoaPlan(+process.env.XOA_PLAN) === 'Community') {
+        if (getXoaPlan() === 'Community') {
          subscribeAlert()
          return
        }
@@ -197,11 +197,11 @@ export default decorate([
          data-name={name}
          disabled={state.installedTemplates.length === 0}
          handler={effects.deleteTemplates}
+          icon='delete'
          size='small'
          style={{ border: 'none' }}
-        >
-          <Icon icon='delete' size='xs' />
-        </ActionButton>
+          tooltip={_('remove')}
+        />
        <br />
      </CardHeader>
      <CardBlock className='text-center'>
--- a/packages/xo-web/src/xo-app/new-vm/index.js
+++ b/packages/xo-web/src/xo-app/new-vm/index.js
@@ -259,7 +259,7 @@ class Vif extends BaseComponent {
      props.pool === undefined // to get objects as a self user
    ),
    srs: getSrs(state, props),
-    template: getTemplate(state, props),
+    template: getTemplate(state, props, props.pool === undefined),
    templates: getTemplates(state, props),
    userSshKeys: getUserSshKeys(state, props),
  })
--- a/packages/xo-web/src/xo-app/new/sr/index.js
+++ b/packages/xo-web/src/xo-app/new/sr/index.js
@@ -475,7 +475,7 @@ export default class New extends Component {
  }

  _handleAuthChoice = () => {
-    const auth = this.refs['auth'].checked
+    const auth = this.refs.auth.checked
    this.setState({
      auth,
    })
--- a/packages/xo-web/src/xo-app/settings/ips/index.js
+++ b/packages/xo-web/src/xo-app/settings/ips/index.js
@@ -154,7 +154,7 @@ class IpsCell extends BaseComponent {
                  value={newIps || ''}
                />{' '}
                <ActionButton
-                  form={`newIpForm`}
+                  form='newIpForm'
                  icon='save'
                  btnStyle='primary'
                  handler={this._addIps}
--- a/scripts/normalize-packages
+++ b/scripts/normalize-packages
@@ -65,7 +65,7 @@ require('exec-promise')(() =>
    const originalScripts = scripts

    if (!pkg.private && !('postversion' in scripts)) {
-      scripts = { ...scripts, postversion: 'npm publish' }
+      scripts = { ...scripts, postversion: 'npm publish --access public' }
    }

    const prepublish = scripts.prepublish
Author	SHA1	Message	Date
Julien Fontanet	4c7c9f9156	WiP: feat(fs/glob): basic glob implementation	2019-10-06 23:15:04 +02:00
Julien Fontanet	093fb7f959	fix(xo-server-logs): explicit appDir May fix #4576	2019-10-03 16:02:10 +02:00
Julien Fontanet	f6472424ad	fix(eslint): disable `lines-between-class-members` rule	2019-10-02 15:52:51 +02:00
Julien Fontanet	31ed3767c6	chore: fix some lint Mainly: `obj['prop']` → `obj.prop`	2019-10-02 15:45:32 +02:00
marcpezin	366acb65ea	doc(updater): release channels (#4572 )	2019-10-02 15:24:45 +02:00
Pierre Donias	7c6946931b	chore(xo-web): PascalCase `NotFound` component (#4567 ) https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-pascal-case.md	2019-10-01 17:21:00 +02:00
HamadaBrest	5d971433a5	fix(xo-web/new-vm/self): template selection (#4568 ) Fixes #4565 Introduced by `9efc3dd1fb`	2019-10-01 16:59:59 +02:00
Rajaa.BARHTAOUI	05264b326b	chore(CHANGELOG): 5.39.0 (#4561 )	2019-09-30 16:08:56 +02:00
BARHTAOUI	fdd5c6bfd8	chore(CHANGELOG): update next	2019-09-30 15:13:05 +02:00
BARHTAOUI	42c3528c2f	feat(xo-web): 5.50.2	2019-09-30 15:13:05 +02:00
HamadaBrest	18640714f1	fix(xo-web/hub/resource): "remove" button icon (#4559 )	2019-09-30 14:43:31 +02:00
HamadaBrest	cda4d3399b	fix(xo-web/hub): responsive hub VM templates (#4558 ) Fixes #4557	2019-09-30 14:42:01 +02:00
Julien Fontanet	4da8af6e69	fix(log/configure): process nested transport	2019-09-27 14:55:26 +02:00
Julien Fontanet	b535565612	feat(@xen-orchestra/log): 0.2.0	2019-09-27 14:29:34 +02:00
Julien Fontanet	bef39b8a96	fix(log): support `DEBUG` and `NODE_DEBUG` when both defined	2019-09-27 14:26:19 +02:00
Julien Fontanet	fb2502a031	feat(log): support env var `LOG_LEVEL`	2019-09-27 14:23:27 +02:00
Julien Fontanet	0b90befda1	feat(log): also export `createLogger` symbol	2019-09-27 13:59:44 +02:00
Julien Fontanet	f9800f104a	feat(log/console): display data inline	2019-09-27 13:59:03 +02:00
Julien Fontanet	99134cc381	Merge pull request #4554 from vatesfr/release Technical release	2019-09-27 10:22:49 +02:00
BARHTAOUI	66ca08da6d	chore(CHANGELOG): update next	2019-09-27 10:15:46 +02:00
BARHTAOUI	5eb7ece6ba	feat(xo-web): 5.50.1	2019-09-27 09:59:05 +02:00
BARHTAOUI	6b3d334e76	feat(xo-server): 5.50.1	2019-09-27 09:58:51 +02:00
badrAZ	14f5fd8f73	feat(xen-api): 0.27.2	2019-09-27 09:54:47 +02:00
BARHTAOUI	5f73aee0df	feat(xo-server-cloud): 0.3.0	2019-09-27 09:47:16 +02:00
HamadaBrest	f8666ba367	fix(xo-web/hub): properly display community info (#4552 )	2019-09-26 16:57:53 +02:00
badrAZ	9e80f76dd8	fix(xo-server-test/backup-ng): force fetching uptodate logs (#4551 ) See `a6d182e` The issue: xo-server-test execute sequentially multiple backups and validate their execution using logs. The issue is that the logs are not up-to-date in the second fetch because the method returns the previous cached response. The solution: Add _forceRefresh param to backupNg.getLogs to be able to clear the method cache. It's just a work-around which will be removed once the consolidated logs will be stored in the DB.	2019-09-26 16:42:12 +02:00
HamadaBrest	c76a5eaf67	feat: hub: XVA templates store (#4442 ) Fixes #1918	2019-09-26 16:36:32 +02:00
Julien Fontanet	cd378f0168	chore(PULL_REQUEST_TEMPLATE): strikethrough not relevant items	2019-09-26 14:24:54 +02:00
badrAZ	7d51ff0cf5	feat(xo-server/_pDebounceWithKey): ability to clear cache entry (#4549 ) Fixes #4548	2019-09-26 14:17:33 +02:00
Julien Fontanet	47819ea956	chore(PULL_REQUEST_TEMPLATE): better checklist + 4 agreements (#4547 )	2019-09-25 17:41:32 +02:00
Julien Fontanet	c7e3560c98	chore(normalize-packages): add `--access public` to `npm publish` Only for non-private packages without existing `postversion` script.	2019-09-25 17:36:36 +02:00